Imported Upstream version 0.2.0upstream/0.2.0

30 files changed, 18510 insertions, 7765 deletions

diff --git a/PKG-INFO b/PKG-INFO
index fd3874a..2be27de 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,15 @@
 Metadata-Version: 1.0
 Name: rapid-photo-downloader
-Version: 0.1.3
+Version: 0.2.0
 Summary: Rapid Photo Downloader for Linux
 Home-page: http://www.damonlynch.net/rapid
 Author: Damon Lynch
 Author-email: damonlynch@gmail.com
 License: GPL
-Description: Rapid Photo Downloader is written by a photographer for
-        professional and amateur photographers. It can download photos
-        from multiple cameras, memory cards and Portable Storage Devices
-        simultaneously. It provides many options for subfolder creation,
-        image renaming and backup.
+Description: Rapid Photo Downloader is written by a photographer for professional and
+        amateur photographers. It can  download photos and videos from multiple
+        cameras, memory cards and Portable Storage Devices simultaneously. It 
+        provides many flexible, user-defined options for subfolder creation,
+        photo and video renaming, and backup.
+        
 Platform: linux
diff --git a/doc/rapid-photo-downloader.pod b/doc/rapid-photo-downloader.pod
index 3fda3d4..f943970 100644
--- a/doc/rapid-photo-downloader.pod
+++ b/doc/rapid-photo-downloader.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-rapid-photo-downloader - imports images from cameras, memory cards and other devices
+rapid-photo-downloader - imports photos and videos from cameras, memory cards and other devices
 
 =head1 SYNOPSIS
 
@@ -11,13 +11,14 @@ Options:
   -h, --help        
   -v, --verbose
   -q, --quiet
-  -e, --extensions  
-
+  -e, --extensions
+  --reset-settings
+  
 =head1 DESCRIPTION
 
-B<Rapid Photo Downloader> downloads photos from cameras, memory cards and Portable
-Storage Devices, providing a variety of options for subfolder creation,
-image renaming and backup. It can download images from more than one device in parallel.
+B<Rapid Photo Downloader> imports photos and videos from cameras, memory cards and Portable
+Storage Devices, providing a variety of flexible, user-defined options for subfolder creation,
+photo and video renaming, and backup. It can download from more than one device in parallel.
 
 
 =head1 OPTIONS
@@ -44,6 +45,10 @@ Only display output errors and warnings to the command line as the program runs.
 
 Displays image file extensions the program recognizes and exits.
 
+=item B<--reset-settings>
+
+Resets all program settings and preferences to their default values and exits.
+
 =back
 
 =head1 ENVIRONMENT VARIABLES
diff --git a/po/cs.po b/po/cs.po
index bacee38..7a071e0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,216 +7,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 13:24+0000\n"
-"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-28 04:56+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 19:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "New York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Praha"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teherán"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Paříž"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlín"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapešť"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Řím"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moskva"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Dílí"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Varšava"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Hodnota dnešní stahování je invalidní.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Resetování hodnoty na nulu.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Hodnota nastavení 'Začátek dne' je poškozena.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Resetování do půlnoci.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Chyba v nastavení přejmenovávání obrázků."
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr "Chyba v nastavení přejmenování fotografií"
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Promiňte, v nastavení je chyba:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Resetování na výchozí hodnoty."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Pracovní kód"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Chyba v nastavení stahovací podsložky"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr "Chyba v nastavení přejmenování videí"
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr "fotografie a videa"
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "fotografie"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Vyberte složku do které mají být obrázky staženy"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Vyberte složku obrázků"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr ""
+
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr ""
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Vyberte složku do které má být uložena záloha obrázků"
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Varování:</b> Existují dostatečná metadata obrázku. S jejich pomocí "
-"lze vygenerovat název. Pokud chcete obrázek přejmenovat použijte nastavení "
-"přejmenování.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Varování:</b> Existují dostatečná metadata obrázku pro vygenerování "
-"podsložek. Pokud chcete podsložky přejmenovat použijte nastavení jmen.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Příklad: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "Hodnota Dnešní stahování není aktualizována, v současné době dochází ke "
 "stažení"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
 "Hodnota Skladované číslo není aktualizována, v současné době dochází ke "
 "stažení"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Některé hodnoty v nastavení podsložky jsou nepodstatné a proto byly smazány."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Vložené nastavení podsložky je invalidní a nelze použít.\n"
-"Bylo tedy resetováno na výchozí hodnoty."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "fotografie"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "video"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "externídisk1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "externídisk2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "fotografie či videa"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "videa"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "skenování..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr ""
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr ""
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Stahování nemůže pokračovat"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Vyskytla se chyba v nastavení programu."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -224,42 +273,39 @@ msgstr ""
 "\n"
 "Prosím zkontrolujte nastavení, restartujte program a zkuste to znovu."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Stahování nemůže pokračovat"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 z %s obrázků okopírováno"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr ""
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
-msgstr "Sken zařízení kompletní: nalezeno %(number)s obrázků na %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+msgstr ""
+"Sken zařízení kompletní: nalezeno %(number)s %(filetypes)s na %(device)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Skenování zařízení kompletní: žádné obrázky nebyly na %s nalezeny"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Název obrázku nemohl být vygenerován"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -268,15 +314,14 @@ msgstr ""
 "Zdroj: %(source)s\n"
 "Problém: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Název obrázku se nepodařilo vygenerovat. Prosím zkontrolujte, zda existují "
-"dostatečná metadata."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -289,7 +334,8 @@ msgstr ""
 "Destinace: %(destination)s\n"
 "Problém: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -298,21 +344,21 @@ msgstr ""
 "Zdroj: %(source)s\n"
 "Destinace: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Unikátní identifikátor '%s' přidán"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Zdroj: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Chyba kopírování obrázků"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -323,85 +369,94 @@ msgstr ""
 "Destinace: %(destination)s\n"
 "Chyba: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "Obrázek nebyl okopírován."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr ""
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"Detekovány obrázky se stejnými názvy, ale pořízenými v jiném časovém období:"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"První obrázek: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Druhý obrázek: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Nelze otevřít obrázek"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr ""
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Zdroj: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "Obrázek nemá metadata"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr "%(filetype)s nemá metadata"
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Metadata jsou základy pro generování podsložek / jmen obrázků.\n"
-"Zdroj: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Jméno podsložky nemohlo být řádně vygenerováno. Zkontrolujte, kde jsou "
-"dostatečná metadata."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
-"Podsložka: %(subfolder)s\n"
-"Obrázek: %(image)s\n"
-"Problém: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Nový den začal - resetování 'Dnešní stahování' sekvenční číslo"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Záloha obrázku neexistuje"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Záloha %(file_type)s přepsána"
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr ""
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Chyba zálohování"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Adresář destinace nelze vytvořit: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -410,12 +465,17 @@ msgstr ""
 "Zdroj: %(source)s\n"
 "Destinace: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Chyba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr ""
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -426,274 +486,329 @@ msgstr ""
 "Destinace: %(destination)s\n"
 "Chyba: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr ""
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr ""
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr "Umístění zálohy nenalezeno"
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Zařízení nyní nemůže být bezpečně vymazáno"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s obrázků staženo"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s staženo"
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s obrázků přeskočeno"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr "%(noFiles)s %(filetypes)s přeskočeno"
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "varování"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "chyby"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Zálohovací zařízení chybí"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Zálohovací zařízení nebylo detekováno."
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Toto zařízení nemá žádné obrázky pro stažení."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Stahování začalo z %s"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr ""
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Zdroj: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Obrázkové zařízení: %s\n"
+msgid "Device: %s\n"
+msgstr ""
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Destinace: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Nelze vytvořit dočasný stahovací adresář"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Chyba:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Obrázek přeskočen"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr ""
+
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Stahování začalo z %s"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr ""
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr ""
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr ""
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Zálohovací zařízení chybí"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr ""
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Obrázek přepsán"
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr "Fotografie"
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr ""
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "Obrázek neexistuje"
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr ""
+
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr "Video"
+
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr ""
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "Obrázek nemá náhled"
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr ""
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s z %(total)s obrázků okopírováno"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr ""
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Nelze odstranit obrázky z obrázkového zařízení"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr ""
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Obrázek: %(source)s\n"
-"Chyba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Chyba: %(source)s"
+msgid "Photo: %(source)s"
+msgstr "Fotografie: %(source)s"
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "Z obrázkového zařízení odstraněno %i obrázků"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr ""
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Stahování kompletní z %s"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Zařízení"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Velikost"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Průběh stahování"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Náhled nemůže být zobrazen"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Toto může být poškozeno"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Zařízení detekováno"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
-msgstr "Máte zařízení či oddíl určený ke stažení?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Zapamatovat si tuto volbu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s vybráno pro stažení"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr "Toto zařízení či oddíl bude vždy použito pro stažení"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s odmítnuto jako stahovací zařízení"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr "Toto zařízení či oddíl nebude použito pro stažení"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Odstranit všechny pracovní kódy?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Chcete odstranit všechny pracovní kódy?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Vložte pracovní kód"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Vložte nový pracovní kód, nebo vyberte předchozí."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Vložte nový pracovní kód."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Pracovní kód:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Pracovní kód vložen"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Pracovní kód nebyl vložen"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Promiňte, tato lokace obrázku neexistuje:\n"
-"%(path)s\n"
-"\n"
-"Prosím vyřešte problém či upravte nastavení."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Problém s lokací obrázkové složky"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr ""
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr ""
+
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
 msgstr ""
-"Promiňte, stahovací složka neexistuje. Prosím vytvořte ji či upravte "
-"nastavení"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Promiňte, stahovací složka existuje, ale nelze do ní zapisovat. Prosím "
-"zkontrolujte oprávnění či nastavení programu"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Problém se stahovací složkou"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr ""
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Některé nastavení bylo resetováno."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Výzva pro použití %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Výzva pro pracovní kód"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Výzva k pracovnímu kódu již existuje, nevyzívejte znovu"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Stahování začne po vložení pracovního kódu"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Stahování začíná"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -701,7 +816,7 @@ msgstr ""
 "Novější verze této aplikace na tomto počítači již byla spuštěna.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -709,15 +824,15 @@ msgstr ""
 "Nastavení programu se zdá být validní, ale zkontrolujte bezpečnou opravnou "
 "operaci."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Promiňte, nastavení je invalidní a muselo být resetováno."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Varování:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -725,11 +840,11 @@ msgstr ""
 "Tato verze tohoto programu již na tomto počítači byla nainstalována. "
 "Kontrola nastavení."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Nastavení bylo modifikováno."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -741,11 +856,11 @@ msgstr ""
 "\n"
 "Prosím zkontrolujte bezpečnou opravnou operaci."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Žádné nastavení nebylo změněno."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -754,454 +869,516 @@ msgstr ""
 "Tato verze programu využívá uživatelsky jiné nastavení než ta předchozí. "
 "Některé nastavení je invalidní a nelze aktualizovat. Je tedy resetováno."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Problém používání pynotify."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Přijetí schopností pynotify serveru selhalo."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Varování: notifikační server prostředí plochy je špatně nakonfigurován."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "a"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Používání zálohovacích zařízení"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Používání zálohovacího zařízení"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Zálohovací zařízení nebylo detekováno"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Zařízení %(device)s (%(path)s) ignorováno"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Detekováno %(device)s s %(path)s cestami"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Automatický start stahování je povolen"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Automatický start stahování je zakázán"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Používání manuálně specifikované cesty"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr ""
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Všechna stahování kompletní"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Zbývá 1 sekunda"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Zbývá %i sekund"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Zbývá 1 minuta"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Zbývá %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "obrázky staženy"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr ""
+
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr ""
+
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr ""
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "obrázky přeskočeny"
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Stažení "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Pozastavit"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Nastavení změněno"
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Hezký den"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr "zobrazit informace o programu na příkazové řádce (default: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "pouze výstup chyb do příkazové řádky"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
-msgstr "program rozpozná typy obrázkových souborů a ukončí"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr ""
+
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr ""
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr ""
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "a %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr ""
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Používání"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s není připraven k používání"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Datum a čas"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Jméno souboru"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Sekvence"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Datum obrázku"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Dnes"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Včerejšek"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Jméno + koncovka"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Název"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Koncovka"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Číslo obrázku"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Clona"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Čas expozice"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Vzdálenost ohniska"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Vytvoření fotoaparátu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Druh fotoaparátu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Krátký druh kamery"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Model kamery v označení odděleném pomlčkou"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Sériové číslo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Číslo snímku"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Vlastníkovo jméno"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Dnešní stahování"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Číslo této relace"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Číslo podsložky"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Uskladněné číslo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Zpráva sekvence"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Všechny číslice"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Poslední číslice"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Poslední 2 číslice"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Poslední 3 číslice"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Poslední 4 číslice"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Originální obal"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "Velká písmena (ABCDEFG)"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "Malá písmena (abcdefg)"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Jedna číslice"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Dvě číslice"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Tři číslice"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Čtyři číslice"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Pět číslic"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Šest číslic"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Sedm číslic"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Milisekundy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "RRRR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "RR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM (minuty)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1210,53 +1387,64 @@ msgstr ""
 "Klíč nastavení '%(key)s' je invalidní\n"
 "Předpokládáno %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Hodnota nastavení '%(value)s' je invalidní"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Tato nastavení nejsou správně utvořena:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Metadata subsekund neprezentují obrázek"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "%s metadata nejsou v obrázku"
+msgid "%s metadata is not present"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Chyba v časovém komponentu. Hodnota %s se zdá invalidní"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
-msgstr "typ souboru byl rozeznán, ale obrázek nemá označení typu souboru"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
-msgstr "číslo obrázku bylo rozeznáno, ale obrázek nemá číslo"
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "chyba vygenerování jména s komponentem %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Nastavení podsložky nemělo začít %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Nastavení podsložky nemělo končit %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Nastavení podsložky by nemělo obsahovat dvě %s za sebou"
@@ -1286,36 +1474,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompaktibilita s jinými operačními systémy</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Složka stahování</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Podsložky stahování</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Příklad</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Obrázková zařízení</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Konflikt jmen obrázků</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Pracovní kódy</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Přejmenování obrázku</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Chybějící zálohovací zařízení</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Pracovní kódy</b>"
+msgid "<b>Photo Rename</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Chybějící zálohovací zařízení</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1330,8 +1518,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Photos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Příklad: /home/user/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1354,66 +1542,70 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Záloha</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Složka stahování</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Chybová obsluha</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Obrázková zařízení</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Pracovní kódy</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Přejmenování obrázku</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Pracovní kódy</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Možnosti přejmenování</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Přidat unikátní identifikátor"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Automatická detekce kapesních paměťových zařízení"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Automatická detekce zálohovacích zařízení"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Automatická detekce obrázkových zařízení"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatizace"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Záloha"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Jméno složky zálohování:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Umístění zálohy:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Zálohovat obrázky během stahování"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1421,65 +1613,82 @@ msgstr ""
 "Vyberte složku stahování. Podsložky pro stahované obrázky budou vytvořeny "
 "automaticky v této složce s použitím struktury specifikované níže."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:42
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
-"Vyberte zda má být přeskočeno stahování obrázku nebo přidejte unikátní "
-"identifikátor."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Začátek dne:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Odstranit obrázky ze zařízení po dokončení stahování"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Stahování / Pauza"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Složka stahování"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Složka stahování:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Dnešní stahování:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Chybová obsluha"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Chybový záznam"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Odejít z programu když bude stahování hotovo"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Máte-li zapnutou automatickou detekci, vyberte přesnou lokaci zálohy."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Máte-li zapnutou automatickou detekci, vyberte přesnou lokaci snímků."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1489,63 +1698,47 @@ msgstr ""
 "budou z tohoto zařízení hledány obrázky. Na zařízeních s větší kapacitou to "
 "bude trvat déle."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Obrázková zařízení"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Přejmenování obrázku"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Obrázková zařízení jsou zařízení, ze kterých se mohou stahovat fotografie, "
-"jsou to např.: fotoaparáty, paměťové karty nebo přenosná paměťová zařízení.\n"
-"\n"
-"Zde si můžete stáhnout fotografie z více obrázkových zařízení současně.\n"
-"\n"
-"<i>Pokud stažení přímo z fotoaparátu funguje špatně nebo vůbec nefunguje, "
-"zkuste je v nastavení přepnout do režimu PTP. Není-li to možné, zvažte "
-"použití čtečky karet. </i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Umístění obrázku:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Importujte své obrázky efektivně a spolehlivě"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Pracovní kódy"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr ""
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Přepsat"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Nastavení: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "O_dstranit vše"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1573,41 +1766,42 @@ msgstr ""
 "Downloader. Pokud ji neobržíte napište na: Free Software Foundation, Inc, 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Možnosti přejmenování"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Nahlásit varování"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Nahlásit chybu"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Vynechat"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Vynechat stahování"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Specifikujte složku, ve které jsou uloženy zálohy na zařízení.  \n"
-"\n"
-"<i>Poznámka: tento údaj bude také použit pro určení, zda je zařízení "
-"používané pro zálohování. Pokud chcete použít jiné zařízení pro zálohování , "
-"vytvořte v něm složku s tímto názvem.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1615,115 +1809,238 @@ msgstr ""
 "Specifikujte čas ve 24 hodinovém formátu aby mohlo být resetováno sekvenční "
 "číslo v <i>Dnešní stahování</i>."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Specifikujte, co se má dělat, když byl obrázek stejného jména již stažen "
-"nebo zálohován."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr ""
 "Specifikujte co se má dít, když když nejsou nalezena žádná zálohovací "
 "zařízení."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Specifikujte zda mají být z názvů obrázků a složek vymazány některé znaky "
-"které nejsou povoleny operačními systémy."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Start stahování při startu programu"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Start stahování po vložení obrázkového zařízení"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Uskladněné číslo:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Odstranit nekompatibilní znaky"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchronizovat sekvenční čísla RAW + JPEG"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Odpojit (\"vysunout\") obrázkové zařízení po dokončení stahování"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
-"Při zálohování vyberte zda chcete přepsat obrázek který má schodné jméno s "
-"jiným, či zda ho chcete nezálohovat."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Vy můžete vaše fotografie zálohovat do různých umístění a můžete je stahovat "
-"na různé externí disky."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Přidat..."
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Vyčistit kompletní stahování"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Záznam chyb"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Nápověda online..."
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Dejte příspěvek..."
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Fotografie"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Ohlásit problém..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Náhledy"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Přeložit tuto aplikaci..."
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Zobrazení"
 
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Chyba v nastavení přejmenovávání obrázků."
+
+#~ msgid "Select an image folder"
+#~ msgstr "Vyberte složku obrázků"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Vyberte složku do které má být uložena záloha obrázků"
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Název obrázku nemohl být vygenerován"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Skenování zařízení kompletní: žádné obrázky nebyly na %s nalezeny"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 z %s obrázků okopírováno"
+
+#~ msgid "Could not open image"
+#~ msgstr "Nelze otevřít obrázek"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s obrázků přeskočeno"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s obrázků staženo"
+
+#~ msgid "The image was not copied."
+#~ msgstr "Obrázek nebyl okopírován."
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Zálohovací zařízení nebylo detekováno."
+
+#~ msgid "Image skipped"
+#~ msgstr "Obrázek přeskočen"
+
+#~ msgid "Image already exists"
+#~ msgstr "Obrázek neexistuje"
+
+#~ msgid "images skipped"
+#~ msgstr "obrázky přeskočeny"
+
+#~ msgid "images downloaded"
+#~ msgstr "obrázky staženy"
+
+#~ msgid "Image location:"
+#~ msgstr "Umístění obrázku:"
+
+#~ msgid "Image Rename"
+#~ msgstr "Přejmenování obrázku"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
 
+#~ msgid "Download Folder"
+#~ msgstr "Složka stahování"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Obrázek přepsán"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Toto zařízení nemá žádné obrázky pro stažení."
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Náhled nemůže být zobrazen"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Přejmenování obrázku</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Příklad: /home/user/photos</i>"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Chyba v nastavení stahovací podsložky"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr "Sken zařízení kompletní: nalezeno %(number)s obrázků na %(device)s"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Záloha obrázku neexistuje"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "Obrázek nemá náhled"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Konflikt jmen obrázků</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Složka stahování</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Přejmenování obrázku</span>\t"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Jméno složky zálohování:"
+
+#~ msgid "Image Devices"
+#~ msgstr "Obrázková zařízení"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Obrázková zařízení</b>"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Zálohovat obrázky během stahování"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Vyberte zda má být přeskočeno stahování obrázku nebo přidejte unikátní "
+#~ "identifikátor."
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Automatická detekce obrázkových zařízení"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Odejít z programu když bude stahování hotovo"
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -1743,3 +2060,232 @@ msgstr "_Zobrazení"
 #~ "Adresář destinace nemohl být vytvořen\n"
 #~ "%(directory)s\n"
 #~ "Chyba: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Podsložka: %(subfolder)s\n"
+#~ "Obrázek: %(image)s\n"
+#~ "Problém: %(problem)s"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s z %(total)s obrázků okopírováno"
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Vy můžete vaše fotografie zálohovat do různých umístění a můžete je stahovat "
+#~ "na různé externí disky."
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Varování:</b> Existují dostatečná metadata obrázku. S jejich pomocí "
+#~ "lze vygenerovat název. Pokud chcete obrázek přejmenovat použijte nastavení "
+#~ "přejmenování.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Varování:</b> Existují dostatečná metadata obrázku pro vygenerování "
+#~ "podsložek. Pokud chcete podsložky přejmenovat použijte nastavení jmen.</i>"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Některé hodnoty v nastavení podsložky jsou nepodstatné a proto byly smazány."
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "%s metadata nejsou v obrázku"
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Start stahování po vložení obrázkového zařízení"
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Importujte své obrázky efektivně a spolehlivě"
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Metadata jsou základy pro generování podsložek / jmen obrázků.\n"
+#~ "Zdroj: %s"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Metadata subsekund neprezentují obrázek"
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Vložené nastavení podsložky je invalidní a nelze použít.\n"
+#~ "Bylo tedy resetováno na výchozí hodnoty."
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Odpojit (\"vysunout\") obrázkové zařízení po dokončení stahování"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Máte-li zapnutou automatickou detekci, vyberte přesnou lokaci snímků."
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr "typ souboru byl rozeznán, ale obrázek nemá označení typu souboru"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr "číslo obrázku bylo rozeznáno, ale obrázek nemá číslo"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr "program rozpozná typy obrázkových souborů a ukončí"
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Při zálohování vyberte zda chcete přepsat obrázek který má schodné jméno s "
+#~ "jiným, či zda ho chcete nezálohovat."
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Specifikujte zda mají být z názvů obrázků a složek vymazány některé znaky "
+#~ "které nejsou povoleny operačními systémy."
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Specifikujte, co se má dělat, když byl obrázek stejného jména již stažen "
+#~ "nebo zálohován."
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Obrázková zařízení jsou zařízení, ze kterých se mohou stahovat fotografie, "
+#~ "jsou to např.: fotoaparáty, paměťové karty nebo přenosná paměťová zařízení.\n"
+#~ "\n"
+#~ "Zde si můžete stáhnout fotografie z více obrázkových zařízení současně.\n"
+#~ "\n"
+#~ "<i>Pokud stažení přímo z fotoaparátu funguje špatně nebo vůbec nefunguje, "
+#~ "zkuste je v nastavení přepnout do režimu PTP. Není-li to možné, zvažte "
+#~ "použití čtečky karet. </i>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Obrázková zařízení</span>"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "Obrázek nemá metadata"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr "Máte zařízení či oddíl určený ke stažení?"
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Specifikujte složku, ve které jsou uloženy zálohy na zařízení.  \n"
+#~ "\n"
+#~ "<i>Poznámka: tento údaj bude také použit pro určení, zda je zařízení "
+#~ "používané pro zálohování. Pokud chcete použít jiné zařízení pro zálohování , "
+#~ "vytvořte v něm složku s tímto názvem.</i>"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Název obrázku se nepodařilo vygenerovat. Prosím zkontrolujte, zda existují "
+#~ "dostatečná metadata."
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Jméno podsložky nemohlo být řádně vygenerováno. Zkontrolujte, kde jsou "
+#~ "dostatečná metadata."
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Chyba: %(source)s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Nelze odstranit obrázky z obrázkového zařízení"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "Z obrázkového zařízení odstraněno %i obrázků"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Odstranit obrázky ze zařízení po dokončení stahování"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Obrázek: %(source)s\n"
+#~ "Chyba: %(errno)s %(strerror)s"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Detekovány obrázky se stejnými názvy, ale pořízenými v jiném časovém období:"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "První obrázek: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Druhý obrázek: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Obrázkové zařízení: %s\n"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Problém s lokací obrázkové složky"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Promiňte, stahovací složka neexistuje. Prosím vytvořte ji či upravte "
+#~ "nastavení"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Promiňte, stahovací složka existuje, ale nelze do ní zapisovat. Prosím "
+#~ "zkontrolujte oprávnění či nastavení programu"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Promiňte, tato lokace obrázku neexistuje:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Prosím vyřešte problém či upravte nastavení."
diff --git a/po/de.po b/po/de.po
index c55210d..5d66ac9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,220 +7,277 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 10:53+0000\n"
-"Last-Translator: Eg <Unknown>\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-28 04:58+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 19:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "New York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Prag"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Rom"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moskau"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Warschau"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Anzahl der ungültigen Downloads von heute.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Wert wird auf Null zurückgesetzt.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Der Vorgabewert für 'Start des Tages' ist ungültig.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Die Zeit wird auf Mitternacht zurückgesetzt.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Fehler in den Voreinstellungen zum Umbenennen der Dateien"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr "Fehler in den Vorgaben zur Umbennennung von Bildern"
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Entschuldigung, diese Voreinstellungen enthalten einen Fehler:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Die Voreinstellungen werden auf die Standardwerte zurückgesetzt."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Auftragsbezeichnung"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Fehler in den Download-Unterverzeichnis Voreinstellungen"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr "Fehler in den Vorgaben zur Umbennennung von Filmen"
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Fehler in den Vorgaben für Bilder-Downloadunterordner"
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Fehler in den Vorgaben zur Filme-Downloadunterordner"
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr "BIlder und Filme"
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "Bilder"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Wählen Sie ein Verzeichnis für den Download der Bilder"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Wählen Sie ein Bilder Verzeichnis"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr "Wählen Sie einen Ordner für den Download von Filmen"
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Wählen Sie einen Ordner welcher %(file_types)s enthält"
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
 msgstr ""
-"Wählen Sie ein Verzeichnis zur Speicherung der Sicherungskopien der Bilder"
+"Wählen Sie einen Ordner in welchem die Sicherungskopie von %(file_types)s "
+"erstellt werden soll"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Warnung:</b> Die Bilder enthalten ungenügende Metadaten um den "
-"Dateinamen zu erzeugen. Bitte verwenden Sie eine andere Option zur "
-"Umbenennung.</i>"
+"<i><b>Warnung:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Warnung:</b> Die Bilder enthalten ungenügende Metadaten um die "
-"Unterverzeichnisse zu erzeugen. Bitte verwenden Sie eine andere Einstellung "
-"zur Umbenennung.</i>"
+"<i><b>Warnung:</b> Die Metadaten sind unvollständig, die Unterordner können "
+"nicht erstellt werden. Bitte verwenden Sie andere Einstellungen zur "
+"Benennung der Unterordner.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Beispiel: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "Der Wert für heutige Downloads wurde nicht aktualisiert, da gerade ein "
 "Download stattfindet"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
 "Der Wert für gespeicherte Anzahl wurde nicht aktualisiert, da gerade ein "
 "Download stattfindet"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Es wurden einige unnötige Werte in den Voreinstellungen für "
-"Unterverteichnisse entfernt."
+"Bei den %(filetype)s Unterordner Einstellungen wurden überflüssige Werte "
+"entfernt."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Die gewählten Voreinstellungen für Unterverzeichnisse sind ungültig und "
-"können nicht benutzt werden.\n"
-"Sie werden auf Standardwerte zurückgesetzt."
+"Die eingegebenen Einstellungen für %(filetype)s Unterordner sind ungültig "
+"und können nicht verwendet werden.\n"
+"Sie werden auf die Standardwerte zurückgesetzt."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "Bild"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "Film"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "ExternesLaufwerk1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "ExternesLaufwerk2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "Bilder oder Filme"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "Filme"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "Überprüfe Laufwerke ..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr "Der folgende Downloadpfad konnte nicht erstellt werden::\n"
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr "%(path)s: "
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Der Download kann nicht weitergeführt werden"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Fehler in den Programmvoreinstellungen."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -229,45 +286,42 @@ msgstr ""
 "Bitte überprüfen Sie die Voreinstellungen, starten Sie das Programm neu und "
 "versuchen es erneut."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Der Download kann nicht weitergeführt werden"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 von %s Bildern kopiert"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr "0 von %(number)s %(filetypes)s"
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Überprüfung der Laufwerke abgeschlossen: %(number)s Bilder auf %(device)s "
-"gefunden"
+"Durchsuchen der Laufwerke abgeschlossen: %(number)s %(filetypes)s gefunden "
+"auf %(device)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
 msgstr ""
-"Überprüfung der Laufwerke abgeschlossen: Keine Bilder gefunden auf %s"
+"Durchsuchen der Laufwerke abgeschlossen: Keine %(filetypes)s gefunden auf "
+"%(device)s"
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Der Dateiname konnte nicht erzeugt werden"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr "%(filetype)s Dateiname konnte nicht erstellt werden"
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -276,15 +330,16 @@ msgstr ""
 "Quelle: %(source)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Der Dateiname konnte nicht erzeugt werden. Bitte überprüfen Sie die "
-"Metadaten der Bilddatei."
+"%(filetype)s Dateiname konnte nicht richtig erstellt werden. Bitte "
+"überprüfen Sie die Vollständigkeit der Metadaten."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -297,7 +352,8 @@ msgstr ""
 "Ziel: %(destination)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -306,21 +362,21 @@ msgstr ""
 "Quelle: %(source)s\n"
 "Ziel: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Die eindeutige Bezeichnung '%s' wurde hinzugefügt"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Quelle: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Fehler beim Kopieren"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -331,88 +387,108 @@ msgstr ""
 "Ziel: %(destination)s\n"
 "Fehler: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "Das Bild wurde nicht kopiert."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr "Die %(filetype)s wurde nicht kopiert."
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"Bilder mit gleichem Dateinamen aber abweichender Aufnahmezeit gefunden:"
+"Bilder mit identischen Dateinamen aber unterschiedlichen Aufnahmezeiten "
+"wurden gefunden:"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
 "Erstes Bild: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
 "Zweites Bild: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Das Bild konnte nicht geöffnet werden"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr "Konnte %(filetype)s nicht öffnen"
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Quelle: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "Das Bild enthält keine Metadaten"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr "%(filetype)s enthält keine Metadaten"
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Die Metadaten sind Voraussetzung für die Erstellung der Unterverzeichnisse / "
-"Dateinamen\n"
+"Metadata sind notwendig für die Erstellung von Unterordnern und/oder "
+"Dateinamen.\n"
 "Quelle: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Das Unterverzeichnis konnte nicht erzeugt werden. Bitte überprüfen Sie die "
-"Metadaten der Bilddatei."
+"Die Namen der Unterordner konnten nicht erstellt werden. Bitte überprüfen "
+"Sie die Vollständigkeit der metadaten."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
-"Unterverzeichnis: %(subfolder)s\n"
-"Bild: %(image)s\n"
+"Unterordner: %(subfolder)s\n"
+"Datei: %(file)s\n"
 "Problem: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Ein neuer Tag hat begonnen - die Anzahl der 'Downloads Heute' wird "
 "zurückgesetzt"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Die Sicherungskopie besteht bereits"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Sicherungskopie von %(file_type)s exisiert bereits"
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Sicherungskopie %(file_type)s wurde überschrieben"
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr "%(file_type)s konnte nicht auf %(volume)s gesichert werden"
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s wurde nicht gesichert"
+
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Fehler beim Erstellen der Sicherungskopie"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Das Zielverzeichnis konnte nicht erstellt werden: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -421,12 +497,17 @@ msgstr ""
 "Quelle: %(source)s\n"
 "Ziel: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Fehler: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr "%(file_type)s wurde nicht gesichert."
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -437,279 +518,348 @@ msgstr ""
 "Ziel: %(destination)s\n"
 "Fehler: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr "%(file_type)s konnte nicht gesichert werden"
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr "Es wurde kein verwendbares Sicherungslaufwerk gefunden"
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr "Es wurde kein Sicherungsverzeichnis gefunden"
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Das Laufwerk kann nun entfernt werden"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s Bilder heruntergeladen"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s heruntergeladen"
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s Bilder übersprungen"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr "%(noFiles)s %(filetypes)s übersprungen"
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "Warnungen"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "Fehler"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Das Laufwerk für die Sicherungskopien fehlt"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Das Laufwerk für die Sicherungskopien konnte nicht gefunden werden."
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr "Das Vorschaubild konnte nicht angezeigt werden"
 
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Das Laufwerk enthält keine Bilddateien."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Der Download von %s hat begonnen"
-
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Quelle: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Bilder-Laufwerk: %s\n"
+msgid "Device: %s\n"
+msgstr "Laufwerk: %s\n"
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Ziel: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Temporäres Download-Verzeichnis konnte nicht erstellt werden"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Fehler:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr "Das Laufwerk enthält keine %(types_searched_for)s zum Herunterladen"
+
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Der Download von %s hat begonnen"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr "Der Pfad zum Sicherungsverzeichnis ist ungültig"
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr "Der Pfad %s konnte nicht erstellt werden"
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr "Es können keine Sicherungskopien erstellt werden"
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Das Laufwerk für die Sicherungskopien fehlt"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr "Es wurde kein Sicherungslaufwerk automatisch erkannt"
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr "Bild"
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
 msgstr "Bild übersprungen"
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Bilddatei überschrieben"
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr "Das Bild exisiert bereits"
+
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr "Film"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "Bilddatei existiert bereits"
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr "Film übersprungen"
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "Die Datei enthält kein Vorschaubild"
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr "Der Film exisiert bereits"
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s von %(total)s Bildern kopiert"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s von %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Das Bild konnte auf dem Laufwerk nicht gelöscht werden."
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr "Es konnten von dem Laufwerk keine Bilder oder Filme gelöscht werden"
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
 "Bild: %(source)s\n"
 "Fehler: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
+msgid "Photo: %(source)s"
 msgstr "Bild: %(source)s"
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "%i Bilder auf dem Laufwerk gelöscht"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr "%(number)i %(filetypes)s vom Laufwerk gelöscht"
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Download von %s abgeschlossen"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Laufwerk"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Grösse"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Fortschritt im Download"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Vorschaubild kann nicht angezeigt werden"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Es könnte defekt sein"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
-msgstr "Laufwerk erkannt"
+msgstr "Laufwerk gefunden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
-"Sollen Bilder von diesem Laufwerk oder dieser Partition heruntergeladen "
-"werden?"
+"Soll dieses Laufwerk oder diese Partition zum Herunterladen von Bildern oder "
+"Filmen verwendet werden?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Auswahl merken"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s wurde zum Herunterladen ausgewählt"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr "Von diesem Laufwerk oder dieser Partition wird immer heruntergeladen"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s wurde als Laufwerk zum Herunterladen abgelehnt"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr "Von diesem Laufwerk oder dieser Partition wird nie heruntergeladen"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Alle Auftragsbezeichnungen löschen?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Sollen alle Auftragsbezeichnungen gelöscht werden?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Geben Sie eine Auftragsbezeichnung ein"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr ""
 "Geben Sie eine neue Auftragsbezeichnung an oder wählen Sie eine bereits "
 "bestehende."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Geben Sie eine neue Auftragsbezeichnung an."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Auftragsbezeichnung:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Auftragsbezeichnung eingegeben"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Keine Auftragsbezeichnung angegeben"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Dieses Bildverzeichnis existiert nicht:\n"
+"Dieser Laufwerkspfad existiert nicht:\n"
 "%(path)s\n"
 "\n"
-"Erstellen Sie das Verzeichnis oder passen Sie die Voreinstellungen an."
+"Beheben Sie das Problem oder ändern Sie die Voreinstellungen."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Problem mit dem Bildverzeichnis"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr "Probleme mit dem Laufwerk oder Verzeichnis"
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr "Das %(file_type)s Downloadverzeichnis existiert nicht.\n"
+
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
 msgstr ""
-"Das Downloadverzeichnis extisiert nicht. Erstellen Sie das Verzeichnis oder "
-"passen Sie die Voreinstellungen an."
+"Das %(file_type)s Downloadverzeichnis existiert, ist aber schreibgeschützt.\n"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Das Downloadverzeichnis ist schreibgeschützt. Ändern Sie die Zugriffsrechte "
-"oder passen Sie die Voreinstellungen an."
+"Mit den Downloadverzeichnissen bestehen Probleme. Bitte beheben Sie diese "
+"oder passen Sie die Voreinstellungen an.\n"
+"\n"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Problem mit dem Dowanloadverzeichnis"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr "Probleme mit den Downloadverzeichnissen"
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Einige Voreinstellungen werden zurückgesetzt."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Abfrage, ob %s zu benutzen ist"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Frage nach der Auftragsbezeichnung"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Auftragsbezeichnung wurde schon abgefragt, nicht wieder fragen"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr ""
 "Beginne mit den Dowaloads welche auf eine Auftragsbezeichnung gewartet haben"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Beginne mit den Downloads"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr "%(folder)s für das Herunterladen der Bilder erstellt"
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+"%(folder)s konnte als Standardverzeichnis zum Herunterladen der Bilder nicht "
+"erstellt werden"
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr "%(folder)s für das Herunterladen der Filme erstellt"
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+"%(folder)s konnte als Standardverzeichnis zum Herunterladen der Filme nicht "
+"erstellt werden"
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -718,7 +868,7 @@ msgstr ""
 "aufgerufen.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -726,17 +876,17 @@ msgstr ""
 "Die Programmvoreinstellungen scheinen gültig zu sein, aber bitte überprüfen "
 "Sie diese, um einen problemlosen Programmablauf zu gewährleisten."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Einige Voreinstellungen sind ungültig, sie werden auf die Standardwerte "
 "zurückgesetzt."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Warnung:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -744,11 +894,11 @@ msgstr ""
 "Diese Version des Programms ist neuer als bis bisherige. Die "
 "Voreinstellungen werden überprüft."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Die Voreinstellungen wurden geändert."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -759,11 +909,11 @@ msgstr ""
 "Voreinstellungen wurden angepasst\n"
 "Bitte überprüfen Sie diese."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Es mussten keine Voreinstellungen angepasst werden."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -773,117 +923,130 @@ msgstr ""
 "bisherige Version. Einige der bestehenden Einstellungen sind ungültig und "
 "werden auf die Standardwerte zurückgesetzt."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Bei der Verwendung von pynotify ist ein Problem aufgetreten."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Die Werte des pynotify Servers konnten nicht abgefragt werden."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Warnung: Der Desktop-Benachrichtigungsdienst ist falsch konfiguriert."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "und"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Die Sicherungslaufwerke werden verwendet"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Das Sicherungslaufwerk wird verwendet"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Es wurden keine Sicherungslaufwerke gefunden"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Laufwerk %(device)s (%(path)s) ignoriert"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Die %(device)s gefunden auf Pfad %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Der automatische Downloadbeginn ist eingeschaltet"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Der automatische Downloadbeginn ist ausgeschaltet"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Verwende den manuell eingegebenen Pfad"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr "Sicherungskopieren in %(path)s erstellen"
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Alle Downloads sind abgeschlossen"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Etwa 1 Sekunde verbleibend"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Etwa %i Sekunden verbleibend"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Etwa 1 Minute verbleibend"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Etwa %(minutes)i:%(seconds)02i Minuten verbleibend"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
 msgstr "Bilder heruntergeladen"
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
+#: rapid/rapid.py:4021
+msgid "photos skipped"
 msgstr "Bilder übersprungen"
 
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr "Filme heruntergeladen"
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr "Filme übersprungen"
+
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Download "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Pause"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Die Voreinstellungen wurden geändert."
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Auf Wiedersehen"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -892,337 +1055,388 @@ msgstr ""
 "Zeige die Programminformationen an, wenn das Programm aus der Kommandozeile "
 "aufgerufen wurde  (Voreinstellung: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "Zeige Fehlermeldungen nur auf der Kommandozeile an"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
-msgstr "Anzeigen der gültigen Dateiendungen und beenden"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr ""
+"Anzeigen der Dateitypen für Bilder und Filme anzeigen, welche das Programm "
+"erkennt und beenden"
+
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr "Alle Einstellungen auf Standardwerte zurücksetzten und beenden"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr "Bilder:"
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr "Filme:"
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "und %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr "Alle Einstellungen wurden zurückgesetzt"
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Verwende"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s wird bereits ausgeführt"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Datum Zeit"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Dateiname"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Sequenzen"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr "Film Datum"
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Heute"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Name + Erweiterung"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Name"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Erweiterung"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Bildnummer"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr "Film Nummer"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Blende"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO-Wert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Belichtungszeit"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Brennweite"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Kamerahersteller"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Kameramodell (kurz)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Kameramodell (kurz, Bindestriche)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Seriennummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Anzahl der Auslösungen"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Name des Eigentümers"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr "Codec"
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr "Breite"
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr "Höhe"
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr "Länge"
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr "Bilder pro Sekunde"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Downloads heute"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Sitzungsnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Nummer des Unterverzeichnisses"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Gespeicherte Nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Vorlaufender Buchstabe"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Alle Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Letzte Ziffer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Letzte 2 Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Letzte 3 Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Letze 4 Ziffern"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Ursprüngliche Schreibweise"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "GROSSBUCHSTABEN"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "kleinschreibung"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Eine Ziffer"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Zwei Ziffern"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Drei Ziffern"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Vier Ziffern"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Fünf Ziffern"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Sechs Ziffern"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Sieben Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Hundertstelsekunden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "JJJJMMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "JJJJ-MM-TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "JJMMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "JJ-MM-TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "MMTTJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "MMTTJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "MMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "TTMMJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "TTMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM (Minuten)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1231,56 +1445,67 @@ msgstr ""
 "Voreingestellter Schlüssel '%(key)s' ist ungültig.\n"
 "Erwarteter Wert %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Voreingestellter Wert '%(value)s' ist ungültig"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Diese Voreinstellungen sind falsch formatiert:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Das Bild enthält keine Hunderstelsekunden-Informationen"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr "Hundertstelssekunden Metadaten sind nicht vorhanden"
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "%s Metadaten sind im Bild nicht vorhanden"
+msgid "%s metadata is not present"
+msgstr "%s Metadaten sind nicht vorhanden"
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr ""
 "Fehler in den Datum/Zeit Informationen. Der Wert %s scheint ungültig zu sein"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
-msgstr ""
-"Erweiterung wurde angegeben, aber der Dateiname enthält keine Erweiterung"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
+msgstr "Ein Dateityp wurde angegeben aber der Dateiname enthält keinen Typen"
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
 msgstr ""
-"Eine Bildnummer wurde angegeben, aber der Dateiname enthält keine Nummer"
+"Eine Bild- oder Filmnummer wurde angegeben, aber der Dateiname enthält keine "
+"Nummer"
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr "%s Metadaten existieren im Bild nicht"
+
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "Ein Fehler ist aufgetreten bei der Erstellung des Namens mit %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr "%s Metadaten existieren im Film nicht"
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Die Unterverzeichnisvoreinstellungen sollten nicht mit %s beginnen"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Die Unterverzeichnisvoreinstellungen sollten nicht mit %s enden"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1312,36 +1537,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompatibilität mit anderen Betriebssystemen</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr "<b>Laufwerke</b>"
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Download Verzeichnis</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Download Unterverzeichnis</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Beispiel</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Laufwerke mit Bilddaten</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Konflikte der Bildernamen</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Auftragsbezeichnungen</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Umbenennung von Bildern</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Fehlende Sicherungslaufwerke</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Auftragsbezeichnungen</b>"
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Umbenennen von Bildern</b>"
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Fehlende Sicherungslaufwerke</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Namenskonflikte Bilder und Filme</b>"
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1356,8 +1581,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/medium/externeslaufwerk/Fotos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Beispiel: /home/user/Fotos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Beispiel: /home/user/Bilder</i>"
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1380,25 +1605,24 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Datensicherung</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Download Verzeichnis</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Laufwerke</span>"
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Fehlerbehandlung</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Laufwerke</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Auftragsbezeichnungen</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Umbenennung von Dateien</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Bilder Download Ordner</span>"
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Auftragsbezeichnungen</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Bilder Umbenennen</span>\t"
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
@@ -1406,42 +1630,46 @@ msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Einstellungen zur Umbenennung</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Film Download Ordner</span>"
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Filme Umbenennen</span>\t"
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Füge eine eindeutige Information hinzu"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Suche automatisch nach portablen Laufwerken"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Suche automatisch nach Backuplaufwerken"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Suche automatisch nach Laufwerken mit Bildern"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr "Automatisch erkannte Laufwerke"
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatisierung"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Datensicherung"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Verzeichnis für Datensicherung:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Ziel der Datensicherung"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Erstelle Sicherung der Bilder beim Herunterladen"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr "Sicherungskopien während dem Herunterladen erstellen"
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1449,67 +1677,101 @@ msgstr ""
 "Wählen Sie das Downloadverzeichnis. Unterverzeichnisse werden je nach "
 "gewählten Voreinstellungen automatisch erzeugt."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Wählen Sie das Bild zu überspringen oder eine eindeutige Bezeichnung "
-"einzufügen"
+"Wählen Sie den Download Ordner. Unterordner für die Filme werden automatisch "
+"basierend auf der unten angefügten Struktur erstellt."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:42
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+"Wählen Sie, ob der Download übersprungen oder eine eindeutige Bezeichnung "
+"angefügt werden soll."
+
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch Oktober 2007-2010"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Beginn des Tages:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Bilder auf dem Laufwerk nach erfolgreichem Download löschen"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr ""
+"Bilder und Filme nach vollständigem Download auf dem Laufwerk löschen"
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr "Laufwerke"
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+"Von Laufwerken können Bilder oder Filme heruntergeladen werden, z.B. "
+"Kameras, Speicherkarten oder externe Speichergeräte.\n"
+"\n"
+"Sie können gleichzeit von mehreren Laufwerken Bilder herunterladen oder auch "
+"einen Pfad auf Ihrer festplatte angeben.\n"
+"\n"
+"<i>Falls der Download von Ihrer Kamera schlecht oder nicht funktioniert, "
+"stellen Sie 'PTP Modus' ein. Sollte das nicht möglich sein, so verwenden Sie "
+"bitte Speicherkarten.</i>"
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Download / Pause"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Downloadverzeichnis"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Downloadverzeichnis:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Downloads heute:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Fehlerbehandlung"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Fehlerprotokoll"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Beende das Programm nach Abschluss des Downloads"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
+"Programm beenden falls das Herunterladen ohne Fehler oder Warnungen "
+"abgeschlossen wird."
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Wählen Sie das genaue Verzeichnis für die Datensicherung, falls die "
 "automatische Erkennung ausgeschaltet ist."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Wählen Sie das genaue Verzeichnis für die Bilder, falls die automatische "
-"Erkennung ausgeschaltet ist."
+"Falls Sie die automatische Erkennung von Laufwerken ausschalten, geben Sie "
+"bitte den genauen Pfad zu den Bildern oder Filmen an."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1519,63 +1781,47 @@ msgstr ""
 "das gesamte Laufwerk nach Bildern durchsucht. Bei sehr grossen Datenträgern "
 "kann dies eine Weile dauern."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Laufwerke mit Bildern"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Dateiumbenennung"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Laufwerke mit Bilddaten sind Laufwerke, von welchen Bilder heruntergeladen "
-"werden können, z.B. Kameras, Speicherkarten oder portable Speichermedien.\n"
-"\n"
-"Sie können Bilder von mehreren Speichermedien gleichzeitig herunterladen.\n"
-"\n"
-"<i>Wenn das direkte Herunterladen von Ihrer Kamera langsam oder überhaupt "
-"nicht funktioniert, versuchen Sie diese in den PTP Modus zu schalten. Sollte "
-"das nicht möglich sein, verwenden Sie bitte einen Kartenleser.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Bilder Quelle:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Importieren Sie Ihre Bilder effizient und zuverlässig"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Auftragsbezeichnungen"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr "Ort:"
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Überschreibe"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr "Bilder Verzeichnisse"
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr "Bilder Umbenennen"
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr "Ordner für Sicherungskopien der Bilder:"
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Voreinstellungen: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "_Alle entfernen"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1605,42 +1851,51 @@ msgstr ""
 "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Optionen für die Umbenennung"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Warnung anzeigen"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Fehler anzeigen"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Überspringen"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Überspringe Download"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+"Das Herunterladen von Filmen steht aktuell nicht zur Verfügung. Um dies zu "
+"ermöglichen muss zunächst das Paket <i>kaa metadata</i> für Python "
+"installiert werden."
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Geben Sie ein Verzeichnis an, in welchem die Sicherungskopien auf dem "
-"Laufwerk gespeichert werden.\n"
-"<i>Hinweis: Diese Einstellung wird auch verwendet um festzulegen, ob das "
-"Laufwerk für Sicherungskopien verwendet wird oder nicht. Bitte erstellen Sie "
-"auf jedem Laufwerk, welches Sie zur Datensicherung verwenden wollen, ein "
-"Verzeichnis mit diesem Namen.</i>"
+"Geben Sie den Ordner an, in welchem die Sicherungskopien gespeichert werden. "
+" \n"
+"\n"
+"<i>Hinweis: Dies wird auch für den Entscheid verwendet, ob das Laufwerk für "
+"Sicherungskopien verwendet wird. Erstellen Sie auf jedem Laufwerk, welches "
+"für Sicherungskopien verwendet wird, einen Ordner mit diesem Namen.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1648,113 +1903,185 @@ msgstr ""
 "Geben Sie die Zeit im 24-Stunden Format an, wann die Sequenznummer in "
 "<i>Downloads heute</i> zurückgesetzt werden soll."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Geben Sie an was geschehen soll, falls eine Datei oder eine Sicherungskopie "
-"mit demselben Namen bereits existiert."
+"Geben Sie an was zu tun ist, falls im Download- oder Sicherungsverzeichnis "
+"bereits eine Datei mit demselben Namen exisiert."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr ""
 "Geben Sie an was geschehen soll, falls keine Sicherungslaufwerke vorhanden "
 "sind."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Geben Sie an was geschehen soll, wenn die Verzeichnisse Zeichen enthalten, "
-"welche von anderen Betriebssystemen nicht unterstützt werden."
+"Geben Sie ab, ob Zeichen in Namen oder Ordnern, welche auf einem anderen "
+"Betriebssystem nicht gültig sind, entfernt werden sollen."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Beginn des Downloads bei Programmstart"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Beginn des Downloads beim Einfügen von Bilderlaufwerken"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr "Mit dem Herunterladen beginnen, sobald ein Laufwerk verfügbar ist"
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Gespeicherte Nummer"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Entferne nicht kompatible Zeichen"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchronisiere RAW + JPEG Sequenznummern"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Aufwerfen des Bildlaufwerks nach Beendigung des Downloads"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr ""
+"Unmount (\"Auswerfen\") des Laufwerkes, sobald das Herunterladen beendet ist"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr "Filme Ordner"
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr "Filme Umbenennen"
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr "Sicherungsordner für Filme:"
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
-"Während der Datensicherung können bestehende Bilder auf dem "
-"Sicherungslaufwerk überschrieben oder übersprungen werden."
+"Bitte geben Sie an was geschehen soll, falls bei der Sicherung bereits eine "
+"Datei mit demselben Namen vorhanden ist, Überspringen oder Überschreiben."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Sie können Bilder während des Herunterladens an mehrere Orten sichern, z.B. "
-"auf externe Festplatten."
+"Bilder und Filme können während dem Herunterladen an mehrere Orte gesichert "
+"werden, z.B. auf externe Laufwerke."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Hinzufügen …"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Heruntergeladene Dateien nicht mehr anzeigen"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Fehlerprotokoll"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Online Hilfe ..."
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Machen Sie eine Spende"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Fotos"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Problemmeldung"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Vorschaubilder"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Übersetzung der Applikation"
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Ansicht"
 
 #, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 von %s Bildern kopiert"
+
+#~ msgid "Could not open image"
+#~ msgstr "Das Bild konnte nicht geöffnet werden"
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Der Dateiname konnte nicht erzeugt werden"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Der Dateiname konnte nicht erzeugt werden. Bitte überprüfen Sie die "
+#~ "Metadaten der Bilddatei."
+
+#~ msgid "Image has no metadata"
+#~ msgstr "Das Bild enthält keine Metadaten"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Die Sicherungskopie besteht bereits"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s Bilder übersprungen"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s Bilder heruntergeladen"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Bilddatei überschrieben"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Das Laufwerk enthält keine Bilddateien."
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "Die Datei enthält kein Vorschaubild"
+
+#~ msgid "Image skipped"
+#~ msgstr "Bild übersprungen"
+
+#~ msgid "Image already exists"
+#~ msgstr "Bilddatei existiert bereits"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s von %(total)s Bildern kopiert"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Vorschaubild kann nicht angezeigt werden"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Überprüfung der Laufwerke abgeschlossen: %(number)s Bilder auf %(device)s "
+#~ "gefunden"
+
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -1765,6 +2092,11 @@ msgstr "_Ansicht"
 #~ "Problem: %(problem)s"
 
 #, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr ""
+#~ "Überprüfung der Laufwerke abgeschlossen: Keine Bilder gefunden auf %s"
+
+#, python-format
 #~ msgid ""
 #~ "Destination directory could not be created\n"
 #~ "%(directory)s\n"
@@ -1774,5 +2106,304 @@ msgstr "_Ansicht"
 #~ "%(directory)s\n"
 #~ "Fehler: %(errno)s %(strerror)s"
 
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Das Bild enthält keine Hunderstelsekunden-Informationen"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "%s Metadaten sind im Bild nicht vorhanden"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr ""
+#~ "Eine Bildnummer wurde angegeben, aber der Dateiname enthält keine Nummer"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Laufwerke mit Bilddaten</b>"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Umbenennung von Bildern</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Laufwerke</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Download Verzeichnis</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"x-large\">Umbenennung von Dateien</span>\t"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Erstelle Sicherung der Bilder beim Herunterladen"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Verzeichnis für Datensicherung:"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Suche automatisch nach Laufwerken mit Bildern"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
+
+#~ msgid "Download Folder"
+#~ msgstr "Downloadverzeichnis"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Beende das Programm nach Abschluss des Downloads"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Wählen Sie das genaue Verzeichnis für die Bilder, falls die automatische "
+#~ "Erkennung ausgeschaltet ist."
+
+#~ msgid "Image Rename"
+#~ msgstr "Dateiumbenennung"
+
+#~ msgid "Image Devices"
+#~ msgstr "Laufwerke mit Bildern"
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Importieren Sie Ihre Bilder effizient und zuverlässig"
+
+#~ msgid "Image location:"
+#~ msgstr "Bilder Quelle:"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Geben Sie an was geschehen soll, wenn die Verzeichnisse Zeichen enthalten, "
+#~ "welche von anderen Betriebssystemen nicht unterstützt werden."
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Während der Datensicherung können bestehende Bilder auf dem "
+#~ "Sicherungslaufwerk überschrieben oder übersprungen werden."
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Aufwerfen des Bildlaufwerks nach Beendigung des Downloads"
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Beginn des Downloads beim Einfügen von Bilderlaufwerken"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Das Laufwerk für die Sicherungskopien konnte nicht gefunden werden."
+
+#~ msgid "images skipped"
+#~ msgstr "Bilder übersprungen"
+
+#~ msgid "images downloaded"
+#~ msgstr "Bilder heruntergeladen"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr ""
+#~ "Erweiterung wurde angegeben, aber der Dateiname enthält keine Erweiterung"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Beispiel: /home/user/Fotos</i>"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Wählen Sie das Bild zu überspringen oder eine eindeutige Bezeichnung "
+#~ "einzufügen"
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Sie können Bilder während des Herunterladens an mehrere Orten sichern, z.B. "
+#~ "auf externe Festplatten."
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Geben Sie an was geschehen soll, falls eine Datei oder eine Sicherungskopie "
+#~ "mit demselben Namen bereits existiert."
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Bild: %(source)s\n"
+#~ "Fehler: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Bild: %(source)s"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Konflikte der Bildernamen</b>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Warnung:</b> Die Bilder enthalten ungenügende Metadaten um den "
+#~ "Dateinamen zu erzeugen. Bitte verwenden Sie eine andere Option zur "
+#~ "Umbenennung.</i>"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Bilder mit gleichem Dateinamen aber abweichender Aufnahmezeit gefunden:"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Erstes Bild: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Zweites Bild: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#~ msgid "The image was not copied."
+#~ msgstr "Das Bild wurde nicht kopiert."
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Bilder-Laufwerk: %s\n"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Das Bild konnte auf dem Laufwerk nicht gelöscht werden."
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "%i Bilder auf dem Laufwerk gelöscht"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Problem mit dem Bildverzeichnis"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr "Anzeigen der gültigen Dateiendungen und beenden"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Bilder auf dem Laufwerk nach erfolgreichem Download löschen"
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Laufwerke mit Bilddaten sind Laufwerke, von welchen Bilder heruntergeladen "
+#~ "werden können, z.B. Kameras, Speicherkarten oder portable Speichermedien.\n"
+#~ "\n"
+#~ "Sie können Bilder von mehreren Speichermedien gleichzeitig herunterladen.\n"
+#~ "\n"
+#~ "<i>Wenn das direkte Herunterladen von Ihrer Kamera langsam oder überhaupt "
+#~ "nicht funktioniert, versuchen Sie diese in den PTP Modus zu schalten. Sollte "
+#~ "das nicht möglich sein, verwenden Sie bitte einen Kartenleser.</i>"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr ""
+#~ "Sollen Bilder von diesem Laufwerk oder dieser Partition heruntergeladen "
+#~ "werden?"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Dieses Bildverzeichnis existiert nicht:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Erstellen Sie das Verzeichnis oder passen Sie die Voreinstellungen an."
+
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Fehler in den Voreinstellungen zum Umbenennen der Dateien"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Das Downloadverzeichnis extisiert nicht. Erstellen Sie das Verzeichnis oder "
+#~ "passen Sie die Voreinstellungen an."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Das Downloadverzeichnis ist schreibgeschützt. Ändern Sie die Zugriffsrechte "
+#~ "oder passen Sie die Voreinstellungen an."
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Die gewählten Voreinstellungen für Unterverzeichnisse sind ungültig und "
+#~ "können nicht benutzt werden.\n"
+#~ "Sie werden auf Standardwerte zurückgesetzt."
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Es wurden einige unnötige Werte in den Voreinstellungen für "
+#~ "Unterverteichnisse entfernt."
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Die Metadaten sind Voraussetzung für die Erstellung der Unterverzeichnisse / "
+#~ "Dateinamen\n"
+#~ "Quelle: %s"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Fehler in den Download-Unterverzeichnis Voreinstellungen"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Warnung:</b> Die Bilder enthalten ungenügende Metadaten um die "
+#~ "Unterverzeichnisse zu erzeugen. Bitte verwenden Sie eine andere Einstellung "
+#~ "zur Umbenennung.</i>"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Wählen Sie ein Bilder Verzeichnis"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr ""
+#~ "Wählen Sie ein Verzeichnis zur Speicherung der Sicherungskopien der Bilder"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Das Unterverzeichnis konnte nicht erzeugt werden. Bitte überprüfen Sie die "
+#~ "Metadaten der Bilddatei."
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Unterverzeichnis: %(subfolder)s\n"
+#~ "Bild: %(image)s\n"
+#~ "Problem: %(problem)s"
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Geben Sie ein Verzeichnis an, in welchem die Sicherungskopien auf dem "
+#~ "Laufwerk gespeichert werden.\n"
+#~ "<i>Hinweis: Diese Einstellung wird auch verwendet um festzulegen, ob das "
+#~ "Laufwerk für Sicherungskopien verwendet wird oder nicht. Bitte erstellen Sie "
+#~ "auf jedem Laufwerk, welches Sie zur Datensicherung verwenden wollen, ein "
+#~ "Verzeichnis mit diesem Namen.</i>"
diff --git a/po/es.po b/po/es.po
index 99f0a59..821e0a5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,218 +7,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-22 21:38+0000\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-29 19:27+0000\n"
 "Last-Translator: Abel O'Rian <abel.orian@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-22 21:52+0000\n"
+"X-Launchpad-Export-Date: 2010-05-30 14:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "Nueva York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teherán"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "París"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlín"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moscú"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Varsovia"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Estocolmo"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Valor inválido de descargas de hoy.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Restableciendo valor a cero.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Valor preferencial de 'Inicio del día' corrupto.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Restableciendo a medianoche.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Error en las preferencias de Renombrar Imagen"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr ""
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Lo siento, pero estas preferencias contienen un error:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Restableciendo a los valores por defecto."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Código de trabajo"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Error en las preferencias de la Subcarpeta de Descargas"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr ""
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr "fotos y videos"
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "fotos"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Seleccionar una carpeta para descargar las fotos"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Seleccionar una carpeta de imágenes"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr "Selecciona un directorio donde descargar los videos"
+
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr ""
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Seleccione una carpeta para respaldar las imágenes"
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Advertencia:</b> No hay suficientes metadatos de imagen para generar "
-"completamente el nombre. Por favor,  use otras opciones de renombre.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Advertencia:</b> No hay suficientes metadatos de imagen para generar "
-"completamente las subcarpetas. Por favor, use otras opciones de renombre de "
-"subcarpetas.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Ejemplo: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "El número de descargas de hoy no se actualizó, pues se está haciendo una "
 "descarga actualmente."
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
 "El número de almacenados no se actualizó, pues se está haciendo una descarga "
 "actualmente."
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Se han removido innecesariamente algunos valores de las preferencias de la "
-"subcarpeta."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Las preferencias de subcarpeta ingresadas son inválidas y no pueden ser "
-"usadas.\n"
-"Estas serán restablecidas a los valores por defecto."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "foto"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "video"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "dispositivoexterno1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "dispositivoexterno2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "fotos y videos"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "videos"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "explorando..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr ""
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr ""
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "No se puede proceder con la descarga"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Hay un error en las preferencis del programa."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -226,45 +273,40 @@ msgstr ""
 "\n"
 "Por favor, revise las preferencias, reinicie el programa e intente de nuevo."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "No se puede proceder con la descarga"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 de %s imagenes copiadas"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr ""
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Exploración del dispositivo completada: encontradas %(number)s imágenes en "
-"%(device)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
 msgstr ""
-"Exploración del dispositivo completada: no se han encontrado imágenes en %s"
+"Escaneo del dispositivo completo: No se encuentran %(filetypes)s en "
+"%(device)s"
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "No se pudo generar el nombre del archivo de imagen"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -273,15 +315,14 @@ msgstr ""
 "Origen: %(source)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"No se pudo generar correctamente el nombre del archivo de imagen. Compruebe "
-"que existan suficientes meta-datos."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -294,7 +335,8 @@ msgstr ""
 "Destino: %(destination)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -303,21 +345,21 @@ msgstr ""
 "Origen: %(source)s\n"
 "Destino: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Identificador único '%s' agregado"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origen: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Error al copiar la descarga"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -328,88 +370,98 @@ msgstr ""
 "Destino: %(destination)s\n"
 "Error: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "La imagen no fue copiada."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr ""
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"Imágenes detectadas con el mismo nombre de archivo, pero tomadas en "
-"diferentes momentos"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Primera imagen: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Segunda imagen: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"Primera foto: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Segunda foto: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "No se pudo abrir la imagen"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr ""
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Origen: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "La imagen no tiene metadatos"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr ""
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Los metadatos son esenciales para generar subcarpetas/nombres de imagen.\n"
-"Destino: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"El nombre de la subcarpeta no pudo ser generado correctamente. Compruebe que "
-"existan suficientes metadatos."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
-"Subcarpeta: %(subfolder)s\n"
-"Imagen: %(image)s\n"
-"Problema: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Ha empezado un nuevo día - restableciendo los números de secuencia de "
 "'Descargas del día'"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "La copia de seguridad de la imagen ya existe"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr ""
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Error en copia de seguridad"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "El directorio de destino no puede ser creado: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -418,12 +470,17 @@ msgstr ""
 "Origen: %(source)s\n"
 "Destino: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Error: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr ""
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -434,274 +491,329 @@ msgstr ""
 "Destino: %(destination)s\n"
 "Error: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr ""
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr ""
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr ""
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "El dispositivo ya se puede extraer de forma segura"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s imágenes descargadas"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr ""
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s imagenes saltadas"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr ""
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "avisos"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "errores"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Dispositivo de respaldo perdido"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "No se detectó un dispositivo de respaldo."
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "El dispositivo no tiene imágenes para descargar."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "La descarga empezó desde %s"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr ""
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Origen: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Dispositivo de imagen: %s\n"
+msgid "Device: %s\n"
+msgstr "Dispositivo: %s\n"
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Destino: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "No se pudo crear el directorio de descarga temporal"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Error:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Imagen saltada"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr ""
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Imagen sobreescrita"
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "La descarga empezó desde %s"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "La imagen ya existe"
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr ""
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "La imagen no tiene miniatura"
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr ""
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr ""
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Dispositivo de respaldo perdido"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr ""
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr "Foto"
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr ""
+
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr "Foto ya existe"
+
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr "Video"
+
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr "Video saltado"
+
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr "Video ya existe"
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s de %(total)s imágenes copiadas"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr ""
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "No se pudo eliminar la imagen del dispositivo de imágenes"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr ""
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Imagen: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Imagen: %(source)s"
+msgid "Photo: %(source)s"
+msgstr ""
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "Se eliminaron %i imágenes del dispositivo de imágenes"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr ""
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Descarga completa desde %s"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Tamaño"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Progreso de descarga"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Miniatura no puede mostrarse"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Puede estar corrupta"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Dispositivo detectado"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
-msgstr "¿Deberían bajarse imágenes de este dispositivo o partición?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Recordar esta elección"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s seleccionado para descargar de"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr "Siempre se descargará de este dispositivo o partición"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s rechazado como dispositivo de descarga"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr "Jamás se descargará de este dispositivo o partición"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "¿Borrar todos los Códigos de Trabajo?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "¿Deberían ser removidos todos los Codigos de Trabajo?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Ingrese un Código de trabajo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Entre un nuevo código de trabajo o seleccione uno previo."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Entre un nuevo código de trabajo."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Código de trabajo:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Código de trabajo ingresado"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Código de trabajo no introducido"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Disculpe, la ubicación de la imagen no existe:\n"
-"%(path)s\n"
-"\n"
-"Por favor, resuelva el problema, o modifique sus preferencias."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Problema con Ubicación de Carpeta de Imagen"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr ""
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
 msgstr ""
-"Lo sentimos, la Carpeta de Descarga no existe. Por favor, cree la carpeta, o "
-"modifique sus preferencias"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgstr ""
+
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Lo sentimos, la Carpeta de Descarga existe pero no puede ser escrita. Por "
-"favor compruebe los permisos de la carpeta, o modifique sus preferencias"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Problema con la Carpeta de Descarga"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr ""
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Algunas preferencias serán restablecidas."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Preguntando si usar o no %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Pidiendo un Código de trabajo"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Preguntando por código de trabajo, no volver a preguntar"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Iniciando descargas que han sido esperadas por un Código de trabajo"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Iniciando descargas"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -709,7 +821,7 @@ msgstr ""
 "Una versión mas nueva de este programa fue ejecutada antes en este equipo.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -717,15 +829,15 @@ msgstr ""
 "Las preferencias del programa parecen ser válidas, pero por favor revise a "
 "fin de garantizar el correcto funcionamiento."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Lo siento, algunas preferencias son invalidas y serán restablecidas"
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Aviso:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -733,11 +845,11 @@ msgstr ""
 "Esta versión del programa es más reciente que la versión previamente "
 "ejecutada. Compruebe las preferencias."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Las preferencias fueron modificadas."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -749,11 +861,11 @@ msgstr ""
 "\n"
 "Por favor, compruebe el correcto funcionamiento."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Ninguna preferencia necesita ser cambiada."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -763,118 +875,131 @@ msgstr ""
 "Algunas de sus preferencias anteriores no eran válidas, y no pueden ser "
 "actualizadas, por lo que serán restablecidas."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Problema usando pynotify."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Fallo al recibir capacidades del servidor pynotify"
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Advertencia: el servidor de notificaciones del entorno de escritorio no está "
 "configurado correctamente."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "y"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Dispositivos de copia de seguridad no detectados"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Dispositivo %(device)s (%(path)s) ignorado"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Detectado %(device)s con ruta %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Iniciar automaticamente la descarga está activa"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Iniciar automaticamente la descarga está desactivada"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Usando manualmente la ruta especifica"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr ""
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Todas las descargas completadas"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Aproximadamente 1 segundo restante"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Aproximadamente %i segundos restantes"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Aproximadamente 1 minuto restante"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Resta cerca de %(minutes)i:%(seconds)02i minutos"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "imagenes descargadas"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr "fotos descargadas"
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "Imágenes saltadas"
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr "fotos saltadas"
+
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr "videos descargados"
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr "videos saltados"
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Descargar "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Pausar"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Las preferencias fueron cambiadas."
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Adiós"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -883,338 +1008,386 @@ msgstr ""
 "mostrar la información del programa en la línea de comandos de como se "
 "ejecuta el programa (por defecto: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "solo errores de salida en la línea de comando"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
-"lista de extensiones de archivo de imagen que el programa reconoce y salir"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr "Fotos:"
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr "Videos:"
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "y %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr ""
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Usando"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s ya se está ejecutando"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Fecha"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Texto"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Secuencias"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Fecha de la imagen"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Hoy"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Nombre + extensión"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Nombre"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Extensión"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Número de imagen"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Apertura"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Tiempo de exposición"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Longitud focal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Marca cámara"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Modelo de la camara"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Modelo corto de cámara"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Modelo de cámara con guión corto"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Número de serie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Obturador contador"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Nombre propietario"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr "Códec"
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr "Ancho"
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr "Alto"
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr "Duración"
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr "Cuadros por Segundo"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Descargas de hoy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Número de sesión"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Número de subcarpeta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Número almacenado"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Letra de secuencia"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Todos los digitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Último dígito"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Últimos 2 dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Últimos 3 dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Últimos 4 dígitos"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Mantener original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "MAYÚSCULAS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "minúsculas"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Un dígito"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Dos dígitos"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Tres dígitos"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Cuatro dígitos"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Cinco dígitos"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Seis dígitos"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Siete digitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Sub-segundos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "AAAAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "AAAA-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "AAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "AA-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM (minutos)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1223,55 +1396,64 @@ msgstr ""
 "Clave preferida '%(key)s' es inválida.\n"
 "Esperado uno de %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Valor '%(value)s' es inválido"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Estas preferencias no están bien formadas:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Metadato de sub-segundos no esta presente en la imagen"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "metadato %s no está presente en la imagen"
+msgid "%s metadata is not present"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Error en el campo de fecha. El valor %s parece inválido"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
 msgstr ""
-"La extensión fue especificada, pero el nombre de la imagen no tiene extensión"
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
 msgstr ""
-"Número de imagen fue especificado, pero el nombre de la imagen no lo tiene"
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "Error generando nombre con componente %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferencias de subcarpeta no debería empezar con una %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferencias de subcarpeta no debería terminar con una %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1302,36 +1484,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Compatibilidad con otros Sistemas Operativos</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr "<b>Dispositivos</b>"
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Carpeta de descargas</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Subcarpeta de descargas</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Ejemplo</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Dispositivos de imagen</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Conflictos en nombre de imagen</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Códigos de trabajo</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Renombrar imagen</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Dispositivo de respaldo perdido</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Códigos de trabajo</b>"
+msgid "<b>Photo Rename</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Dispositivo de respaldo perdido</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1346,8 +1528,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Imágenes</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Ejemplo: /home/user/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Ejemplo: /home/user/Pictures</i>"
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1370,66 +1552,70 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Respaldo</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Carpeta de descargas</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Manejo de errores</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivos de imagen</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Códigos de trabajo</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Renombrar imagen</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Códigos de trabajo</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Opciones de renombre</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Agregar identificador único"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Detectar automáticamente dispositivos de almacenamiento portables"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Detectar automáticamente dispositivos de respaldo"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Detectar automáticamente dispositivos de imagen"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatización"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Respaldo"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Nombre de carpeta de respaldo"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Ruta de respaldo:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Respaldar fotos al descargarlas"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1438,68 +1624,82 @@ msgstr ""
 "serán creadas automáticamente en la carpeta usando la estructura "
 "especificada abajo."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Seleccione si desea saltar la descarga de la imagen, o añadir un "
-"identificador único."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:42
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Día de inicio:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
 msgstr ""
-"Eliminar imágenes de dispositivo de imágenes cuando se completen las "
-"descargas"
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr "Dispositivos"
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Descargar / Pausar"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Carpeta de descarga"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Carpeta de descarga:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Descargas de hoy:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Manejo de errores"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Registro de error"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Salir del programa al completar exitosamente la descarga"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Si desactiva la detección automática, seleccione la ruta exacta de respaldo."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Si desactiva la detección automática, seleccione la ruta exacta de las "
-"imágenes."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1509,64 +1709,47 @@ msgstr ""
 "portátil, será revisado completamente en busca de imágenes. En dispositivos "
 "grandes, esto puede tomar algún tiempo."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Dispositivos de imagen"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Renombrar imagen"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Los dispositivos de imagen son aquellos desde los cuales descargará las "
-"fotos,  como cámaras, tarjetas de memoria o Dispositivos de almacenamiento "
-"portátil.\n"
-"\n"
-"Puede descargar fotos desde múltiples dispositivos simultaneamente.\n"
-"\n"
-"<i>Si la descarga desde su cámara funciona lento o no funciona, pruebe "
-"configurarla en modo PTP. Si esto no es posible, considere usar un lector de "
-"tarjetas.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Ruta de imagen:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Importar sus imágenes de manera eficiente y fiable"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Códigos de trabajo"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr "Ubicación:"
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Preferencias: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "R_emover todo"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1596,43 +1779,42 @@ msgstr ""
 "con Rapid Photo Downloader; si no, escriba a la Free Software Foundation, "
 "Inc,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, EE. UU."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Opciones de renombre"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Reportar un aviso"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Reportar un error"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Saltar"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Saltar descarga"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Especificar la carpeta en la que las copias de seguridad se almacenan en el "
-"dispositivo.  \n"
-"\n"
-"<i>Nota: esto también se utilizará para determinar si el dispositivo se "
-"utiliza para las copias de seguridad. Para cada dispositivo que desea "
-"utilizar para hacer copias de seguridad se creará una carpeta con este "
-"nombre.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1640,113 +1822,166 @@ msgstr ""
 "Especifique la hora en formato de 24 horas en la que el numero de secuencia "
 "de las <i> Descargas de hoy </i>, debe ser restablecido."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Especificar qué hacer cuando una imagen del mismo nombre ya se ha descargado "
-"o respaldado."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr "Especificar que hacer cuando no hay dispositivos de respaldo."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Especificar si la imagen y los nombres de las carpetas se le han removido "
-"carácteres que no se permite a otros sistemas operativos."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Empezar descargas al iniciar el programa"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Empezar a descargar sobre dispositivo de imagen insertado"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Número almacenado:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Quitar carácteres incompatibles"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Sincronizar números de secuencia de RAW + JPEG"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
-"Desmontar (\"expulsar\") el dispositivo de imagenes una vez completada la "
-"descarga"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"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 respalde, elegir si desea sobreescribir la imagen en el dispositivo "
-"de seguridad que tiene el mismo nombre, o de saltar su respaldo."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Puede tener respaldos de sus fotos en múltiples ubicaciones, por ejemplo: "
-"discos duros externos."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Añadir…"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Limpiar descargas completadas"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Registro de errores"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Conseguir ayuda online"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Hacer una donación"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Fotos"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Reportar problema..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Miniaturas"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Traducir esta aplicación..."
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Ver"
 
 #, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 de %s imagenes copiadas"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Seleccionar una carpeta de imágenes"
+
+#~ msgid "Could not open image"
+#~ msgstr "No se pudo abrir la imagen"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "La imagen no tiene metadatos"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "La copia de seguridad de la imagen ya existe"
+
+#~ msgid "The image was not copied."
+#~ msgstr "La imagen no fue copiada."
+
+#~ msgid "Image overwritten"
+#~ msgstr "Imagen sobreescrita"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s imágenes descargadas"
+
+#~ msgid "Image already exists"
+#~ msgstr "La imagen ya existe"
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr ""
+#~ "Desmontar (\"expulsar\") el dispositivo de imagenes una vez completada la "
+#~ "descarga"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr ""
+#~ "Exploración del dispositivo completada: no se han encontrado imágenes en %s"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Exploración del dispositivo completada: encontradas %(number)s imágenes en "
+#~ "%(device)s"
+
+#~ msgid "Image skipped"
+#~ msgstr "Imagen saltada"
+
+#~ msgid "images downloaded"
+#~ msgstr "imagenes descargadas"
+
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -1758,6 +1993,20 @@ msgstr "_Ver"
 
 #, python-format
 #~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Subcarpeta: %(subfolder)s\n"
+#~ "Imagen: %(image)s\n"
+#~ "Problema: %(problem)s"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s imagenes saltadas"
+
+#, python-format
+#~ msgid ""
 #~ "Destination directory could not be created\n"
 #~ "%(directory)s\n"
 #~ "Error: %(errno)s %(strerror)s"
@@ -1766,5 +2015,305 @@ msgstr "_Ver"
 #~ "%(directory)s\n"
 #~ "Error: %(errno)s %(strerror)s"
 
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s de %(total)s imágenes copiadas"
+
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Error en las preferencias de Renombrar Imagen"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "No se detectó un dispositivo de respaldo."
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Miniatura no puede mostrarse"
+
+#~ msgid "images skipped"
+#~ msgstr "Imágenes saltadas"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Metadato de sub-segundos no esta presente en la imagen"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "metadato %s no está presente en la imagen"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Renombrar imagen</b>"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Dispositivos de imagen</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Ejemplo: /home/user/photos</i>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivos de imagen</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Renombrar imagen</span>\t"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Salir del programa al completar exitosamente la descarga"
+
+#~ msgid "Image Rename"
+#~ msgstr "Renombrar imagen"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Seleccione una carpeta para respaldar las imágenes"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr ""
+#~ "La extensión fue especificada, pero el nombre de la imagen no tiene extensión"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Conflictos en nombre de imagen</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Carpeta de descargas</span>"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Nombre de carpeta de respaldo"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Detectar automáticamente dispositivos de imagen"
+
+#~ msgid "Download Folder"
+#~ msgstr "Carpeta de descarga"
+
+#~ msgid "Image location:"
+#~ msgstr "Ruta de imagen:"
+
+#~ msgid "Image Devices"
+#~ msgstr "Dispositivos de imagen"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr ""
+#~ "Número de imagen fue especificado, pero el nombre de la imagen no lo tiene"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "El dispositivo no tiene imágenes para descargar."
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr ""
+#~ "lista de extensiones de archivo de imagen que el programa reconoce y salir"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Respaldar fotos al descargarlas"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Seleccione si desea saltar la descarga de la imagen, o añadir un "
+#~ "identificador único."
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Importar sus imágenes de manera eficiente y fiable"
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Especificar la carpeta en la que las copias de seguridad se almacenan en el "
+#~ "dispositivo.  \n"
+#~ "\n"
+#~ "<i>Nota: esto también se utilizará para determinar si el dispositivo se "
+#~ "utiliza para las copias de seguridad. Para cada dispositivo que desea "
+#~ "utilizar para hacer copias de seguridad se creará una carpeta con este "
+#~ "nombre.</i>"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Si desactiva la detección automática, seleccione la ruta exacta de las "
+#~ "imágenes."
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Cuando respalde, elegir si desea sobreescribir la imagen en el dispositivo "
+#~ "de seguridad que tiene el mismo nombre, o de saltar su respaldo."
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Especificar qué hacer cuando una imagen del mismo nombre ya se ha descargado "
+#~ "o respaldado."
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Empezar a descargar sobre dispositivo de imagen insertado"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Especificar si la imagen y los nombres de las carpetas se le han removido "
+#~ "carácteres que no se permite a otros sistemas operativos."
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright © Damon Lynch 2007-09"
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Las preferencias de subcarpeta ingresadas son inválidas y no pueden ser "
+#~ "usadas.\n"
+#~ "Estas serán restablecidas a los valores por defecto."
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Los dispositivos de imagen son aquellos desde los cuales descargará las "
+#~ "fotos,  como cámaras, tarjetas de memoria o Dispositivos de almacenamiento "
+#~ "portátil.\n"
+#~ "\n"
+#~ "Puede descargar fotos desde múltiples dispositivos simultaneamente.\n"
+#~ "\n"
+#~ "<i>Si la descarga desde su cámara funciona lento o no funciona, pruebe "
+#~ "configurarla en modo PTP. Si esto no es posible, considere usar un lector de "
+#~ "tarjetas.</i>"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr "¿Deberían bajarse imágenes de este dispositivo o partición?"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Error en las preferencias de la Subcarpeta de Descargas"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Se han removido innecesariamente algunos valores de las preferencias de la "
+#~ "subcarpeta."
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Advertencia:</b> No hay suficientes metadatos de imagen para generar "
+#~ "completamente el nombre. Por favor,  use otras opciones de renombre.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Advertencia:</b> No hay suficientes metadatos de imagen para generar "
+#~ "completamente las subcarpetas. Por favor, use otras opciones de renombre de "
+#~ "subcarpetas.</i>"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "No se pudo generar correctamente el nombre del archivo de imagen. Compruebe "
+#~ "que existan suficientes meta-datos."
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Los metadatos son esenciales para generar subcarpetas/nombres de imagen.\n"
+#~ "Destino: %s"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "El nombre de la subcarpeta no pudo ser generado correctamente. Compruebe que "
+#~ "existan suficientes metadatos."
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Imagen: %(source)s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "No se pudo eliminar la imagen del dispositivo de imágenes"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Imagen: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "Se eliminaron %i imágenes del dispositivo de imágenes"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr ""
+#~ "Eliminar imágenes de dispositivo de imágenes cuando se completen las "
+#~ "descargas"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "La imagen no tiene miniatura"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Imágenes detectadas con el mismo nombre de archivo, pero tomadas en "
+#~ "diferentes momentos"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Primera imagen: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Segunda imagen: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Lo sentimos, la Carpeta de Descarga no existe. Por favor, cree la carpeta, o "
+#~ "modifique sus preferencias"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Lo sentimos, la Carpeta de Descarga existe pero no puede ser escrita. Por "
+#~ "favor compruebe los permisos de la carpeta, o modifique sus preferencias"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Dispositivo de imagen: %s\n"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Disculpe, la ubicación de la imagen no existe:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Por favor, resuelva el problema, o modifique sus preferencias."
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "No se pudo generar el nombre del archivo de imagen"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Problema con Ubicación de Carpeta de Imagen"
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Puede tener respaldos de sus fotos en múltiples ubicaciones, por ejemplo: "
+#~ "discos duros externos."
diff --git a/po/fi.po b/po/fi.po
index e4ee3ec..9f503d5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,211 +7,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 07:48+0000\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-28 04:59+0000\n"
 "Last-Translator: Mikko Ruohola <polarfox@polarfox.net>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 19:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Nopea kuvien lataus"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "New York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Praha"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Guatemala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Pariisi"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berliini"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Rooma"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moskova"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Varsova"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Tukholma"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Virheelliset lataukset tänään\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Palautetaan arvo nollaan.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "'Päivän alku' asetuksen arvo on virheellinen\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Palautetaan keskiyöhön.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Virhe kuvan nimeämisasetuksissa"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr ""
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Anteeksi, näissä asetuksissa on virhe:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Palautetaan oletusarvot."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Työkoodi"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Virhe latauksen alikansioasetuksissa"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr ""
+
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr ""
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr ""
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Valitse kansio johon kuvat ladataan"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Valitse kuvakansio"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr ""
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Valitse kansio johon varmuuskopio tehdään"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr ""
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Varoitus:</b> Kuvassa ei ole riittäviä metadata tietoja kuvan "
-"nimeämiseen. Ole hyvä ja vaihda nimeämisasetuksia.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Warning:</b> Kuvassa ei ole riittäviä metadata tietoja alikansioiden "
-"luomiseen. Ole hyvä ja vaihda alikansioidenluontiasetukstia.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Esimerkki: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "Latauksia tänään arvoa ei päivitetty, koska lataus on edelleen kesken"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr "Tallennettua numeroa ei päivitetty, koska lataus on edelleen kesken"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
-msgstr "Alikansioasetuksista poistettiin tarpeettomia arvoja."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
+msgstr ""
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Alikansioasetukset ovat virheelliset, eikä niitä voida käyttää.\n"
-"Palautetaan oletusasetukset."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr ""
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "ulkoinenasema1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "ulkoinenasema2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr ""
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr ""
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "etsii..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr ""
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr ""
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Latausta ei voida jatkaa"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Ohjelman asetuksissa on virhe."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -220,43 +271,38 @@ msgstr ""
 "Ole hyvä ja tarkista asetukset, käynnistä ohjelma uudelleen ja koita "
 "uudestaan."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Latausta ei voida jatkaa"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 kuvaa %s kuvasta kopioitu"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr ""
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Laite etsintä on valmis: löytyi %(number)s kuvaa %(device)s laitteesta"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Laite etsintä on valmis: kuvia ei löytynyt sijainnista %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Kuvan tiedostonimeä ei pystytty luomaan"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -265,15 +311,14 @@ msgstr ""
 "Lähde: %(source)s\n"
 "Ongelma: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Kuvan tiedostonimeä ei pystytty luomaan oikein. Tarkista että kuvassa on "
-"riittävästi metatietoja."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -286,7 +331,8 @@ msgstr ""
 "Kohde: %(destination)s\n"
 "Ongelma: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -295,21 +341,21 @@ msgstr ""
 "Lähde: %(source)s\n"
 "Kohde: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Yksilöinti '%s' lisätty"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Lähde: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Kopiointivirhe"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -320,85 +366,94 @@ msgstr ""
 "Kohde: %(destination)s\n"
 "Virhe: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "Kuvaa ei kopioitu."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr ""
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"Löydettiin kuvia samalla tiedostonimellä, mutta ne on otettu eri ajakohtina:"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Ensimmäinen kuva: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Toinen kuva: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Kuvaa ei voitu avata"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr ""
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Lähde: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "Kuvassa ei ole metatietoja"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr ""
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Metatieto on välttämätöntä kansiorakenteen ja tiedostonimien luontiin.\n"
-"Lähde: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Kansiorakennetta ei voitu luoda. Tarkista että kuvassa on riittävästi "
-"metatietoja."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
-"Alikansio: %(subfolder)s\n"
-"Kuva: %(image)s\n"
-"Ongelma: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Uusi päivä on alkanut - Palautetaan 'Latauksia Tänään' luku"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Kuvan varmuuskopio on jo olemassa"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr ""
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Varmuuskopiointi virhe"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Kohdekansiota ei voitu luoda: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -407,12 +462,17 @@ msgstr ""
 "Lähde: %(source)s\n"
 "Kohde: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Virhe: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr ""
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -423,270 +483,329 @@ msgstr ""
 "Kohde: %(destination)s\n"
 "Virhe: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr ""
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr ""
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr ""
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Laite voidaan turvallisesti poistaa"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s kuvaa ladattu"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr ""
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s kuvaa ohitettu"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr ""
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "varoitukset"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "virheet"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Varmuuskopiolaite puuttuu"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Varmuuskopiolaitetta ei löytynyt"
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Laitteessa ei ole kuvia ladattavaksi."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Lataus lähteestä %s on alkanut"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr ""
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Lähde: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Kuvalaite: %s\n"
+msgid "Device: %s\n"
+msgstr ""
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Kohde: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Väliaikaista latauskansiota ei voitu luoda"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Virhe:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Kuva ohitettu"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr ""
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Kuva korvattu"
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Lataus lähteestä %s on alkanut"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr ""
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr ""
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr ""
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Varmuuskopiolaite puuttuu"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "Kuva on jo olemassa"
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr ""
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "Kuvalla ei ole näytekuvaa"
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr ""
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr ""
+
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr ""
+
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr ""
+
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr ""
+
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr ""
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s kuvaa %(total)s kuvasta kopioitu"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr ""
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Poistaminen kuvalaitteelta epäonnistui"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr ""
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Kuva: %(source)s\n"
-"Virhe: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Kuva: %(source)s"
+msgid "Photo: %(source)s"
+msgstr ""
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "Poistettiin %i kuvaa kuvalaitteelta"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr ""
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Lataus lähteestä %s valmis"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Laite"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Koko"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Latauksen edistyminen"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Näytekuvaa ei voida näyttää"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Se voi olla vahingoittunut"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Laite havaittu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
-msgstr "Tulisiko tätä laitetta tai osiota käyttää kuvien lataamiseen?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Muista tämä valinta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s valittu ladattavaksi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr "Tätä laitetta tai osiota tullaan aina käyttämään kuvien lataamiseen"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s laitetta ei hyväksytty latauslaitteeksi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr "Tästä laitteesta tai osiosta ei ladata koskaan"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Poista kaikki työkoodit?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Tulisiko kaikki työkoodit poistaa?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Syöta työkoodi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Anna uusi työkoodi tai valitse aikaisempi."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Anna uusi työkoodi."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Työkoodi:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Työkoodi syötetty"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Työkoodia ei annettu"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Anteeksi, tätä kuvasijaintia ei ole:\n"
-"%(path)s"
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Ongelma Kuvakansiossa"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr ""
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
-msgstr "Latauskansiota ei ole olemassa. Luo kansio tai muuta asetuksia."
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr ""
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgstr ""
+
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Latauskansio on olemassa, mutta siihen ei voida luoda tiedostoja. Tarkista "
-"kansion oikeudet tai muuta asetuksia."
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Ongelma Latauskansiossa"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr ""
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Jotkin asetukset palautetaan."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Kysyy tulisiko käyttää laitetta %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Kysyy työkoodia"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Työkoodia pyydetään jo, älä pyydä uudestaan"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Työkoodia odottaneet lataukset käynnistetään"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Käynnistetään latauksia"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -694,35 +813,35 @@ msgstr ""
 "Ohjelman uudempaa versiota on käytetty tässä tietokoneessa.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr ""
 "Ohjelma on kelpaava, mutta ole hyvä ja tarkista että ohjelma toimii oikein."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Anteeksi, jotkin asetukset ovat virheellisiä ja ne palautetaan "
 "oletusarvoihin."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Varoitus:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
 "Tämä ohjelma on uudempi kuin aikaisemmin käytetty. Tarkista asetukset."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Asetuksia on muokattu."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -734,11 +853,11 @@ msgstr ""
 "\n"
 "Ole hyvä ja tarkista ne varmistaaksesi ohjelman toiminta."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Asetuksia ei tarvinnut muuttaa."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -748,116 +867,129 @@ msgstr ""
 "asetuksistasi olivat virheellisiä ja niitä ei voitu päivittää. Ne "
 "palautetaan oletuksiin."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Ongelmia pynotifyn käytössä."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Ei saanut pynotify-palvelimen ominaisuuksia."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr "Varoitus: Työpöytäympäristön ilmoituspalvelu on väärin asennettu."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "ja"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Käyttää varmuuskopiolaitteita"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Käyttää varmuuskopiolaitetta"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Varmuuskopiolaitetta ei löytynyt"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Laite %(device)s (%(path)s) ohitettu"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Löytyi %(device)s laitetta polusta %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Automaattinen latauksen aloitus on päällä"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Automaattinen latauksen aloitus on pois päältä"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Käytetään käsin valittua polkua"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr ""
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Kaikki lataukset valmiita"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "Mt/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Noin 1 sekunti jäljellä"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Noin %i sekuntia jäljellä"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Noin 1 minuutti jäljellä"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Noin %(minutes)i:%(seconds)02i minuuttia jäljellä"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "kuvia ladattu"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr ""
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "kuvia ohitettu"
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr ""
+
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr ""
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Lataa "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Keskeytä"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Asetuksia muutettiin."
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Näkemiin"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -866,337 +998,386 @@ msgstr ""
 "näytä ohjelman tiedot komentorivillä kun ohjelma käynnistetään (oletus: "
 "%default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "tulosta vain virheet komentoriville"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
-msgstr "Listaa kuvatiedostopäätteet jotka ohjelma tunnistaa ja poistu"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr ""
+
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr ""
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "ja %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr ""
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Käyttäen"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s on jo käynnissä"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Ajankohta"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Teksti"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metatieto"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Numeroinnit"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Kuvan päivämäärä"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Tänään"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Huomenna"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Nimi + pääte"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Nimi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Tiedostopääte"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Kuvan numero"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Aukko"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "Herkkyys"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Valotusaika"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Polttoväli"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Kameran merkki"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Kameran malli"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Lyhyt kameramalli"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Tavutettu lyhyt kameran malli"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Sarjanumero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Suljinlaskuri"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Omistajan nimi"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Latauksia tänään"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Istuntonumero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Alikansion numero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Tallennettu numero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Kirjainsarja"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Kaikki numerot"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Viimeinen numero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Kaksi viimeistä numeroa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Kolme viimeistä numeroa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Neljä viimeistä numeroa"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Alkuperäinen kirjoitusasu"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "ISOT KIRJAIMET"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "pienet kirjaimet"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Yksi numero"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Kaksi numeroa"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Kolme numeroa"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Neljä numeroa"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Viisi numeroa"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Kuusi numeroa"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Seitsemän numeroa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "sekunnin osat"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "VVVVKKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "VVVV-KK-PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "VVKKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "VV-KK-PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "KKPPVVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "KKPPVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "KKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "PPKKVVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "PPKKVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "VVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "VV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "KK"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "hhmmss"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "hhmm"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "TT-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "TT-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1205,54 +1386,64 @@ msgstr ""
 "Asetus '%(key)s' on virheellinen.\n"
 "Tulisi olla yksi näistä %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Asetuksen arvo '%(value)s' on virheellinen"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Nämä asetukset eivät ole oikeassa muodossa:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "sekunnin osia ei löydy metatiedoista tässä kuvassa"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "%s metatietoa ei löydy tästä kuvasta"
+msgid "%s metadata is not present"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Virhe aikamäärityksessä. Arvo %s näyttää virheelliseltä"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
 msgstr ""
-"tiedostopääte oli määritelty mutta kuvan nimessä ei ole tiedostopäätettä"
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
-msgstr "kuvan numero oli määritelty, mutta tiedostonimessä ei ole numeroa"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "virhe luotaessa nimeä osalla %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Alikansioiiden asetusten ei tulisi alkaa %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Alikansioiden asetusten ei tulisi loppua %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, 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"
@@ -1282,36 +1473,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Yhteensopivuus käyttöjärjestelmien kanssa</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Latauskansio</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Latausalikansio</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Esimerkki</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Kuva laitteet</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Kuvannimien konfliktit</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Työkoodit</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Kuvan uudelleennimeäminen</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Puuttuvat varmusskopiolaitteet</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Työkoodit</b>"
+msgid "<b>Photo Rename</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Puuttuvat varmusskopiolaitteet</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1326,8 +1517,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/ulkoinenlevy/Kuvat</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Esimerkki: /home/käyttäjä/kuvat</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1350,25 +1541,24 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Varmuuskopio</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Latauskansio</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Virheenkäsittely</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Kuvalaitteet</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Työkoodit</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Kuvan uudelleennimeäminen</span>\t"
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Työkoodit</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
@@ -1376,42 +1566,46 @@ msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Uudelleennimeämis valinnat</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Lisää yksilöllinen tunniste"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Tunnista automaattisesti ulkoiset tallennuslaitteet"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Tunnista automaattisesti varmuuskopiolaitteet"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Tunnista automaattisesti kuvalaitteet"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatisointi"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Varmuuskopio"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Varmuuskopiokansion nimi:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Varmuuskopioiden sijainti:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Tee varmuuskopio ladattaessa kuvia"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1419,67 +1613,83 @@ msgstr ""
 "Valitse latauskansio. Alikansiot ladatuille kuville tehdään automaattisesti "
 "tähän kansioon käyttäen alla määriteltyä rakennetta käyttäen."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Valitse ohitetaanko kuva ladattaessa vai lisätäänkö nimeen yksilöllinen "
-"tunniste."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:42
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Päivän alku:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Poista kuvat kuvalaitteelta kun lataus on valmis"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Lataa / Keskeytä"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Latauskansio"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Latauskansio:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Latauksia tänään:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Virheenkäsittely"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Virheloki"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Poistu ohjelmasta onnistuneen latauksen jälkeen"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Jos poistat automaattisen tunnistuksen käytöstä, määritä varmuuskopioiden "
 "tarkka sijainti."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Jos poistat automaattisen tunnistuksen käytöstä, määritä tarkka kuvien "
-"sijainti."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1488,63 +1698,47 @@ msgstr ""
 "Jos kytket päälle automaattisen kannettavan laitteen tunnistuksen, koko "
 "laite käydään läpi kuvia etsittäessä, tämä voi kestää hetken."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Ohita"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Kuvalaitteet"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Kuvan uudelleennimeäminen"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Kuvalaitteet ovat laitteita joista kuvat ladataan, kuten kameroita, "
-"muistikortteja tai muita kannettavia laitteita.\n"
-"\n"
-"Voit ladata valokuvia monesta kuvalaitteesta yhtäaikaa.\n"
-"\n"
-"<i>Jos lataus suoraan kamerasta toimii huonosti tai ei ollenkaan, koita "
-"asettaa se PTP tilaan. Jos ei ole mahdollista, harkitse kortinlukijan "
-"käyttämistä.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Kuvan sijainti:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Tuo kuvasti tehokkaasti ja turvallisesti"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Työkoodit"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr ""
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Ylikirjoita"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Asetukset: Nopea Valokuvien Lataaja"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "P_oista kaikki"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1574,40 +1768,42 @@ msgstr ""
 "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Uudelleennimeämis valinnat"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Raportoi varoitus"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Raportoi virhe"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Ohita"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Ohita lataus"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Määritä kansio johon varmuuskopiot tallennetaan laitteessa.\n"
-"\n"
-"<i>Huomaa: tämä määrittää myös käytetäänkö laitetta varmuuskopiointiin vai "
-"ei. Jokaiseen varmuuskopiolaitteeseen tulee tehdä tämän niminen kansio.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1615,109 +1811,199 @@ msgstr ""
 "Valitse aika 24 tunnin muodossa jossa <i>Latauksia tänään</i> numerointi "
 "tulisi palauttaa."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Valitse mitä tehdään kun samanniminen kuva on jo ladattu tai varmuuskopioitu."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr "Valitse mitä tehdään jos varmuuskopiolaitteita ei löydy."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Valitse tuleeko kuva ja kansionimistä poistaa merkit joita ei tueta toisissa "
-"käyttöjärjestelmissä."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Aloita lataus kun ohjelma käynnistetään"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Aloita lataus kun kuvalaite kytketään"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Tallennettu numero:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Poista yhteensopimattomat merkit"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Yhtenäistä RAW + JPEG järjestysnumerot"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Poista kuvalaite kun lataus on valmis"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
-"Varmuuskopioitaessa, valitse ylikirjoitetaanko kuva varmuuskopiolaitteessa "
-"jos saman niminen kuva on jo olemassa, vai ohitetaanko se."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Voit varmuuskopioida kuvasi useaan kohteeseen kun kuvia ladataan, esim. "
-"ulkoisille kovalevyille."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Lisää..."
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Tyhjennä valmistuneet lataukset"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "Virheloki"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Hae ohjeita netistä..."
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Ohje"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Tee lahjoitus"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Valokuvat"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Raportoi ongelma..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Näytekuvat"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Käännä tämä ohjelma..."
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Näytä"
 
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Virhe kuvan nimeämisasetuksissa"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 kuvaa %s kuvasta kopioitu"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Valitse kuvakansio"
+
+#~ msgid "Could not open image"
+#~ msgstr "Kuvaa ei voitu avata"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Kuvan tiedostonimeä ei pystytty luomaan oikein. Tarkista että kuvassa on "
+#~ "riittävästi metatietoja."
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Kuvan tiedostonimeä ei pystytty luomaan"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "Kuvassa ei ole metatietoja"
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Metatieto on välttämätöntä kansiorakenteen ja tiedostonimien luontiin.\n"
+#~ "Lähde: %s"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Kansiorakennetta ei voitu luoda. Tarkista että kuvassa on riittävästi "
+#~ "metatietoja."
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Kuvan varmuuskopio on jo olemassa"
+
+#~ msgid "The image was not copied."
+#~ msgstr "Kuvaa ei kopioitu."
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s kuvaa ohitettu"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s kuvaa ladattu"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Varmuuskopiolaitetta ei löytynyt"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Laitteessa ei ole kuvia ladattavaksi."
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "Kuvalla ei ole näytekuvaa"
+
+#~ msgid "Image skipped"
+#~ msgstr "Kuva ohitettu"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Kuva korvattu"
+
+#~ msgid "Image already exists"
+#~ msgstr "Kuva on jo olemassa"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Näytekuvaa ei voida näyttää"
+
+#~ msgid "images skipped"
+#~ msgstr "kuvia ohitettu"
+
+#~ msgid "images downloaded"
+#~ msgstr "kuvia ladattu"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr "Alikansioasetuksista poistettiin tarpeettomia arvoja."
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -1729,6 +2015,39 @@ msgstr "_Näytä"
 #~ "Ongelma: %(problem)s"
 
 #, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Laite etsintä on valmis: kuvia ei löytynyt sijainnista %s"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Laite etsintä on valmis: löytyi %(number)s kuvaa %(device)s laitteesta"
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Alikansio: %(subfolder)s\n"
+#~ "Kuva: %(image)s\n"
+#~ "Ongelma: %(problem)s"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s kuvaa %(total)s kuvasta kopioitu"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr "Listaa kuvatiedostopäätteet jotka ohjelma tunnistaa ja poistu"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr ""
+#~ "tiedostopääte oli määritelty mutta kuvan nimessä ei ole tiedostopäätettä"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr "kuvan numero oli määritelty, mutta tiedostonimessä ei ole numeroa"
+
+#, python-format
 #~ msgid ""
 #~ "Destination directory could not be created\n"
 #~ "%(directory)s\n"
@@ -1738,5 +2057,231 @@ msgstr "_Näytä"
 #~ "%(directory)s\n"
 #~ "Virhe: %(errno)s %(strerror)s"
 
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "sekunnin osia ei löydy metatiedoista tässä kuvassa"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "%s metatietoa ei löydy tästä kuvasta"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Kuva laitteet</b>"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Kuvan uudelleennimeäminen</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Esimerkki: /home/käyttäjä/kuvat</i>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Latauskansio</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Kuvalaitteet</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"x-large\">Kuvan uudelleennimeäminen</span>\t"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Tunnista automaattisesti kuvalaitteet"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Varmuuskopiokansion nimi:"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Tee varmuuskopio ladattaessa kuvia"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Valitse ohitetaanko kuva ladattaessa vai lisätäänkö nimeen yksilöllinen "
+#~ "tunniste."
+
+#~ msgid "Download Folder"
+#~ msgstr "Latauskansio"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Poistu ohjelmasta onnistuneen latauksen jälkeen"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Jos poistat automaattisen tunnistuksen käytöstä, määritä tarkka kuvien "
+#~ "sijainti."
+
+#~ msgid "Image Devices"
+#~ msgstr "Kuvalaitteet"
+
+#~ msgid "Image Rename"
+#~ msgstr "Kuvan uudelleennimeäminen"
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Kuvalaitteet ovat laitteita joista kuvat ladataan, kuten kameroita, "
+#~ "muistikortteja tai muita kannettavia laitteita.\n"
+#~ "\n"
+#~ "Voit ladata valokuvia monesta kuvalaitteesta yhtäaikaa.\n"
+#~ "\n"
+#~ "<i>Jos lataus suoraan kamerasta toimii huonosti tai ei ollenkaan, koita "
+#~ "asettaa se PTP tilaan. Jos ei ole mahdollista, harkitse kortinlukijan "
+#~ "käyttämistä.</i>"
+
+#~ msgid "Image location:"
+#~ msgstr "Kuvan sijainti:"
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Tuo kuvasti tehokkaasti ja turvallisesti"
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Valitse mitä tehdään kun samanniminen kuva on jo ladattu tai varmuuskopioitu."
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Aloita lataus kun kuvalaite kytketään"
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Poista kuvalaite kun lataus on valmis"
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Varmuuskopioitaessa, valitse ylikirjoitetaanko kuva varmuuskopiolaitteessa "
+#~ "jos saman niminen kuva on jo olemassa, vai ohitetaanko se."
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Voit varmuuskopioida kuvasi useaan kohteeseen kun kuvia ladataan, esim. "
+#~ "ulkoisille kovalevyille."
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Kuvannimien konfliktit</b>"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Tekijänoikeus Damon Lynch 2007-09"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Virhe latauksen alikansioasetuksissa"
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Alikansioasetukset ovat virheelliset, eikä niitä voida käyttää.\n"
+#~ "Palautetaan oletusasetukset."
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Varoitus:</b> Kuvassa ei ole riittäviä metadata tietoja kuvan "
+#~ "nimeämiseen. Ole hyvä ja vaihda nimeämisasetuksia.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Warning:</b> Kuvassa ei ole riittäviä metadata tietoja alikansioiden "
+#~ "luomiseen. Ole hyvä ja vaihda alikansioidenluontiasetukstia.</i>"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Valitse kansio johon varmuuskopio tehdään"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Löydettiin kuvia samalla tiedostonimellä, mutta ne on otettu eri ajakohtina:"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Ensimmäinen kuva: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Toinen kuva: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Poistaminen kuvalaitteelta epäonnistui"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Kuva: %(source)s\n"
+#~ "Virhe: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Kuva: %(source)s"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "Poistettiin %i kuvaa kuvalaitteelta"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr "Tulisiko tätä laitetta tai osiota käyttää kuvien lataamiseen?"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Poista kuvat kuvalaitteelta kun lataus on valmis"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Kuvalaite: %s\n"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Anteeksi, tätä kuvasijaintia ei ole:\n"
+#~ "%(path)s"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Latauskansio on olemassa, mutta siihen ei voida luoda tiedostoja. Tarkista "
+#~ "kansion oikeudet tai muuta asetuksia."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr "Latauskansiota ei ole olemassa. Luo kansio tai muuta asetuksia."
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Ongelma Kuvakansiossa"
+
+#~ msgid ""
+#~ "Specify the folder in which backups are stored on the device.  \n"
+#~ "\n"
+#~ "<i>Note: this will also be used to determine whether or not the device is "
+#~ "used for backups. For each device you wish to use for backing up to, create "
+#~ "a folder in it with this name.</i>"
+#~ msgstr ""
+#~ "Määritä kansio johon varmuuskopiot tallennetaan laitteessa.\n"
+#~ "\n"
+#~ "<i>Huomaa: tämä määrittää myös käytetäänkö laitetta varmuuskopiointiin vai "
+#~ "ei. Jokaiseen varmuuskopiolaitteeseen tulee tehdä tämän niminen kansio.</i>"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Valitse tuleeko kuva ja kansionimistä poistaa merkit joita ei tueta toisissa "
+#~ "käyttöjärjestelmissä."
diff --git a/po/fr.po b/po/fr.po
index 3fee1b0..96dc9eb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,219 +7,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 17:04+0000\n"
-"Last-Translator: Julien Valroff <Unknown>\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-29 19:28+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-30 14:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "New York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manille"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Prague"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Téhéran"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Rome"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moscou"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Varsovie"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Valeur de 'Transferts journaliers' invalide.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Remise à zéro de la valeur.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "La valeur de la préférence « Début de la journée » est corrompue.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Réinialisation à minuit.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Erreur dans les préférences concernant le renommage des images"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr "Erreur dans les préférences de renommage des photos"
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Désolé, il y a une erreur dans cette préférence :\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Réinitialisation aux valeurs par défaut"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Étiquette de transfert"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Erreur dans les préférences concernant le sous-dossier de transfert"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr "Erreur dans les préférences de renommage des vidéos"
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr ""
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "photos"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Sélectionnez le dossier de destination"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Sélectionner un dossier d'images"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr "Sélectionnez un dossier vers lequel transférer vos vidéos"
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Sélectionner un dossier de sauvegarde des images"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Sélectionnez un dossier contenant %(file_types)s"
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr "Séléctionnez un dossier dans lequel sauvegarder %(file_types)s"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Avertissement :</b> Il n'y a pas assez de métadonnées dans l'image "
-"pour générer le nom de façon complète. Utilisez une autre option de "
-"renommage.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<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 y a un manque de méta-donnés des images pour générer "
-"des sous-dossiers vides. S'il vous plait utiliser un autre sous dossier en "
-"nommant les options."
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Exemple : %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "Un transfert est en cours : la valeur de 'Transferts journaliers' ne sera "
 "pas mise à jour."
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
 "Un transfert est en cours : la valeur du nombre stocké ne sera pas mise à "
 "jour."
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Les préférences pour le sous-dossier présentent des valeurs inutiles qui ont "
-"été retirées."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"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 pour le sous-repertoire ne sont pas valables et ne peuvent "
-"être utilisées.\n"
-"Les valeurs par défaut seront utilisées."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "photo"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "vidéo"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "disqueexterne1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "disqueexterne2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "photos ou vidéos"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "vidéos"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "Détection en cours..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr ""
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr ""
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Impossible de procéder au transfert"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Il y a une erreur dans les préférences concernant le programme."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -228,43 +274,38 @@ msgstr ""
 "Merci de vérifier les préférences, de redemarrer le programme et d'essayer "
 "encore."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Impossible de procéder au transfert"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 de %s images copiées"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr ""
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Scan du volume complet : %(number)s ont été trouvées sur le volume %(device)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Détection terminée : aucune image trouvée sur %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Le nom du fichier n'a pas pu être généré"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -273,15 +314,14 @@ msgstr ""
 "Source : %(source)s\n"
 "Problème : %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Le nom du fichier n'a pas pu être généré correctement. Vérifiez qu'il y ait "
-"suffisamment de métadonnées dans l'image."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -294,7 +334,8 @@ msgstr ""
 "Destination : %(destination)s\n"
 "Problème : %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -303,21 +344,21 @@ msgstr ""
 "Source : %(source)s\n"
 "Destination : %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Identifant unique '%s' ajouté"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Source : %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Erreur de copie lors du transfert"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -328,88 +369,96 @@ msgstr ""
 "Destination : %(destination)s\n"
 "Erreurr : %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "L'image n'a pas été copiée."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr ""
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"Images ayant le même nom de fichier, mais prises à des heures différentes :"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Première image : %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Seconde image : %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Impossible d'ouvrier l'image"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr ""
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Source : %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "L'image n'a pas de métadonnées"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr ""
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"La métadonnée est essentielle pour générer les noms des sous-dossiers / des "
-"images.\n"
-"Source : %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Le nom du sous-dossier n'a pas pu être généré correctement. Vérifiez qu'il y "
-"ait suffisamment de métadonnées dans l'image."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
-"Sous-dossier : %(subfolder)s\n"
-"Image : %(image)s\n"
-"Problème : %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Un nouveau jour a commencé - remise à zero de la numérotation « Transferts "
 "journaliers »"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Une sauvegarde existe déjà"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr ""
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Erreur lors de la sauvegarde"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Le dossier de destination n'a pas pu être créé %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -418,12 +467,17 @@ msgstr ""
 "Source : %(source)s\n"
 "Destination : %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Erreur : %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr ""
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -434,285 +488,338 @@ msgstr ""
 "Destination : %(destination)s\n"
 "Erreur : %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr ""
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr ""
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr ""
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Le volume peut maintenant être retiré en toute sécurité"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s images transférées"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr ""
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s images non prises en compte"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr ""
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "avertissements"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "erreurs"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Volume de sauvegarde absent"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Aucun volume de sauvegarde n'a été détecté."
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Aucune image à transféré depuis le volume."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Le transfert a débuté depuis %s"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr ""
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Source : %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Volume d'images : %s\n"
+msgid "Device: %s\n"
+msgstr ""
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Destination %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Le dossier de transfert temporaire n'a pas pu être créé"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Erreur :"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Image passée"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr ""
+
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Le transfert a débuté depuis %s"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr ""
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr ""
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr ""
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Volume de sauvegarde absent"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr ""
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr ""
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr ""
+
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr ""
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Image écrasée"
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr ""
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "L'image existe déjà"
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr ""
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "L'image n'a pas d'aperçu"
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr ""
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s images copiées sur %(total)s"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr ""
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Impossible de supprimer l'image du volume"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr ""
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Image : %(source)s\n"
-"Erreur : %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Image : %(source)s"
+msgid "Photo: %(source)s"
+msgstr ""
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "%i images ont été supprimées du volume"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr ""
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Transfert terminé depuis %s"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Volume"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Taille"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Progression du transfert"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Impossible d'afficher la vignette"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Il est peut-être corrompu"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Périphérique détecté"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
-"Voulez-vous utiliser ce périphérique ou cette partition comme source de "
-"transfert ?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "Se _Souvenir de ce choix"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s a été séléctionné comme source de transfert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr ""
 "Ce périphérique ou cette partition sera toujours utilisé comme source de "
 "transfert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s a été rejeté comme source de transfert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr ""
 "Ce périphérique ou cette partition ne sera jamais utilisé comme source de "
 "transfert"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Supprimer toutes les étiquettes de transfert ?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer toutes les étiquettes de transfert ?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Entrer une étiquette de transfert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr ""
 "Saisissez une nouvelle étiquette de transfert, ou choisissez un précédemment "
 "ajouté"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Saisissez une nouvelle étiquette de transfert"
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Étiquette de transfert"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Étiquette de transfert entrée"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Étiquettes de transfert non renseignée"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Désolé, l'emplacement de l'image n'existe pas :\n"
-"%(path)s\n"
-"\n"
-"Résolvez le problème ou modifiez vos préférences."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Problème avec l'emplacement du dossier de l'image"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr ""
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
 msgstr ""
-"Désolé, le dossier de transfert n'existe pas. Créez le dossier ou modifiez "
-"vos préférences"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgstr ""
+
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Désolé, le dossier de transfert n'est pas accessible en écriture. Vérifiez "
-"les permissions du dossier ou modifiez vos préférences"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Problème avec le dossier de transfert"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr ""
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr ""
 "Certaines préférences vont être réinitalisées à leurs valeurs par défaut."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
-msgstr ""
+msgstr "Affichage du choix d'utilisation ou non de %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "En attende de l'étiquette de transfert"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
-msgstr ""
+msgstr "Affiche déjà pour l'étiquette de transfert, n'affichera plus"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr ""
 "Démarrage des téléchargements qui ont attendu une étiquette de transfert"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Démarrage du transfert"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -721,7 +828,7 @@ msgstr ""
 "ordinateur.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -729,26 +836,26 @@ msgstr ""
 "Les préférences de l'application ont l'air d'être correctes, veuillez tout "
 "de même les vérifier afin d'assurer le bon déroulement de l'opération."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Désolé, certaines préférences ne sont pas valides et seront réinitialisées."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Avertissement :"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr "L'application a été mise à jour, vérification des préférences."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Les préférences ont été modifiées."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -759,11 +866,11 @@ msgstr ""
 "l'ancienne version. Vos préférences ont été mises à jour.\n"
 "Veuillez les vérifier afin d'assurer le bon fonctionnement de l'application."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Aucun changement des préférences n'a été nécessaire."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -773,118 +880,131 @@ msgstr ""
 "l'ancienne version. Certaines de vos préférences antérieures sont invalides "
 "et n'ont pas été mises à jour. Elles vont être réinitialisées."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Problème d'utilisation de pynotify"
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Echec de la reception des possibilités du serveur pynotify"
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Avertissement : le serveur de notification de l'environnement de bureau est "
 "incorrectement configuré."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "et"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Utilisation des volumes de sauvegarde"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Utilisation du volume de sauvegarde"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Aucun volume de sauvegarde détécté"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Périphérique %(device)s (%(path)s) ignoré"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Le volume %(device)s a été détecté avec le chemin d'accès %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Le démarrage automatique du transfert est activé"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Le démarrage automatique du transfert est désactivé"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Utilisation du chemin d'accès renseigne manuellement"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr ""
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Tous les transferts sont terminés"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "Mo/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Environ 1 seconde restante"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Environ %i secondes restantes"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Environ 1 minute restante"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Environ %(minutes)i:%(seconds)02i restantes"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "Images transférées"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr ""
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "Images non prises en compte"
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr ""
+
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr ""
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Transfert "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Pause"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Les préférences ont été modifiées"
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Au-revoir"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -893,339 +1013,386 @@ msgstr ""
 "affiche les informations de l'application sur la ligne de commande lorsque "
 "l'application est active (défaut: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "n'affiche que les erreurs sur la ligne de commande"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr ""
+
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
 msgstr ""
-"affiche les extensions de fichier reconnues par l'application et quitte "
-"l'application"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "et %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr ""
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "En utilisation"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s déjà actif"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Date/heure"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Texte"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Séquences"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Date de l'image"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Hier"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Nom + extension"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Nom"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Extension"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Numéro de l'image"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Ouverture"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Vitesse d'obturation"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Longueur focale"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Marque de l'appareil"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Modèle de l'appareil"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Modèle de l'appareil (version courte)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Nom court de l'appareil photo avec trait d'union"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Numéro de série"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Nombre de déclenchements de l'obturateur"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Nom du propriétaire"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Transferts journaliers"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Numéro de session"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Numéro de sous-dossier"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Nombres stockés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Séquence alphabétique"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Tous les chiffres"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Dernier chiffre"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "2 derniers chiffres"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "3 derniers chiffres"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "4 derniers chiffres"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Casse originale"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "MAJUSCULES"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "minuscules"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Un chiffre"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Deux chiffres"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Trois chiffres"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Quatre chiffres"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Cinq chiffres"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Six chiffres"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "7 chiffres"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Sous-secondes"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "AAAAMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "AAA-MM-JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "AAMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "AA-MM-JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "MM-JJ-AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "MM-JJ-AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "MMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "JJMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "JJMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM (minutes)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1234,60 +1401,67 @@ msgstr ""
 "La préférence '%(key)s' est invalude.\n"
 "Valeurs attendues : %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "La préférence « %(value)s » est invalide"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Les préférences suivantes ne sont pas bien formattées :"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "L'image ne contient pas la métadonnée sous-secondes"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "La métadonnée %s n'est pas présente dans l'image"
+msgid "%s metadata is not present"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr ""
 "Erreur dans le composant de date/heure. La valeur %s semble non valide"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
 msgstr ""
-"Un extension a été spécifiée mais le nom de l'image ne comporte aucune "
-"extension"
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
 msgstr ""
-"Un numéro d'image a été spécifié mais le nom de l'image ne comporte aucun "
-"numéro"
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "Erreur dans la génération du nom avec le composant %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1546
 #, 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"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, 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"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1318,36 +1492,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Compatibilité avec d'autres systèmes d'exploitation</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Dossier de destination</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Sous-dossiers de transfert</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Exemple</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Volume d'images</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Conflits de nom d'images</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Étiquettes de transfert</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Renommage des images</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Volumes de sauvegarde absents</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Étiquettes de transfert</b>"
+msgid "<b>Photo Rename</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Volumes de sauvegarde absents</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1362,8 +1536,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/disqueexterne/Photos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Exemple : /home/utilisateur/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1386,67 +1560,71 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Sauvegarde</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Dossier de destination</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Gestion des erreurs</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Volume d'images</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Étiquettes de transfert</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Renommage des images</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Étiquettes de transfert</span>"
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Options de renommage</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Ajouter un identifiant unique"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Détecter automatiquement les volumes de stockage amovibles"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Détecter automatiquement les volumes de sauvegarde"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Détecter automatiquement les volumes d'images"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatisation"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Sauvegarde"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Nom du dossier de sauvegarde :"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Localisation de la sauvegarde :"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Sauvegarder les photos pendant le transfert"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1455,66 +1633,83 @@ msgstr ""
 "transférées seront automatiquement crées dans ce dossier selon la structure "
 "spécifiée ci-dessous."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Choisissez si vous souhaitez passer l'image ou ajouter un identifiant unique."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:42
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Début du jour :"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Supprimer les images du volume après le transfert"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Transfert / Pause"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Transfert"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Dossier de destination :"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Transferts journaliers :"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Gestion des erreurs"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Journal des erreurs"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Quitter l'application à la suite d'un transfert réussi"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Si la détection automatique est désactivée, choisissez un emplacement pour "
 "la sauvegarde."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Si la détection automatique est désactivée, choisissez un emplacement pour "
-"les images."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1524,64 +1719,47 @@ msgstr ""
 "le volume complet sera analysé. Sur des volumes de capacité importante, cela "
 "peut prendre du temps."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Voumes d'images"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Renommage"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Les volumes d'images dont des volumes depuis lesquels sont transférées des "
-"photos (appareil photo, carte mémoire ou équipement de stockage portable).\n"
-"\n"
-"Vous avez la possibilité de transférer des photos depuis plusieurs volumes "
-"simultanément.\n"
-"\n"
-"<i>Si le transfert direct depuis votre appareil photo fonctionne "
-"difficilement voire pas du tout, essayez de le paramétrer en mode PTP. Si ce "
-"n'est pas possible, utilisez un lecteur de cartes.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Emplacement de l'image :"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Importez vos images efficacement et de façon fiable"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Étiquettes de transfert"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr ""
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Écraser"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Préférences : Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "S_upprimer tout"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1612,42 +1790,42 @@ msgstr ""
 "programme ; si ce n’est pas le cas, écrivez à la Free Software Foundation "
 "Inc., 675 Mass Ave, Cambridge, MA 02139, Etats-Unis."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Options de renommage"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Rapporter un avertissement"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Rapporter une erreur"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Passer"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Sauter le transfert"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Spécifiez le dossier dans lequel sont stockées les sauvegardes sur le "
-"volume.\n"
-"\n"
-"<i>Note : cela sera également utilisé pour déterminer si le volume est "
-"utilisé pour les sauvegardes. Pour chaque volume que vous souhaitez utiliser "
-"pour les sauvegarder, créez un dossier portant ce nom.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1655,114 +1833,133 @@ msgstr ""
 "Spécifiez l'heure au format 24h à laquelle la séquence <i>Transferts "
 "journaliers</i> doit être réinitialisée."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Spécifiez quelle action entreprendre lorsqu'une image portant le même nom a "
-"déjà été transférée ou sauvegardée."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr ""
 "Spécifiez quelle action entreprendre quand il n'y a aucun volume de "
 "sauvegarde."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Spécifiez s'il faut enlever du nom des images et des dossiers tout caractère "
-"non autorisé par d'autres systèmes d'exploitation."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Démarrer le transfert au démarrage de l'application"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Démarrer le transfert lors de l'insertion d'un volume d'images"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Nombre stocké :"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Enlever les caractères incompatibles"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 "Synchroniser les séquences numériques pour les paires d'images RAW + JPEG"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Démonter (« éjecter ») le volume d'images après le transfert"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"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 la sauvegarde, choisissez s'il faut écraser une image portant le "
-"même nom sur le volume de sauvegarde, ou s'il faut passer l'image."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Il est possible de sauvegarder les photos sur des emplacements multiples, "
-"différents du dossier de transfert (par exemple, des disques durs externes)."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Ajouter..."
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Effacer les transferts terminés"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "Journal des _erreurs"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "Aide en _ligne"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Aide"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Faire une _donation..."
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Photos"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Rapporter un problème..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Vignettes"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Traduire cette application..."
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "A_ffichage"
 
 #, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Scan du volume complet : %(number)s ont été trouvées sur le volume %(device)s"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 de %s images copiées"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Sélectionner un dossier d'images"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Sélectionner un dossier de sauvegarde des images"
+
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -1772,6 +1969,62 @@ msgstr "A_ffichage"
 #~ "Destination : %(destination)s\n"
 #~ "Problème : %(problem)s"
 
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Le nom du fichier n'a pas pu être généré"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Le nom du fichier n'a pas pu être généré correctement. Vérifiez qu'il y ait "
+#~ "suffisamment de métadonnées dans l'image."
+
+#~ msgid "Image has no metadata"
+#~ msgstr "L'image n'a pas de métadonnées"
+
+#~ msgid "Could not open image"
+#~ msgstr "Impossible d'ouvrier l'image"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Le nom du sous-dossier n'a pas pu être généré correctement. Vérifiez qu'il y "
+#~ "ait suffisamment de métadonnées dans l'image."
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Une sauvegarde existe déjà"
+
+#~ msgid "The image was not copied."
+#~ msgstr "L'image n'a pas été copiée."
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Sous-dossier : %(subfolder)s\n"
+#~ "Image : %(image)s\n"
+#~ "Problème : %(problem)s"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s images non prises en compte"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "L'image n'a pas d'aperçu"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s images copiées sur %(total)s"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Image écrasée"
+
+#~ msgid "Image already exists"
+#~ msgstr "L'image existe déjà"
+
 #, python-format
 #~ msgid ""
 #~ "Destination directory could not be created\n"
@@ -1782,5 +2035,297 @@ msgstr "A_ffichage"
 #~ "%(directory)s\n"
 #~ "Erreurr : %(errno)s %(strerror)s"
 
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s images transférées"
+
+#~ msgid "images skipped"
+#~ msgstr "Images non prises en compte"
+
+#~ msgid "images downloaded"
+#~ msgstr "Images transférées"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr ""
+#~ "affiche les extensions de fichier reconnues par l'application et quitte "
+#~ "l'application"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr ""
+#~ "Un extension a été spécifiée mais le nom de l'image ne comporte aucune "
+#~ "extension"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr ""
+#~ "Un numéro d'image a été spécifié mais le nom de l'image ne comporte aucun "
+#~ "numéro"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Renommage des images</b>"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Conflits de nom d'images</b>"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Volume d'images</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Exemple : /home/utilisateur/photos</i>"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Nom du dossier de sauvegarde :"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Volume d'images</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Renommage des images</span>\t"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Détecter automatiquement les volumes d'images"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Sauvegarder les photos pendant le transfert"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Choisissez si vous souhaitez passer l'image ou ajouter un identifiant unique."
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Importez vos images efficacement et de façon fiable"
+
+#~ msgid "Image location:"
+#~ msgstr "Emplacement de l'image :"
+
+#~ msgid "Image Devices"
+#~ msgstr "Voumes d'images"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Quitter l'application à la suite d'un transfert réussi"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Si la détection automatique est désactivée, choisissez un emplacement pour "
+#~ "les images."
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Démarrer le transfert lors de l'insertion d'un volume d'images"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Spécifiez s'il faut enlever du nom des images et des dossiers tout caractère "
+#~ "non autorisé par d'autres systèmes d'exploitation."
+
+#~ msgid "Download Folder"
+#~ msgstr "Transfert"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Dossier de destination</span>"
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Spécifiez le dossier dans lequel sont stockées les sauvegardes sur le "
+#~ "volume.\n"
+#~ "\n"
+#~ "<i>Note : cela sera également utilisé pour déterminer si le volume est "
+#~ "utilisé pour les sauvegardes. Pour chaque volume que vous souhaitez utiliser "
+#~ "pour les sauvegarder, créez un dossier portant ce nom.</i>"
+
+#~ msgid "Image Rename"
+#~ msgstr "Renommage"
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Démonter (« éjecter ») le volume d'images après le transfert"
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Spécifiez quelle action entreprendre lorsqu'une image portant le même nom a "
+#~ "déjà été transférée ou sauvegardée."
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Impossible d'afficher la vignette"
+
+#~ msgid "Image skipped"
+#~ msgstr "Image passée"
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Lors de la sauvegarde, choisissez s'il faut écraser une image portant le "
+#~ "même nom sur le volume de sauvegarde, ou s'il faut passer l'image."
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Il est possible de sauvegarder les photos sur des emplacements multiples, "
+#~ "différents du dossier de transfert (par exemple, des disques durs externes)."
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Aucun volume de sauvegarde n'a été détecté."
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "La métadonnée est essentielle pour générer les noms des sous-dossiers / des "
+#~ "images.\n"
+#~ "Source : %s"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Aucune image à transféré depuis le volume."
+
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Erreur dans les préférences concernant le renommage des images"
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Les préférences pour le sous-repertoire ne sont pas valables et ne peuvent "
+#~ "être utilisées.\n"
+#~ "Les valeurs par défaut seront utilisées."
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "La métadonnée %s n'est pas présente dans l'image"
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Les volumes d'images dont des volumes depuis lesquels sont transférées des "
+#~ "photos (appareil photo, carte mémoire ou équipement de stockage portable).\n"
+#~ "\n"
+#~ "Vous avez la possibilité de transférer des photos depuis plusieurs volumes "
+#~ "simultanément.\n"
+#~ "\n"
+#~ "<i>Si le transfert direct depuis votre appareil photo fonctionne "
+#~ "difficilement voire pas du tout, essayez de le paramétrer en mode PTP. Si ce "
+#~ "n'est pas possible, utilisez un lecteur de cartes.</i>"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "L'image ne contient pas la métadonnée sous-secondes"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Avertissement :</b> Il n'y a pas assez de métadonnées dans l'image "
+#~ "pour générer le nom de façon complète. Utilisez une autre option de "
+#~ "renommage.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Attention:</b> Il y a un manque de méta-donnés des images pour générer "
+#~ "des sous-dossiers vides. S'il vous plait utiliser un autre sous dossier en "
+#~ "nommant les options."
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr ""
+#~ "Voulez-vous utiliser ce périphérique ou cette partition comme source de "
+#~ "transfert ?"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Détection terminée : aucune image trouvée sur %s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Impossible de supprimer l'image du volume"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Image : %(source)s\n"
+#~ "Erreur : %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Image : %(source)s"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "%i images ont été supprimées du volume"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Supprimer les images du volume après le transfert"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Images ayant le même nom de fichier, mais prises à des heures différentes :"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Première image : %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Seconde image : %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Désolé, l'emplacement de l'image n'existe pas :\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Résolvez le problème ou modifiez vos préférences."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Désolé, le dossier de transfert n'est pas accessible en écriture. Vérifiez "
+#~ "les permissions du dossier ou modifiez vos préférences"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Problème avec l'emplacement du dossier de l'image"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Désolé, le dossier de transfert n'existe pas. Créez le dossier ou modifiez "
+#~ "vos préférences"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Les préférences pour le sous-dossier présentent des valeurs inutiles qui ont "
+#~ "été retirées."
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Erreur dans les préférences concernant le sous-dossier de transfert"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Volume d'images : %s\n"
diff --git a/po/hu.po b/po/hu.po
index e808e08..e153d39 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,212 +7,261 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 21:48+0000\n"
-"Last-Translator: Balazs Oveges <Unknown>\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-28 05:11+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-22 00:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 19:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "New York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Prága"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teherán"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Párizs"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Róma"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moszkva"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Varsó"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "A Mai letöltések értéke érvénytelen.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Az érték visszaállítása nullára.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "A 'Nap kezdete' beállítás értéke hibás.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Visszaállítás éjfélre.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Hiba a kép átnevezési beállításokban"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr ""
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Elnézést, de ezek a beállítások hibásak:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Visszaállítás az alapbeállításokra."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Munka-szám"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "A megadott letöltési mappa beállítás hibás."
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr ""
+
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr ""
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr ""
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Válasszon egy letöltési könyvtárat"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Válasszon egy könyvtárat a képeknek"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr ""
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Válasszon egy könyvtárat a bizotnsági mentéseknek"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr ""
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Figyelmeztetés:</b> Nincs elegendő adat a név teljes kitöltéséhez. "
-"Kérem, használjon más átnevezési lehetőséget.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Figyelmeztetés:</b> Nincs elegendő adat az almappa teljes "
-"kitöltéséhez. Kérem, használjon más almappa nevezési lehetőséget.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Példa: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr "Letöltés folyamatban, a mai letöltések száma nem aktuális."
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr "Letöltés folyamatban, a tárolt érték nem aktuális."
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Az almappára vonatkozó beállításokból el lettek távolítva a felesleges "
-"értékek."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Az almappára vonatkozó beállítások érvénytelenek és nem használhatóak.  "
-"Vissza lesznek állítva az alapértékekre."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr ""
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "külső_meghajtó1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "külső_meghajtó2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr ""
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr ""
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "keresés..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr ""
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr ""
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "A letöltés megszakadt."
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "A program beállítása hibás."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -221,42 +270,38 @@ msgstr ""
 "Kérem ellenőrizze a beállításokat, indítsa újra a programot, és próbálja meg "
 "újra."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "A letöltés megszakadt."
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 of %s kép átmásolva"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr ""
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
-msgstr "A keresés kész: %(number)s számú képet található: %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+msgstr ""
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "A keresés kész: nem található kép %s ."
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "A kép elnevezését nem lehet létrehozni."
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -265,15 +310,14 @@ msgstr ""
 "Forrás: %(source)s\n"
 "Hiba: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"A kép elnevezését nem lehet meghatározni. Ellenőrizze, hogy elegendőek-e a "
-"meta-adatok."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -286,7 +330,8 @@ msgstr ""
 "Cél: %(destination)s\n"
 "Hiba: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -295,21 +340,21 @@ msgstr ""
 "Forrás: %(source)s\n"
 "Cél: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Egyedi azonosító hozzáaadva: '%s'"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Forrás: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Másolási hiba a letöltés során"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -320,86 +365,94 @@ msgstr ""
 "Cél: %(destination)s\n"
 "Hiba: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "A kép nem lett másolva."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr ""
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"A program azonos névvel, de különböző készítési dátummal rendelkező képeket "
-"talált."
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Első kép: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Második kép: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "A kép megnyitása sikertelen."
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr ""
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Forrás: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "A kép nem rendelkezik meta-adatokkal."
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr ""
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Az alkönyvtár / kép nevének meghatározásához meta-adatra van szükség\n"
-"Forrás: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Az alkönyvtár neve nem volt meghatározható. Ellenőrizze, hogy van-e elegendő "
-"meta-adat."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
-"Alkönyvtár: %(subfolder)s\n"
-"Kép: %(image)s\n"
-"Hiba: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Új nap kezdődött - a mai letöltések száma vissza lesz állítva."
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "A biztonsági másolat már létezik."
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr ""
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "A biztonsági másolat készítése során hiba történt."
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "A cél könyvtár nem hozható létre: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -408,12 +461,17 @@ msgstr ""
 "Forrás: %(source)s\n"
 "Cél: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Hiba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr ""
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -424,274 +482,330 @@ msgstr ""
 "Cél: %(destination)s\n"
 "Hiba: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr ""
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr ""
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr ""
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Az eszköz biztonságosan eltávolítható."
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s kép letöltve"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr ""
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s kép átugorva"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr ""
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "figyelmeztetések"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "hibák"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "A biztonsági másolat eszköze hiányzik"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "A biztonsági másolat eszköze nem érzékelhető"
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Ezen az eszközön nincsenek letölthető képek"
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "A letöltés megkezdődött %s helyről"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr ""
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Forrás: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Kép eszköz: %s\n"
+msgid "Device: %s\n"
+msgstr ""
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Cél: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Nem tudtam az átmeneti letöltési könyvtárat létrehozni"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Hiba:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Kép átugorva"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr ""
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Kép felülírva"
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "A letöltés megkezdődött %s helyről"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr ""
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr ""
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr ""
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "A biztonsági másolat eszköze hiányzik"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "A kép már létezik"
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr ""
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "A képhez nem tartozik előnézet"
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr ""
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr ""
+
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr ""
+
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr ""
+
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr ""
+
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr ""
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s a %(total)s képből átmásolva"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr ""
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "A kép törlése az eszközről sikertelen."
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr ""
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Kép: %(source)s\n"
-"Hiba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Kép: %(source)s"
+msgid "Photo: %(source)s"
+msgstr ""
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "A következő képek le lettek törölve az eszközről: %i images"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr ""
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "A letöltés befejeződött: %s"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Eszköz"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Fájlméret szerint"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Letöltés Folyamatban"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Az előnézet nem jeleníthető meg"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Hibás lehet"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Eszköz érzékelve"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
-msgstr "Erről az eszközről vagy partícióról le legyenek töltve a képek?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Emlékezzen erre a választásra"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s kijelölve letöltésre innen"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr ""
 "Az eszköz vagy partíció adatai mindig letöltési forrásként szolgálnak."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s nem használható letöltési eszközként."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr "Ez az eszköz vagy partició még nem volt letöltési forrás."
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Minden Munka-szám eltávolítása?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Minden Munka-szám el legyen távolítva?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Adjon meg munka-számot"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Adja meg az új munka-számot, vagy válasszon egy előzőt."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Adja meg az új munka-számot"
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Munka-szám:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Munka-szám megadva"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "A munka-szám nincs megadva"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"A megadott elérési útvonalon nem található kép:\n"
-"%(path)s\n"
-"A probléma megoldásához kérlek ellenőrizd a beállításokat."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "A képeket tároló könyvtár hibás"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr ""
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
 msgstr ""
-"Sajnálom, a letöltési könyvtár nem létezik. Kérlek hozd létre a könyvtárat, "
-"vagy módosítsd a beállításokat."
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgstr ""
+
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Sajnálom,  a letöltési könyvtár létezik, de nem írható.  Kérlek ellenőrizd a "
-"könyvtár jogosultsági beállítását, vagy módosítsd a beállításokat."
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Hiba a letöltési könyvtárral"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr ""
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Néhány beállítás vissza lesz állítva"
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Javaslat helyette: %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Adjon meg munka-számot"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "A munka-szám már megadva, ne addja meg újra"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "A munka-számra várakozó letöltések megkezdése"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "A letöltések megkezdése"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -699,22 +813,22 @@ msgstr ""
 "A program frissebb változata volt futtatva ezen a számítógépen.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr ""
 "A beállítások érvényesek, de ellenőrizze azokat a helyes működés érdekében."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Elnézést, de néhány beállítás helytelen, és vissza lesz állítva."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Figyelmeztetés:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -722,11 +836,11 @@ msgstr ""
 "A jelenlegi verzió frissebb a megelőzően futtatottnál. A beállítások "
 "ellenőrzése."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "A beállítások módosultak."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -737,11 +851,11 @@ msgstr ""
 "beállítások frissültek.\n"
 "Kérem ellenőrizze a helyes működéshez."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "A beállításokat nem kellett változtatni."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -751,117 +865,130 @@ msgstr ""
 "beállítások egy része érvénytelen volt, nem lehetett frissíteni. Ezek "
 "visszaállításra kerültek."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "A pynotify használata során hiba jelentkezett."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "A pynotify kiszolgálót nem sikerült elérni."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Figyelem: a munkaasztal környezet értesítő szerver nincs jól beállítva."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "és"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "A biztonsági mentés eszközök használata"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "A biztonsági mentés eszköz használata"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Nincs elérhető biztonsági mentés eszköz"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Eszköz %(device)s (%(path)s) mellőzve"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Érzékelve %(device)s megadott útvonalon %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Az automatikus letöltés indítás be lett állítva"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Az automatikus letöltés indítás nem lett beállítva"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Kézzel megadott útvonal használata"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr ""
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Minden letöltés befejeződött"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Kb. 1 másodperc van hátra"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Kb. %i másodperc van hátra"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Kb. 1 perc van hátra"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Kb. %(minutes)i:%(seconds)02i perc van hátra"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "képek letöltve"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr ""
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "képek átugorva"
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr ""
+
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr ""
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Letöltés "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Megállítás"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "A beállítások megváltoztak."
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Viszlát"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -870,338 +997,386 @@ msgstr ""
 "futás közben program információ megjelenítése a terminálban (default: "
 "%default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "csak a hibák megjelenítése a terminálban"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
-"a program által felismert fájl kiterjesztések listázása, majd kilépés"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr ""
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "és %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr ""
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Használatban"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "A %s már fut."
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Dátum és idő"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Szöveg"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Sorozatok"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Kép dátuma"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Ma"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Tegnap"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Név + kiterjesztés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Név"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Kiterjesztés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Kép száma"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Rekesz"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Expozíciós idő"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Fókusztávolság"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Fényképezőgép gyártója"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Fényképezőgép"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Rövid típusmegnevezés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Bővített típusmegnevezés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Sorozatszám"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Zár számláló"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "A tulajdonos neve"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Mai letöltések"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Munkamenetszám"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Alkönyvtár száma"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Tárolt szám"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Sorozat betű"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Minden számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Utolsó számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Utolsó 2 számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Utolsó 3 számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Utolsó 4 számjegy"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Eredeti kisbetű / nagybetű"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "NAGYBETŰS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "kisbetűs"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Egyszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Kétszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Háromszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Négyszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Ötszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Hatszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Hét számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Millimásodperc"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "ÉÉÉÉHHNN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "ÉÉÉÉ-HH-NN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "ÉÉHHNN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "ÉÉ-HH-NN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "HHNNÉÉÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "HHNNÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "HHNN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "NNHHÉÉÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "NNHHÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "ÉÉÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "ÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "NN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "ÓÓPPMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "ÓÓPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "ÓÓ-PP-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "ÓÓ-PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "ÓÓ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "MM"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1210,53 +1385,64 @@ msgstr ""
 "Beállítás '%(key)s' érvénytelen.\n"
 "Válasszon a listából %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Beállított érték '%(value)s' érvénytelen."
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Ezek a beállítások nem megfelelőek:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Millimásodperc meta-adat nem található a képben"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "%s meta-adat nem található"
+msgid "%s metadata is not present"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Hiba a dátum/idő összetevőben. %s érték érvénytelennek tűnik."
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
-msgstr "kiterjesztés megadva, de a képnek nincs kiterjesztése"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
-msgstr "kép száma lett megadva, de a fájlnévben nem található szám"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "a %s összetevővel hiba a név létrehozásakor"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Alkönyvtár beállítások nem kezdődhetnek %s értékkel"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Alkönyvtár beállítások nem végződhetnek %s értékkel"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1287,36 +1473,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompatibilitás egyéb operációs rendszerekkel</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Letöltési könyvtár</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Letöltési alkönyvtár</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Példa</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Kép eszköz</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Kép név ütközés</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Munka-szám</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Kép átnevezés</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Hiányzó biztonsági mentés eszköz</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Munka-szám</b>"
+msgid "<b>Photo Rename</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Hiányzó biztonsági mentés eszköz</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1331,8 +1517,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Photos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Példa: /home/user/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1355,66 +1541,70 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Egyedi azonosító megadása"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Hordozható eszközök automatikus érzékelése"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Biztonsági mentés eszközök automatikus érzékelése"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Kép eszközök automatikus érzékelése"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatizálás"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Biztonsági mentés"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Biztonsági mentés könyvtár:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Biztonsági mentés helye:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Letöltéskor biztonsági mentés készítése"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1422,66 +1612,83 @@ msgstr ""
 "Válasszon letöltési könyvtárat. Az alkönyvtárak automatikusan lesznek "
 "létrehozva, a lent található beállítások szerint."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Válasszon, hogy a átugorja a kép letöltését, vagy egyedi azonosítót tegyen "
-"hozzá."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:42
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Nap kezdete:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Képek törlése az eszközről a sikeres letöltést követően."
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Letöltés / Megszakítás"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Letöltési könyvtár"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Letöltési könyvtár:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Mai letöltések:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Hibakezelés"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Hibanapló"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Kilépés a programból a letöltések sikeres befejezését követően."
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Ha kikapcsolja az automatikus érzékelést, válasszon pontos biztonsági mentés "
 "helyet."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Ha kikapcsolja az automatikus érzékelést, válasszon pontos mentési helyet."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1491,63 +1698,47 @@ msgstr ""
 "eszközről össze lesznek gyűjtve a képek. Nagy tárhely esetén ez több időt "
 "vesz igénybe."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Figyelmen kívül hagyás"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Kép eszköz"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Kép átnevezés"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"A kép eszközök letöltendő fényképeket tartalmazó készülékek, mint "
-"fényképezőgépek, memória kártyák, mobil adattárolók.\n"
-"\n"
-"Egy időben több eszközről is lehetséges a képek lementése.\n"
-"\n"
-"<i>Ha a fényképezőgépről való letöltés rosszul, vagy egyáltalán nem működik, "
-"próbálja meg átállítani PTP módba. Ha ez nem lehetséges, egy kártyaolvasó "
-"használata lehet a megoldás.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Képek helye:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Hatékony és megbízható fénykép importálás"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Munka-szám"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr ""
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Felülírás"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Beállítások: Gyors Fénykép Letöltő"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "Összes törlése"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1576,41 +1767,42 @@ msgstr ""
 "az alábbi címre: Free Software Foundation, Inc., 51 Franklin Street, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Átnevezési lehetőségek"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Figyelmeztetés küldése"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Hibabejelentés küldése"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Kihagyás"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "A letöltés kihagyása"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Adja meg a könyvtárat, ahol a biztonsági másolatokat tartja.  \n"
-"\n"
-"<i>Megjegyzés: ez alapján lesz meghatározva az is, hogy egy adott eszköz a "
-"biztonsági mentések tárolására való-e. Minden eszközön, amelyet biztonsági "
-"mentésként használ, hozza létre a megfelelő könyvtárat.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1618,111 +1810,188 @@ msgstr ""
 "Határozza meg azt az időt 24 órás formában, ahol a <i>Downloads today</i> "
 "sorozatszámot vissza kell állítani."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Határozza meg, mi a teendő, ha egy fényképnek azonos a neve egy korábban "
-"letöltött képpel."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr "Határozza meg, mi a teendő, ha nincsen biztonsági mentés eszköz."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Döntse el, tartalmazhatnak-e a kép és mappa nevek olyan karaktereket, "
-"melyeket a többi operációs rendszer nem fogad el."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "A letöltés megkezdése a program indításakor"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "A letöltés megkezdése a kép eszköz érzékelésekor"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Tárolt szám:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Az inkompatibilis karakterek kihagyása"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "RAW és JPEG fájlok számkiosztásának szinkronizálása"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
-"A fénykép eszköz leválasztása (kiadása) a letöltések elvégzését követően"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
-"Válasszon, hogy a biztonsági mentés készítésekor felülírja az azonos nevű "
-"képeket, vagy ugorja át azokat."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"A képek letöltésekor lehetséges biztonsági másolat készítése, pl. külső "
-"merevlemezre."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Hozzáadás…"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Kész letöltések kiürítése"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Hibanapló"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Online help"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Súgó"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Küldjön adományt..."
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Fényképek"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Hibajelentés küldése..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Indexképek"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Fordítás"
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Nézet"
 
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Hiba a kép átnevezési beállításokban"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "A megadott letöltési mappa beállítás hibás."
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Figyelmeztetés:</b> Nincs elegendő adat a név teljes kitöltéséhez. "
+#~ "Kérem, használjon más átnevezési lehetőséget.</i>"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Az almappára vonatkozó beállításokból el lettek távolítva a felesleges "
+#~ "értékek."
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Figyelmeztetés:</b> Nincs elegendő adat az almappa teljes "
+#~ "kitöltéséhez. Kérem, használjon más almappa nevezési lehetőséget.</i>"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Válasszon egy könyvtárat a képeknek"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "A kép elnevezését nem lehet meghatározni. Ellenőrizze, hogy elegendőek-e a "
+#~ "meta-adatok."
+
+#~ msgid "Image has no metadata"
+#~ msgstr "A kép nem rendelkezik meta-adatokkal."
+
+#~ msgid "Backup image already exists"
+#~ msgstr "A biztonsági másolat már létezik."
+
+#~ msgid "The image was not copied."
+#~ msgstr "A kép nem lett másolva."
+
+#~ msgid "Image overwritten"
+#~ msgstr "Kép felülírva"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "A biztonsági másolat eszköze nem érzékelhető"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Ezen az eszközön nincsenek letölthető képek"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "A képhez nem tartozik előnézet"
+
+#~ msgid "Image skipped"
+#~ msgstr "Kép átugorva"
+
+#~ msgid "Image already exists"
+#~ msgstr "A kép már létezik"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "A keresés kész: nem található kép %s ."
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr "A keresés kész: %(number)s számú képet található: %(device)s"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 of %s kép átmásolva"
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -1735,6 +2004,28 @@ msgstr "_Nézet"
 
 #, python-format
 #~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Az alkönyvtár / kép nevének meghatározásához meta-adatra van szükség\n"
+#~ "Forrás: %s"
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Alkönyvtár: %(subfolder)s\n"
+#~ "Kép: %(image)s\n"
+#~ "Hiba: %(problem)s"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s kép átugorva"
+
+#, python-format
+#~ msgid ""
 #~ "Destination directory could not be created\n"
 #~ "%(directory)s\n"
 #~ "Error: %(errno)s %(strerror)s"
@@ -1743,5 +2034,259 @@ msgstr "_Nézet"
 #~ "%(directory)s\n"
 #~ "Hiba: %(errno)s %(strerror)s"
 
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s kép letöltve"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Az előnézet nem jeleníthető meg"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s a %(total)s képből átmásolva"
+
+#~ msgid "images skipped"
+#~ msgstr "képek átugorva"
+
+#~ msgid "images downloaded"
+#~ msgstr "képek letöltve"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr ""
+#~ "a program által felismert fájl kiterjesztések listázása, majd kilépés"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Millimásodperc meta-adat nem található a képben"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "%s meta-adat nem található"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr "kiterjesztés megadva, de a képnek nincs kiterjesztése"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr "kép száma lett megadva, de a fájlnévben nem található szám"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Kép átnevezés</b>"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Kép név ütközés</b>"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Kép eszköz</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Példa: /home/user/photos</i>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Kép eszközök automatikus érzékelése"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Letöltéskor biztonsági mentés készítése"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Biztonsági mentés könyvtár:"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
+
+#~ msgid "Download Folder"
+#~ msgstr "Letöltési könyvtár"
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Hatékony és megbízható fénykép importálás"
+
+#~ msgid "Image location:"
+#~ msgstr "Képek helye:"
+
+#~ msgid "Image Rename"
+#~ msgstr "Kép átnevezés"
+
+#~ msgid "Image Devices"
+#~ msgstr "Kép eszköz"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Kilépés a programból a letöltések sikeres befejezését követően."
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Ha kikapcsolja az automatikus érzékelést, válasszon pontos mentési helyet."
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "A letöltés megkezdése a kép eszköz érzékelésekor"
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "A képek letöltésekor lehetséges biztonsági másolat készítése, pl. külső "
+#~ "merevlemezre."
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Válasszon, hogy a biztonsági mentés készítésekor felülírja az azonos nevű "
+#~ "képeket, vagy ugorja át azokat."
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr ""
+#~ "A fénykép eszköz leválasztása (kiadása) a letöltések elvégzését követően"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Döntse el, tartalmazhatnak-e a kép és mappa nevek olyan karaktereket, "
+#~ "melyeket a többi operációs rendszer nem fogad el."
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Határozza meg, mi a teendő, ha egy fényképnek azonos a neve egy korábban "
+#~ "letöltött képpel."
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Az almappára vonatkozó beállítások érvénytelenek és nem használhatóak.  "
+#~ "Vissza lesznek állítva az alapértékekre."
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Válasszon egy könyvtárat a bizotnsági mentéseknek"
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "A kép elnevezését nem lehet létrehozni."
+
+#~ msgid "Could not open image"
+#~ msgstr "A kép megnyitása sikertelen."
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Az alkönyvtár neve nem volt meghatározható. Ellenőrizze, hogy van-e elegendő "
+#~ "meta-adat."
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Válasszon, hogy a átugorja a kép letöltését, vagy egyedi azonosítót tegyen "
+#~ "hozzá."
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Adja meg a könyvtárat, ahol a biztonsági másolatokat tartja.  \n"
+#~ "\n"
+#~ "<i>Megjegyzés: ez alapján lesz meghatározva az is, hogy egy adott eszköz a "
+#~ "biztonsági mentések tárolására való-e. Minden eszközön, amelyet biztonsági "
+#~ "mentésként használ, hozza létre a megfelelő könyvtárat.</i>"
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "A kép eszközök letöltendő fényképeket tartalmazó készülékek, mint "
+#~ "fényképezőgépek, memória kártyák, mobil adattárolók.\n"
+#~ "\n"
+#~ "Egy időben több eszközről is lehetséges a képek lementése.\n"
+#~ "\n"
+#~ "<i>Ha a fényképezőgépről való letöltés rosszul, vagy egyáltalán nem működik, "
+#~ "próbálja meg átállítani PTP módba. Ha ez nem lehetséges, egy kártyaolvasó "
+#~ "használata lehet a megoldás.</i>"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr "Erről az eszközről vagy partícióról le legyenek töltve a képek?"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Kép: %(source)s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "A kép törlése az eszközről sikertelen."
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Kép: %(source)s\n"
+#~ "Hiba: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "A következő képek le lettek törölve az eszközről: %i images"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Képek törlése az eszközről a sikeres letöltést követően."
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "A program azonos névvel, de különböző készítési dátummal rendelkező képeket "
+#~ "talált."
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Első kép: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Második kép: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Kép eszköz: %s\n"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Sajnálom,  a letöltési könyvtár létezik, de nem írható.  Kérlek ellenőrizd a "
+#~ "könyvtár jogosultsági beállítását, vagy módosítsd a beállításokat."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Sajnálom, a letöltési könyvtár nem létezik. Kérlek hozd létre a könyvtárat, "
+#~ "vagy módosítsd a beállításokat."
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "A megadott elérési útvonalon nem található kép:\n"
+#~ "%(path)s\n"
+#~ "A probléma megoldásához kérlek ellenőrizd a beállításokat."
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "A képeket tároló könyvtár hibás"
diff --git a/po/it.po b/po/it.po
index c5bdf2f..2fc4e31 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,219 +7,276 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 13:23+0000\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-28 20:39+0000\n"
 "Last-Translator: Marco Solari <marcosolari@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 18:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "New York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Parigi"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlino"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sidney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Mosca"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Varsavia"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Giacarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Stoccolma"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Il valore Downloads Oggi non è valido.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Resetta i valori a zero.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Il valore della preferenza 'Inizio del giorno' è corrotto.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Si resetta a mezzanotte.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Errore nelle preferenze Rinomina Immagine"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr "Errore nelle preferenze di Rinomina Foto"
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Scusa ma queste preferenze contengono un errore:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Si resettano ai valori di default."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Codice lavoro"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Errore nelle preferenze Sottocartella di Download"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr "Errore nelle preferenze di Rinomina Video"
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Errore nelle preferenze di Scarica Sottocartelle Foto"
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Errore nelle preferenze di Scarica Sottocartelle Video"
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr "foto e video"
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "foto"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Scegliere la cartella in cui scaricare le foto"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Selezionare una cartella contenente le foto"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr "Selezionare una cartella in cui scaricare i video"
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Selezionare una cartella per le immagini di backup"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Selezionare una cartella contenente %(file_types)s"
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr "Selezionare una cartella in cui salvare %(file_types)s"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Attenzione:</b> I metadati dell'immagine non sono sufficienti per "
-"generare correttamente un nome. Per favore, usa altre opzioni di "
+"<i><b>Attenzione:</b> I metadati sono insufficienti per generare "
+"completamente il nome. Si prega di utilizzare altre opzioni per la "
 "rinomina.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Attenzione:</b> I metadati dell'immagine non sono sufficienti per "
-"generare correttamente sottocartelle. Per favore, usa altre opzioni per i "
-"nomi di sottocartella.</i>"
+"<i><b>Attenzione:</b> I metadati sono insufficienti per generare "
+"completamente le sottocartelle. Si prega di utilizzare altre opzioni per "
+"nominare le sottocartelle.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Esempio: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "Il numero dei downloads di oggi non è stato aggiornato, in quanto è in corso "
 "un download"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
 "Il numero delle archiviazioni non è stato aggiornato, in quanto è in corso "
 "un download"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Sono stati rimossi alcuni valori non necessari nelle preferenze "
-"sottocartella."
+"Alcuni valori non necessari sono stati rimossi dalle preferenze della "
+"sottocartella %(filetype)s."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Le preferenze sottocartella inserite non sono valide e non possono essere "
-"usate.\n"
+"Le preferenze della sottocartella %(filetype)s inserite non sono valide e "
+"non possono essere utilizzate.\n"
 "Saranno reimpostate ai loro valori di default."
 
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "photo"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "video"
+
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "driveesterno1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "driveesterno1"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "foto o video"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "video"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "scansione in corso..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr "Il seguente percorso per lo scarico non ha potuto essere creato:\n"
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr "%(path)s: "
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Il download non può procedere"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "C'è un errore nelle referenze programma."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -227,44 +284,42 @@ msgstr ""
 "\n"
 "Per favore controlla le preferenze, riavvia il programma e prova di nuovo"
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Il download non può procedere"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 di %s immagini copiate"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr "0 di %(number)s %(filetypes)s"
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Scansione del dispositivo completata: trovate %(number)s immagini in "
+"Scansione del dispositivo completata: trovati %(number)s %(filetypes)s su "
 "%(device)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Scansione del dispositivo completata: nessuna immagine trovata in %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
+"Scansione del dispositivo completata: nessun %(filetypes)s trovato su "
+"%(device)s"
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Non si è potuto generare il nome file dell'immagine"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr "Il nome di file %(filetype)s non ha potuto essere generato"
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -273,15 +328,16 @@ msgstr ""
 "Origine: %(source)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Non si è potuto generare correttamente il nome file dell'immagine. "
-"Controllare che ci siano sufficienti metadati per l'immagine."
+"Il nome di file %(filetype)s non ha potuto essere generato correttamente. "
+"Verificare che ci siano sufficienti metadati."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -294,7 +350,8 @@ msgstr ""
 "Destinazione: %(destination)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -303,21 +360,21 @@ msgstr ""
 "Origine: %(source)s\n"
 "Destinazione: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Aggiunto identificatore univoco '%s'"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origine: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Errore nella copia del download"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -328,87 +385,107 @@ msgstr ""
 "Destinazione: %(destination)s\n"
 "Errore: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "L'immagine non è stata copiata."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr "Il %(filetype)s non è stato copiato."
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
-msgstr "Rilevate immagini con lo stesso nome, ma scattate ad ore diverse"
+"Photos detected with the same filenames, but taken at different times:"
+msgstr ""
+"Rilevate foto con gli stessi nomi di file, ma scattate ad ore diverse:"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Prima immagine: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Seconda immagine: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"Prima foto: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Seconda foto: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Impossibile aprire l'immagine"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr "Could not open %(filetype)s"
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Origine: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "L'immagine non ha metadati"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr "%(filetype)s non ha metadati"
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"I metadati sono essenziali per generare i nomi delle sottocartelle / "
-"immagini.\n"
-"Origine: %s"
+"I metadati sono essenziali per generare le sottocartelle e/o i nomi dei "
+"files.\n"
+"Sorgente: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Impossibile generare correttamente il nome della sottocartella. Controllare "
-"che ci siano metadati sufficienti per l'immagine."
+"Il nome della sottocartella no ha potuto essere generato correttamente. "
+"Controllre che ci siano metadati sufficienti."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
 "Sottocartella: %(subfolder)s\n"
-"Immagine: %(image)s\n"
+"File: %(file)s\n"
 "Problema: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Un nuovo giorno è iniziato - si resetta il numero di sequenza 'Downloads "
 "Oggi'"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "L'immagine di backup esiste già"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Una copia di salvataggio di %(file_type)s esiste già"
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Sovrascritta copia di salvataggio di %(file_type)s"
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr "%(file_type)s non salvati in %(volume)s"
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s non salvati"
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Errore durante il backup"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Non si è potuto creare la cartella di destinazione: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -417,12 +494,17 @@ msgstr ""
 "Sorgente: %(source)s\n"
 "Destinazione: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Errore: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr "Il %(file_type)s non è stato salvato."
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -433,279 +515,345 @@ msgstr ""
 "Destinazione: %(destination)s\n"
 "Errore: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr "%(file_type)s non ha potuto essere salvato"
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr "Non trovato alcun volume di salvataggio adatto"
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr "Una locazione per il salvataggio non è stata trovata"
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Il dispositivo può adesso essere rimosso in modo sicuro"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s immagini scaricate"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s scaricati"
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s immagini ignorate"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr "%(noFiles)s %(filetypes)s ignorati"
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "avvertenze"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "errori"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Manca il dispositivo di backup"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Nessun dispositivo di backup è stato rilevato."
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr "La miniatura della foto non ha potuto essere estratta"
 
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Questo dispositivo non ha immagini da scaricare."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Il download è inziato da %s"
-
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Sorgente: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Dispositivo immagini: %s\n"
+msgid "Device: %s\n"
+msgstr "Dispositivo: %s\n"
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Destinazione: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Impossibile creare la cartella temporanea"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Errore:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Immagine ignorata"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr "Questo dispositivo non ha %(types_searched_for)s da cui scaricare."
+
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Il download è inziato da %s"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr "Il percorso di salvataggio non esiste"
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Immagine sovrascritta"
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr "Il percorso %s could not be created"
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr "Non può avvenire alcun salvataggio"
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Manca il dispositivo di backup"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr "Nessun dispositivo di salvataggio è stato rilevato automaticamente"
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr "Foto"
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr "Foto ignorata"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "L'immagine esiste già"
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr "La foto esiste già"
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "L'immagine non ha miniatura"
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr "Video"
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr "Video ignorato"
+
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr "Il video esiste già"
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s di %(total)s immagini copiate"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s di %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Impossibile eliminare l'immagine dal dispositivo"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr "Impossibile eliminare la foto o il video dal dispositivo"
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Immagine: %(source)s\n"
-"Errori: %(errno)s %(strerror)s"
+"Foto: %(source)s\n"
+"Errore: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Immagine: %(source)s"
+msgid "Photo: %(source)s"
+msgstr "Foto: %(source)s"
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "%i immagini eliminate dal dispositivo"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr "Eliminati %(number)i %(filetypes)s dal dispositivo"
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Download completato da %s"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Dimensione"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Avanzamento del download"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "La miniatura non può essere visualizzata"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Può essere corrotto"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Dispositivo rilevato"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
-msgstr "Questo è un dispositivo o una partizione da cui scaricare immagini?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr ""
+"Si vuole utilizzare questo dispositivo o partizione some sorgente da cui "
+"scaricare foto o vodeo?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Ricorda questa scelta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s selezionato come sorgente per il download"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr ""
 "Questo dispositivo o partizione sarà sempre usato come sorgente per il "
 "download"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s rifiutato come sorgente per il download"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr ""
 "Questo dispositivo o partizione non sarà mai usato come sorgente per il "
 "download"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Elimina tutti i Codici Lavoro?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Occorre rimuovere tutti i Codici Lavoro?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Inserire un Codice Lavoro"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Inserire un nuovo codice lavoro, o selezionarne uno precedente."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Inserire un nuovo codice lavoro"
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Codice Lavoro:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Codice Lavoro inserito"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Codice Lavoro non inserito"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Spiacenti, la locazione di questa immagine non esiste:\n"
+"Spiacenti, questo dispositivo non esiste:\n"
 "%(path)s\n"
 "\n"
-"Si prega di risolvere il problema, oppure modificare le proprie preferenze."
+"Si prega di risolvere il problema, oppure modificare le tue preferenze."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Problema con la Cartella della Locazione Immagini"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr "Problema con la Cartella della Posizione del Dispositivo"
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
-msgstr ""
-"Spiacenti, la Cartella di Download non esiste. Si prega di creare la "
-"cartella, oppure modificare le proprie preferenze."
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr "La Cartella di Download di %(file_type)s non esiste.\n"
+
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgstr "La Cartella di Download di %(file_type)s non è scrivibile.\n"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Spiacenti, la Cartella di Download esiste ma non è scrivibile. Si prega di "
-"controllare i permessi della cartella, oppure modificare le proprie "
-"preferenze."
+"Spiacenti, si sono verificati problemi con le tue cartelle di download. Si "
+"prega di risolvere i problemi oppure modificare le tue preferenze.\n"
+"\n"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Problema con la Cartella di Download"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr "Problema con le Cartelle di Download"
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Alcune preferenze saranno azzerate."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Si richiede se usare %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Si richiede un Codice Lavoro"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Si sta già richiedendo un Codice Lavoro, non si richiede di nuovo"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Si iniziano i downloads che attendevano un Codice Lavoro"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Inizio download"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr "Si crea la cartella di download delle foto %(folder)s"
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+"Impossibile creare la cartella di download delle foto di default %(folder)s"
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr "Si crea la cartella di download per i video %(folder)s"
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr "Impossibile creare la cartella di download per i video %(folder)s"
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -714,7 +862,7 @@ msgstr ""
 "computer.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -722,15 +870,15 @@ msgstr ""
 "Le preferenze del programma sembrano essere valide, ma occorre controllarle "
 "per assicurare la correttezza delle operazioni."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Spiacente, alcune preferenze non sono valide e saranno ripristinate."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Attenzione:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -738,11 +886,11 @@ msgstr ""
 "Questa versione del programma è più recente della versione eseguita in "
 "precedenza. Si controllano le preferenze."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Le preferenze sono state modificate."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -754,11 +902,11 @@ msgstr ""
 "\n"
 "Controllarle per assicurare la correttezza delle operazioni."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Non occorre cambiare alcuna preferenza."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -768,118 +916,131 @@ msgstr ""
 "versione. Alcune delle preferenze precedenti non erano valide, e non hanno "
 "potuto essere aggiornate. Saranno reimpostate."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Riscontrato un problema usando pynotify."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Impossibile acquisire le proprietà server di pynotify."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Attenzione: il server delle notifiche dell'ambiente desktop è configurato in "
 "modo scorretto."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "e"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Si utilizzano dispositivi di backup"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Si utilizza un dispositivo di backup"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Non è stato rilevato nessun dispositivo di backup"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Dispositivo %(device)s (%(path)s) ignorato"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Rilevato %(device)s con il percorso %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Avvio automatico dei download attivo"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Avvio automatico dei download disattivo"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Si utilizza un percorso specificato manualmente"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr "Salvataggio su %(path)s"
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Tutti i download completati"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Circa 1 secondo rimanente"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Circa %i secondi rimanenti"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Manca circa 1 minuto"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Circa %(minutes)i:%(seconds)02i minuti rimanenti"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "immagini scaricate"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr "foto scaricate"
+
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr "foto ignorate"
+
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr "video scaricati"
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "immagini saltate"
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr "video ignorati"
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Download "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Le preferenze sono state modificate."
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Arrivederci"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -888,339 +1049,388 @@ msgstr ""
 "visualizza informazioni sul programma sulla riga comando quando il programma "
 "è in esecuzione (default: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "visualizza solo gli errori sulla riga comando"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
-"elenca le estensioni per i files delle immagini che il programma riconosce, "
-"ed esce"
+"elenca le le estensioni file delle foto e dei video che il programma "
+"riconosce ed esce"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr "resetta tutte le impostazioni e preferenze del programma ed esce"
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr "Foto:"
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr "Video"
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "e %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr "Tutte le impostazioni e preferenze sono state resettate"
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Si usa"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s è già in esecuzione"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Data e ora"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Testo"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Nome file"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metadati"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Ordinamenti"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Data dell'immagine"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr "Data del video"
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Oggi"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Nome + estensione"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Nome"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Estensione"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Numero immagine"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr "Numero del video"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Apertura"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Tempo di esposizione"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Lunghezza focale"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Marca della fotocamera"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Modello della fotocamera (es.: Canon EOS-1Ds Mark III)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Modello brevissimo della fotocamera (es.: D300)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Modello breve della fotocamera (es.: DSC-P92)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Numero seriale"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Contatore dell'otturatore"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Nome del proprietario"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr "Codec"
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr "Larghezza"
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr "Altezza"
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr "Lunghezza"
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr "Fotogrammi per secondo"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Downloads oggi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Numero della sessione"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Numero della sottocartella"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Numero memorizzato"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Lettera di sequenza"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Tutte le cifre"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Ultima cifra"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Ultime 2 cifre"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Ultime 3 cifre"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Ultime 4 cifre"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Caso originale"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "MAIUSCOLO"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "minuscolo"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Una cifra"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Due cifre"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Tre cifre"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Quattro cifre"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Cinque cifre"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Sei cifre"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Sette cifre"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Sotto-secondi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "YYYYMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
-msgstr "YYYY-MM-DD"
+msgstr "AAAA-MM-GG"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "YYMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "YY-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "MMDDYYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "MMDDYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "DDMMYYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "DDMMYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "YYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "YY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM (minuti)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1229,56 +1439,65 @@ msgstr ""
 "La chiave delle preferenze '%(key)s' non è valida\n"
 "Sono previsti uno di %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Il valore delle preferenze '%(value)s' non è valido"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Queste preferenze non sono formalmente corrette:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Metadato sotto-secondi non presente nell'immagine"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr "Metadato subsecond non presente nella foto"
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "Metadato %s non presente nell'immagine"
+msgid "%s metadata is not present"
+msgstr "%s metadati non è presente"
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Errore nel componente data e ora. Il valore %s non sembra valido"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
-msgstr ""
-"è stata specificata un'estensione ma il nome dell'immagine non ha estensione"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
+msgstr "estensione specificata ma il nome del file non ha un'estensione"
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
 msgstr ""
-"è stato specificato un numero immagine ma il nome file dell'immagine non ha "
-"numero"
+"numero della foto o del video specificata ma il nome del file non ha numero"
+
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr "metadato %s non è presente nella foto"
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "errore nella generazione del nme con il componente %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr "metadato %s non è presente nel video"
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Le preferenze sottocartella non dovrebbero iniziare con un %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Le preferenze sottocartella non dovrebbero terminare con un %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1309,36 +1528,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Compatibilità con Altri Sistemi Operativi</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr "<b>Dispositivi</b>"
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Cartella di Download</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Sottocartella di Download</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Esempio</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Dispositivi Immagine</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Conflitti sul Nome Immagine</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Codici Lavoro</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Rinomina Immagine</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Dispositivi di Backup Mancanti</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Codici Lavoro</b>"
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Rinomina Foto</b>"
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Dispositivi di Backup Mancanti</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Nomi di Foto e Video Name in conflitto</b>"
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1353,8 +1572,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Photos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Esempio: /home/utente/fotografie</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Esempio: /home/user/Foto</i>"
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1377,66 +1596,74 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Cartella di Download</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivi</span>"
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Gestione Errori</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivi Immagine</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Codici Lavoro</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina Immagine</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Cartelle per il Download delle "
+"Foto</span>"
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Codici Lavoro</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina Foto</span>\t"
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Opzioni di Rinomina</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Cartelle per il Download dei "
+"Video</span>"
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina Video</span>\t"
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Aggiunta di un identificatore univoco"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Rileva automaticamente i Dispositivi di Memorizzazione Portatile"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Rileva automaticamente i dispositivi di backup"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Rileva automaticamente i dispositivi immagine"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr "Rileva i dispositivi automaticamente"
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automazione"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Backup"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Nome della cartella di backup:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Locazione del backup:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Backup delle foto durante il download"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr "Salva le foto ed i video quando si fa il download"
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1445,69 +1672,99 @@ msgstr ""
 "saranno create automaticamente in questa cartella utilizzando la struttura "
 "specificata sotto."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Scegliere la cartella per il download. Le sottocartelle per i video "
+"scaricati saranno create automaticamente in questa cartella utilizzando la "
+"struttura specificata sotto."
+
+#: rapid/glade3/rapid.glade.h:42
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
-"Scelta se saltare il download dell'immagine, oppure aggiungere un "
+"Scegliere se ignorare il download del file, o se aggiungere un "
 "identificatore univoco."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Giorno iniziale:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Eliminare le immagini dal dispositivo al termine dello scarico"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr "Eliminare le foto ed i video dal dispositivo al termine del download"
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr "Dispositivi"
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+"I dispositivi sono le sorgenti da cui si scaricano le foto ed i video, come "
+"macchine fotografiche, schede di memoria o Portable Storage Devices.\n"
+"\n"
+"Si possono scaricare foto da dispositivi multipli simultaneamente, oppure si "
+"può spefificare una posizione sul proprio disco fisso.\n"
+"\n"
+"<i>Se lo scarico diretto propria macchina fotografica funzionasse male o per "
+"nulla, provare ad impostarla in modalità PTP. Se ciò non fosse possibile, "
+"considerare di utilizzare un lettore di schede di memoria.</i>"
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Download / Pausa"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Cartella di Download"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Cartella di download:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Downloads oggi:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Gestione Errori"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Registrazione degli Errori"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr ""
-"Termina il programma al termine del completamento di un download con esito "
-"positivo"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr "Esci dal programma se il download si completa senza avvisi od errori"
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Se si disabilita il rilevamento automatico, scegliere l'esatta locazione del "
 "backup."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Se si disabilita il rilevamento automatico, scegliere l'esatta locazione "
-"delle immagini."
+"Se si disabilita il rilevamento automatico, scegliere la posizione esatta "
+"delle immagini e dei video."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1517,64 +1774,47 @@ msgstr ""
 "portatile (PSD), tutto il dispositivo sarà sottoposto a scansione per le "
 "immagini. Su dispositivi capienti ciò potrebbe richiedere tempo."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Ignora"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Dispositivi Immagine"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Rinomina Immagini"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"I dispositivi immaginw sono dispositivi da cui scaricare fotografie, come "
-"macchine fotografiche, schede di memoria o dispositivi di memorizzazione "
-"portatili (PSD).\n"
-"\n"
-"Puoi scaricare fotografie da più dispositivi immagine contemporaneamente.\n"
-"\n"
-"<i>Se il download diretto dalla tua macchina fotografica funziona male o non "
-"funziona per niente, prova ad impostarla in modalità PTP. Se questo non "
-"fosse possibile, considera di utilizzare un lettore di schede di memoria.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Locazione dell'immagine"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Importa le tue foto ed i video in modo efficiente ed affidabile"
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Importa le tue immagini in modo efficiente ed affidabile"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Codici Lavoro"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr "Posizione:"
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr "Cartelle delle Foto"
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr "Rinomina Foto"
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr "Nome della cartella di salvataggio delle foto:"
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Preferenze: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "R_imuovi Tutto"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1604,42 +1844,52 @@ msgstr ""
 "Photo Downloader; altrimenti, scrivi alla Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Opzioni di Rinomina"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Riporta una segnalazione"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Riporta un errore"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Salta"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Salta il download"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+"Spiacente, la funzionalità di download dei video è disabilitata. Per "
+"scaricare i video, si prega di installare il pacchetto <i>kaa metadata</i> "
+"per python."
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Specifica la cartella nella quale i backups sono memorizzati sul "
+"Specificare la cartella in cui si memorizzare i salvataggi per il "
 "dispositivo.  \n"
 "\n"
-"<i>Nota: questa sarà anche usata per determinare se un dispositivo è "
-"utilizzato per i backups o meno. Per ogni dispositivo che si vuol utilizzare "
-"per il backup, crearvi una cartella con questo nome.</i>"
+"<i>Nota: questo valore sarà anche utilizzato per determinare se il "
+"dispositivo è utilizzato o meno per i salvataggi. Per ogni dispositivo che "
+"vuoi utilizzare per i salvataggi, crea una cartella al suo interno con uno "
+"di questi nomi.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1647,111 +1897,194 @@ msgstr ""
 "Specificare l'ora nel formato 24 ore a cui il numero di sequenza "
 "<i>Downloads oggi</i> dovrebbe essere reimpostato."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Specificare cosa fare quando un'immagine con lo stesso nome è già stata "
-"scaricata o salvata."
+"Specificare cosa fare quando una foto o un video con lo stesso nome sono "
+"stati scaricati o salvati."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr "Specificare cosa fare quando non ci sono dispositivi di backup."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Specificare se l'immagine o i nomi di cartella dovrebbero avere rimossi i "
-"caratteri non permessi da altri sistemi operativi."
+"Specificare se dai nomi delle foto, dei video e delle cartelle occorre "
+"rimuovere qualche carattere non ammesso da altri sistemi operativi."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Inizia il download all'avvio del programma"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Inizia il download all'inserimento di un dispositivo immagini"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr "Iniziare a scaricare quando il dispositivo viene inserito"
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Numero memorizzato:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Elimina caratteri incompatibili"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Sincronizza i numeri di sequenza RAW + JPEG"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Smonta (\"espelle\") il dispositivo immagini al termine del download"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Smontare (\"eject\") il dispositivo al completamento del download"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr "Cartelle Video"
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr "Rinomina Video"
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr "Nome della cartella di salvataggio dei video:"
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
-"Quando si effettua il backup, scegliere se sovrascrivere un'immagine che ha "
-"lo stesso nome sul dispositivo di backup, o se saltarne il backup."
+"Scegliere se, durante un salvataggio, si vuole sovrascrivere un file che "
+"abbia lo stesso nome sul dispositivo di salvataggio, o ignorarne la copia."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Si possono salvare in locazioni diverse le proprie fotografie mentre vengono "
-"scaricate, ad esempio un dischi esterni."
+"Si possono salvare le proprie foto o video in posizioni multiple mentre sono "
+"scaricati, per esempio su dischi esterni."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Aggiungere"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Svotare i Downloads Completati"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Registrazione Errori"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Richiedi Aiuto In Linea..."
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Fai una Donazione..."
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Fotografie"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Segnala un Problema..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Miniature"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Traduci questa Applicazione..."
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Visualizzazione"
 
 #, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Scansione del dispositivo completata: nessuna immagine trovata in %s"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Scansione del dispositivo completata: trovate %(number)s immagini in "
+#~ "%(device)s"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 di %s immagini copiate"
+
+#~ msgid "Could not open image"
+#~ msgstr "Impossibile aprire l'immagine"
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Sottocartella: %(subfolder)s\n"
+#~ "Immagine: %(image)s\n"
+#~ "Problema: %(problem)s"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Immagine sovrascritta"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Nessun dispositivo di backup è stato rilevato."
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Questo dispositivo non ha immagini da scaricare."
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s di %(total)s immagini copiate"
+
+#~ msgid "Image already exists"
+#~ msgstr "L'immagine esiste già"
+
+#~ msgid "images skipped"
+#~ msgstr "immagini saltate"
+
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Errore nelle preferenze Rinomina Immagine"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Errore nelle preferenze Sottocartella di Download"
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Le preferenze sottocartella inserite non sono valide e non possono essere "
+#~ "usate.\n"
+#~ "Saranno reimpostate ai loro valori di default."
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Sono stati rimossi alcuni valori non necessari nelle preferenze "
+#~ "sottocartella."
+
+#~ msgid "Select an image folder"
+#~ msgstr "Selezionare una cartella contenente le foto"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Selezionare una cartella per le immagini di backup"
+
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -1761,6 +2094,39 @@ msgstr "_Visualizzazione"
 #~ "Destinazione: %(destination)s\n"
 #~ "Problema: %(problem)s"
 
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Non si è potuto generare correttamente il nome file dell'immagine. "
+#~ "Controllare che ci siano sufficienti metadati per l'immagine."
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Non si è potuto generare il nome file dell'immagine"
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "I metadati sono essenziali per generare i nomi delle sottocartelle / "
+#~ "immagini.\n"
+#~ "Origine: %s"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "L'immagine non ha metadati"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Impossibile generare correttamente il nome della sottocartella. Controllare "
+#~ "che ci siano metadati sufficienti per l'immagine."
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s immagini ignorate"
+
 #, python-format
 #~ msgid ""
 #~ "Destination directory could not be created\n"
@@ -1771,5 +2137,265 @@ msgstr "_Visualizzazione"
 #~ "%(directory)s\n"
 #~ "Errore: %(errno)s %(strerror)s"
 
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s immagini scaricate"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "L'immagine di backup esiste già"
+
+#~ msgid "The image was not copied."
+#~ msgstr "L'immagine non è stata copiata."
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "L'immagine non ha miniatura"
+
+#~ msgid "Image skipped"
+#~ msgstr "Immagine ignorata"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "La miniatura non può essere visualizzata"
+
+#~ msgid "images downloaded"
+#~ msgstr "immagini scaricate"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr ""
+#~ "elenca le estensioni per i files delle immagini che il programma riconosce, "
+#~ "ed esce"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Metadato sotto-secondi non presente nell'immagine"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "Metadato %s non presente nell'immagine"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr ""
+#~ "è stata specificata un'estensione ma il nome dell'immagine non ha estensione"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr ""
+#~ "è stato specificato un numero immagine ma il nome file dell'immagine non ha "
+#~ "numero"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Rinomina Immagine</b>"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Conflitti sul Nome Immagine</b>"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Dispositivi Immagine</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Esempio: /home/utente/fotografie</i>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivi Immagine</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Cartella di Download</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina Immagine</span>\t"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Backup delle foto durante il download"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Nome della cartella di backup:"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Rileva automaticamente i dispositivi immagine"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Scelta se saltare il download dell'immagine, oppure aggiungere un "
+#~ "identificatore univoco."
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
+
+#~ msgid "Download Folder"
+#~ msgstr "Cartella di Download"
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Importa le tue immagini in modo efficiente ed affidabile"
+
+#~ msgid "Image location:"
+#~ msgstr "Locazione dell'immagine"
+
+#~ msgid "Image Rename"
+#~ msgstr "Rinomina Immagini"
+
+#~ msgid "Image Devices"
+#~ msgstr "Dispositivi Immagine"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr ""
+#~ "Termina il programma al termine del completamento di un download con esito "
+#~ "positivo"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Se si disabilita il rilevamento automatico, scegliere l'esatta locazione "
+#~ "delle immagini."
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Specifica la cartella nella quale i backups sono memorizzati sul "
+#~ "dispositivo.  \n"
+#~ "\n"
+#~ "<i>Nota: questa sarà anche usata per determinare se un dispositivo è "
+#~ "utilizzato per i backups o meno. Per ogni dispositivo che si vuol utilizzare "
+#~ "per il backup, crearvi una cartella con questo nome.</i>"
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Smonta (\"espelle\") il dispositivo immagini al termine del download"
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Quando si effettua il backup, scegliere se sovrascrivere un'immagine che ha "
+#~ "lo stesso nome sul dispositivo di backup, o se saltarne il backup."
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Specificare cosa fare quando un'immagine con lo stesso nome è già stata "
+#~ "scaricata o salvata."
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Inizia il download all'inserimento di un dispositivo immagini"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Specificare se l'immagine o i nomi di cartella dovrebbero avere rimossi i "
+#~ "caratteri non permessi da altri sistemi operativi."
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Si possono salvare in locazioni diverse le proprie fotografie mentre vengono "
+#~ "scaricate, ad esempio un dischi esterni."
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "I dispositivi immaginw sono dispositivi da cui scaricare fotografie, come "
+#~ "macchine fotografiche, schede di memoria o dispositivi di memorizzazione "
+#~ "portatili (PSD).\n"
+#~ "\n"
+#~ "Puoi scaricare fotografie da più dispositivi immagine contemporaneamente.\n"
+#~ "\n"
+#~ "<i>Se il download diretto dalla tua macchina fotografica funziona male o non "
+#~ "funziona per niente, prova ad impostarla in modalità PTP. Se questo non "
+#~ "fosse possibile, considera di utilizzare un lettore di schede di memoria.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Attenzione:</b> I metadati dell'immagine non sono sufficienti per "
+#~ "generare correttamente un nome. Per favore, usa altre opzioni di "
+#~ "rinomina.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Attenzione:</b> I metadati dell'immagine non sono sufficienti per "
+#~ "generare correttamente sottocartelle. Per favore, usa altre opzioni per i "
+#~ "nomi di sottocartella.</i>"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr "Questo è un dispositivo o una partizione da cui scaricare immagini?"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Immagine: %(source)s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Impossibile eliminare l'immagine dal dispositivo"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "%i immagini eliminate dal dispositivo"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Eliminare le immagini dal dispositivo al termine dello scarico"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Immagine: %(source)s\n"
+#~ "Errori: %(errno)s %(strerror)s"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr "Rilevate immagini con lo stesso nome, ma scattate ad ore diverse"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Prima immagine: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Seconda immagine: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Dispositivo immagini: %s\n"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Spiacenti, la locazione di questa immagine non esiste:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Si prega di risolvere il problema, oppure modificare le proprie preferenze."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Spiacenti, la Cartella di Download esiste ma non è scrivibile. Si prega di "
+#~ "controllare i permessi della cartella, oppure modificare le proprie "
+#~ "preferenze."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Spiacenti, la Cartella di Download non esiste. Si prega di creare la "
+#~ "cartella, oppure modificare le proprie preferenze."
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Problema con la Cartella della Locazione Immagini"
diff --git a/po/nl.po b/po/nl.po
index 7d4fcb2..8694eff 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,215 +7,275 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 07:37+0000\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-28 04:51+0000\n"
 "Last-Translator: A.J. Baudrez <a.baudrez@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 19:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "New York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manilla"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Praag"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Parijs"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlijn"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Boedapest"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Rome"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moskou"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Warschau"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Ongeldige Downloads Vandaag waarde.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Waarde op nul terugzetten.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "'Start of day' voorkeurswaarde is corrupt.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Terugzetten op middernacht.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Fout in Afbeelding Hernoemen  voorkeuren"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr "Fout in de voorkeuren van Foto Hernoemen"
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Sorry, deze voorkeuren bevatten een fout:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Terugzetten naar de standaard waardes."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Job code"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Fout in Download Submap voorkeuren"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr "Fout in de voorkeuren Video Hernoemen"
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Fout in de voorkeuren van Photo Download Subfolders"
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Fout in de voorkeuren Video Download Subfolders"
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr "foto's en video's"
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "foto's"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
-msgstr "Duid een map aan om de foto's te downloaden"
+msgstr "Duid een map aan om de foto's naar toe te downloaden"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Duid een afbeeldingsmap aan"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr "Selecteer een folder om de video's naar toe te downloaden"
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Duid een map aan om afbeeldingen naar toe te backuppen"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Selecteer een map die %(file_types)s bevat"
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr ""
+"Selecteer een map waar %(file_types)s naar toe gebackuped moeten worden"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<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 afbeeldingsmetadata om een volledige "
-"naam aan te maken. Gelieve andere hernoemingsopties 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>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<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 afbeeldingsmetadata om een submap aan "
-"te maken. Gelieve andere submap benoemingsopties te gebruiken.</i>"
+"<i><b>Opgepast:</b> Er is onvoldoende metadata om volledige subfolders aan "
+"te maken. Kies andere subfolder benoemings opties.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Voorbeeld: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "'Downloads Vandaag' waarde niet aangepast, daar er momenteel een download "
 "bezig is"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
 "Waarde opgeslagen nummer niet aangepast, daar er momenteel een download "
 "bezig is"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Bij de submap voorkeuren werden enkele overbodige waardes verwijderd."
+"Er werden overbodige waardes verwijderd van de voorkeuren voor de "
+"%(filetype)s subfolder"
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"De ingevulde submapvoorkeuren zijn ongeldig en kunnen niet gebruikt worden.\n"
+"De voorkeuren voor de %(filetype)s subfolder zijn ongeldig en kunnen niet "
+"gebruikt worden.\n"
 "Ze zullen naar de standaard waardes worden teruggezet."
 
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "foto"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "video"
+
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "extern apparaat 1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "extern apparaat 2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "foto's of video's"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "video's"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "Aan het scannen..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr "Het volgende downloadpad kon niet aangemaakt worden:\n"
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr "%(path)s: "
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Download kan niet plaatsgrijpen"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Er is een fout in de programma voorkeuren."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -224,43 +284,39 @@ msgstr ""
 "Gelieve de voorkeuren te controleren, het programma te herstarten en opnieuw "
 "te proberen."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Download kan niet plaatsgrijpen"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 van %s afbeeldingen gekopieerd"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr "0 van %(number)s %(filetypes)s"
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Apparaat scan afgelopen: %(number)s afbeeldingen gevonden op %(device)s"
+"Apparaten scan afgelopen: %(number)s %(filetypes)s op %(device)s gevonden"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Apparaat scan afgelopen: geen afbeeldingen gevonden op %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr "Apparaten scan afgelopen: geen %(filetypes)s gevonden op %(device)s"
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Afbeeldingsnaam kon niet aangemaakt worden"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr "%(filetype)s bestandsnaam kon niet aangemaakt worden"
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -269,15 +325,16 @@ msgstr ""
 "Bron: %(source)s\n"
 "Probleem: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Afbeeldingsnaam kon niet goed aangemaakt worden. Controlleer of er voldoende "
-"afbeeldingsmetadata aanwezig is."
+"%(filetype)s bestandsnaam kon niet correct aangemaakt worden. Controller of "
+"er voldoende metadata is."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -290,7 +347,8 @@ msgstr ""
 "Doel: %(destination)s\n"
 "Probleem: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -299,21 +357,21 @@ msgstr ""
 "Bron: %(source)s\n"
 "Doel: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Unieke identifier '%s' toegevoegd"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Bron: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Download kopieer fout"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -324,87 +382,105 @@ msgstr ""
 "Doel: %(destination)s\n"
 "Fout: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "De afbeelding werd niet gekopieerd"
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr "De %(filetype)s werd niet gekopiëerd"
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"Afbeeldingen gevonden met identieke bestandsnamen, maar op verschillend "
-"tijdstip genomen"
+"Foto's met dezelfde naam ontdekt, maar gemaakt op verschillende tijden:"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Eerste afbeelding: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Tweede afbeelding: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"Eerste foto: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Tweede foto: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Kon afbeelding niet openen"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr "Kon %(filetype)s niet openen"
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Bron: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "Afbeelding heeft geen metadata"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr "%(filetype)s heeft geen metadata"
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Metadata is essentieel om submappen / afbeeldingsnamen aan te maken.\n"
+"Metadata is essentieel om subfolder en.of bestandsnamen aan te maken.\n"
 "Bron: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Submapnaam kon niet goed aangemaakt worden. Controlleer of er voldoende "
-"afbeeldingsmetadata aanwezig is."
+"Subfolder naam kon niet correct aangemaakt worden. Ga na of er voldoende "
+"metadata is."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
-"Submap: %(subfolder)s\n"
-"Afbeelding: %(image)s\n"
+"Subfolder: %(subfolder)s\n"
+"Bestand: %(file)s\n"
 "Probleem: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Nieuwe dag begonnen - volgnummer 'Downloads Vandaag' aan het terugzetten"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Backup afbeelding bestaat al"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Backup van %(file_type)s bestaat reeds"
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Backup van %(file_type)s overschreven"
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr "%(file_type)s niet gebackuped op %(volume)s"
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s niet gebackuped"
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Backup fout"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Doelmap kon niet aangemaakt worden: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -413,12 +489,17 @@ msgstr ""
 "Bron: %(source)s\n"
 "Doel: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Fout: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr "De %(file_type)s werd niet gebackuped"
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -429,278 +510,342 @@ msgstr ""
 "Doel: %(destination)s\n"
 "Fout: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr "%(file_type)s kon niet gebackuped worden"
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr "Geen geldig backup volume gevonden"
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr "Een backup locatie werd niet gevonden"
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Het apparaat kan nu veilig verwijderd worden"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s afbeeldingen gedownload"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s gedownload"
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s afbeeldingen overgeslaan"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr "%(noFiles)s %(filetypes)s overgeslagen"
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "verwittigingen"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "fouten"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Backup apparaat afwezig"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Geen backup apparaat gevonden."
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Dit apparaat bevat geen afbeeldingen die gedownload kunnen worden."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Download begonnen vanaf %s"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr "Foto icoontje kon niet opgehaald worden"
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Bron: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Afbeeldingsapparaat: %s\n"
+msgid "Device: %s\n"
+msgstr "Apparaat: %s\n"
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Doel: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Kon de tijdelijke downloadfolder niet aanmaken"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Fout:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Afbeelding overgeslaan"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr "Dit apparaat heeft geen %(types_searched_for)s om te downloaden"
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Afbeelding overschreven"
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Download begonnen vanaf %s"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "Afbeelding bestaat reeds"
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr "Backup pad bestaat niet"
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "Afbeelding heeft geen miniatuur"
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr "Het pad %s kon niet aangemaakt worden"
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr "Backups kunnen niet plaatsgrijpen"
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Backup apparaat afwezig"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr "Er werd geen backup apparaat automatisch ontdekt"
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr "Foto"
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr "Foto overgeslagen"
+
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr "Foto bestaat reeds"
+
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr "Video"
+
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr "Video overgeslagen"
+
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr "Video bestaat reeds"
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s van %(total)s afbeeldingen gekopieerd"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s van %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Kon afbeelding niet verwijderen van afbeeldingsapparaat"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr "Kon foto of video niet verwijderen van apparaat"
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Afbeelding: %(source)s\n"
+"Foto: %(source)s\n"
 "Fout: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Afbeelding: %(source)s"
+msgid "Photo: %(source)s"
+msgstr "Foto: %(source)s"
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "%i afbeeldingen van afbeeldingsapparaat verwijderd"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr "Verwijderde %(number)i %(filetypes)s van apparaat"
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Download van %s afgelopen"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Apparaat"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Grootte"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Downloadvoortgang"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Miniatuur kan niet getoond worden"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Het kan corrupt zijn"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Apparaat gedetecteerd"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
-"Moet dit apparaat of deze partitie gebruikt worden om afbeeldingen van te "
-"downloaden?"
+"Moet dit apparaat of deze partitie gebruikt worden om foto's of video's van "
+"te halen?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Herinner deze keuze"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s aangeduid om gedownload te worden van"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr ""
 "Dit apparaat of deze partitie zal altijd gebruikt worden om van te downloaden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s afgewezen als download apparaat"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr ""
 "Dit apparaat of deze partitie zal nooit gebruikt worden om van te downloaden"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Verwijder alle Job Codes?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Moeten alle Job Codes verwijderd worden?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Geef een Job Code op"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Geef een nieuwe job code op, of kies een vorige."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Geef een nieuwe job code."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Job Code:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Job Code ingevoerd"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Job Code niet ingevoerd"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Sorry, deze afbeeldingsplaats bestaat niet:\n"
+"Sorry, deze apparaat locatie bestaat niet:\n"
 "%(path)s\n"
 "\n"
-"Los het probleem op, of verander je voorkeuren."
+"Los het probleem op, of pas de voorkeuren aan."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Probleem met de Afbeeldingsplaats Map"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr "Probleem met de Apparaat Locatie Map"
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
-msgstr ""
-"Sorry, de Download map bestaat niet. Maak de map aan, of verander je "
-"voorkeuren"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr "De %(file_type)s Download Map bestaat niet\n"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgstr "De %(file_type)s Download Map bestaat maar is niet beschrijfbaar.\n"
+
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Sorry, de Download Map bestaat maar is niet beschrijfbaar. Controlleer de "
-"schrijfrechten van de map, of pas je voorkeuren aan"
+"Sorry, er waren problemen met je download mappen. Los deze problemen op of "
+"pas de voorkeuren aan.\n"
+"\n"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Probleem met de Download Map"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr "Prbleem met de Download Mappen"
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Sommige voorkeuren worden gereset"
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Vragen om %s te gebruiken"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Vragen naar de Job Code"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Reeds bezig met vragen naar Job Code, vraag niet opnieuw"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Downloads beginnen die op een Job Code aan het wachten waren"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Downloaden aanvangen"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr "Foto download map %(folder)s wordt aangemaakt"
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr "Kon de standaard foto download map %(folder)s niet aanmaken"
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr "Video download map %(folder)s wordt aangemaakt"
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr "Kon de standaard video download map %(folder)s niet aanmaken"
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -709,7 +854,7 @@ msgstr ""
 "opgestart.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -717,15 +862,15 @@ msgstr ""
 "Programma voorkeuren blijken OK te zijn, maar controleer toch even op "
 "correcte werking van het programma"
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Sorry, bepaalde voorkeuren zijn ongeldig en worden gereset."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -733,11 +878,11 @@ msgstr ""
 "Deze versie van het programma is recenter dan de vorige. De voorkeuren "
 "worden overlopen."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Voorkeuren werden aangepast."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -749,11 +894,11 @@ msgstr ""
 "\n"
 "Gelieve deze te controleren om een goede werking te garanderen."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Er dienen geen voorkeuren aangepast te worden."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -763,117 +908,130 @@ msgstr ""
 "Bepaalde van je vorige voorkeuren zijn ongeldig en kunnen niet aangepast "
 "worden. Ze worden naar standaard waarden teruggebracht."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Probleem met het gebruik van pynotify."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Kon de pynotify server mogelijkheden niet ontvangen."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Opgelet: de desktop environment notification server is verkeerd ingesteld."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "en"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Backup apparaten aan het gebruiken"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Backup apparaat aan het gebruiken"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Geen backup apparaat gedetecteerd"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Apparaat %(device)s (%(path)s) wordt genegeerd"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Detecteerde %(device)s met als pad %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Automatisch opstarten download is waar"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Automatisch opstarten download is onwaar"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Manueel ingegeven pad aan het gebruiken"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr "Backuppen naar %(path)s"
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Alle downloads zijn afgelopen"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Ongeveer 1 seconde te gaan"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Ongeveer %i seconden te gaan"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Ongeveer 1 minuut te gaan"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Ongeveer %(minutes)i:%(seconds)02i minuten te gaan"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "afbeeldingen gedownload"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr "foto's gedownload"
+
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr "foto's overgeslagen"
+
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr "video's gedownload"
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "afbeeldingen overgeslaan"
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr "video's overgeslagen"
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Download "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Pauze"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Voorkeuren werden aangepast."
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Tot later"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -882,338 +1040,388 @@ msgstr ""
 "vertoon programma informatie op de commando lijn wanneer het programma "
 "draait (standaard: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "alleen fouten naar de commandolijn sturen"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
-"toon een lijst van bestandextenties welke het programma herkent en keer terug"
+"vertoon de foto en video bestandsextenties welke het programma herkent en "
+"verlaat het programma"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr "reset alle programma instellingen en verlaat het programma"
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr "Foto's:"
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr "Video's:"
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "en %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr "Alle instellingen en voorkeuren werden gereset"
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Gebruik makend van"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s is al draaiende"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Datum/tijd"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Reeksen"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Afbeeldingsgegevens"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr "Video datum"
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Vandaag"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Naam + extentie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Naam"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Extentie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Afbeelding nummer"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr "Video nummer"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Diafragma"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Belichtingstijd"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Brandpuntsafstand"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Camera merk"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Camera model"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Camera model (kort)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Camera model (kort na koppelteken)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Sluiter teller"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Naam eigenaar"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr "Codec"
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr "Breedte"
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr "Hoogte"
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr "Lengte"
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr "Frames per seconde"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Downloads vandaag"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Sessienummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Nummer Submap"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Opgeslagen nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Vervolg letter"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Alle cijfers"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Laatste cijfer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Laatste 2 cijfers"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Laatste 3 cijfers"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Laatste 4 cijfers"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Oorspronkelijke hoofdletterstatus"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "HOOFDLETTERS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "kleine letters"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Eén cijfer"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Twee cijfers"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Drie cijfers"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Vier cijfers"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Vijf cijfers"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Zes cijfers"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Zeven cijfers"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Subseconden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "JJJJMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "JJJJ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "JJMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "JJ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "MMDDJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "MMDDJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "DDMMJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "DDMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM (minuten)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1222,54 +1430,65 @@ msgstr ""
 "Voorkeurtoets '%(key)s' is ongeldig.\n"
 "Eén van %(value)s werd verwacht"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Voorkeurwaarde '%(value)s' is ongeldig"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Deze voorkeuren zijn niet goed opgesteld:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Subsecond metadata niet aanwezig in de afbeelding"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr "Subsecond metadata ontbreekt in de foto"
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "%s metadata is niet aanwezig in de afbeelding"
+msgid "%s metadata is not present"
+msgstr "%s metadata ontbreekt"
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Fout in datum/tijd component. Waarde %s blijkt ongeldig"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
-msgstr "Uitbreiding was gespecifieerd, maar afbeeldingsnaam heeft er geen"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
+msgstr "extentie werd opgegeven maar de bestandsnaam heeft geen extentie"
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
 msgstr ""
-"afbeeldingsnummer was gespecifieerd, maar de bestandsnaam heeft er geen"
+"beeld- of videonummer werd opgegeven maar de bestandsnaam heeft geen nummer"
+
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr "%s metadata ontbreekt in de foto"
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "fout bij het aanmaken van de naam met component %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr "%s metadata ontbreekt in de video"
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Submap voorkeuren mogen niet starten met een %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Submap voorkeuren mogen niet eindigen op een %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Submap voorkeuren mogen geen twee opeenvolgende %s bevatten"
@@ -1299,36 +1518,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Compatibiliteit met andere besturingssystemen</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr "<b>Apparaten</b>"
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Download Map</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Download Submappen</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Voorbeeld</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Afbeeldings Apparaten</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Afbeeldingsnaam conflicteert</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Job Codes</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Afbeelding Hernoemen</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Ontbrekende Backup Apparaten</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Job Codes</b>"
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Foto Hernoemen</b>"
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Ontbrekende Backup Apparaten</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Foto- en Videonaam conflict</b>"
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1343,8 +1562,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Photos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Voorbeeld: /home/user/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Voorbeeld: /home/user/Afbeeldingen</i>"
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1367,66 +1586,70 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">DownloadMap</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Apparaten</span>"
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Foutverwerking</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Afbeeldings Apparaten</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Afbeelding Hernoemen</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Photo Download Mappen</span>"
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Foto Hernoemen</span>\t"
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Hernoemingsopties</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Video Download Mappen</span>"
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Video Hernoemen</span>\t"
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Unieke identifier toevoegen"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Automatisch detecteren van Draagbare Opslagmedia"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Automatisch detecteren van backup apparaten"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Automatisch detecteren van afbeeldingsapparaten"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr "Automatisch apparaten ontdekken"
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatisering"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Backup"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Backupmap naam:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Backup locatie:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Foto's backuppen gedurende download"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr "Backup foto's en video's gedurende het downloaden"
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1434,66 +1657,100 @@ msgstr ""
 "Kies de downloadmap. Submappen voor de gedownloadde foto's zullen "
 "automatisch aangemaakt worden in deze map volgens de structuur hieronder."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Kies tussen het overslaan van de download van de afbeelding, of er een "
-"unieke identifier aan toe te kennen."
+"Kies de download map. Submappen voor de gedownloadde video's zullen "
+"automatisch aangemaakt worden in deze map conform de onderstaande structuur."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:42
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+"Kies tussen het overslaan van het downloaden van het bestand, of er een "
+"uniek nummer aan toe te kennen."
+
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Aanvang dag:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Verwijder de afbeeldingen van het apparaat na de download"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr ""
+"Verwijder foto's en video's van het apparaat als de download afgelopen is"
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr "Apparaten"
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+"Apparaten zijn dat van waar foto's en video's gedownload worden, zoals "
+"camera's, geheugenkaarten of Draagbare Opslagapparaten..\n"
+"\n"
+"Je kan foto's van meerdere apparaten simultaan downloaden, of je kunt een "
+"plaats op je harde schijf aanduiden.\n"
+"\n"
+"<i>Indien het rechtstreeks downloaden van je camera maar povertjes of zelfs "
+"helemaal niet gaat, probeer dan eens de instelling naar PTP mode te zetten. "
+"Als dat niet kan, zoek dan je heil in een kaartlezer..</i>"
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Download / Pauze"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Download Map"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Download map:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Downloads vandaag:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Foutafhandeling"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Foutenlog"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Verlaat programma na het beëindigen van een gelukte download"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
+"Verlaat het programma als de download zonder verwittigingen noch fouten "
+"beëindigd wordt."
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Als je de automatische herkenning uitschakelt, kies de juiste backup plaats."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Als je de automatische herkenning uitschakelt, kies de juiste plaats voor de "
-"afbeeldingen."
+"Als je de automatische detectie afzet, kies dan de juiste plaats van de "
+"beelden en video's."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1503,63 +1760,47 @@ msgstr ""
 "het volledig apparaat gescanned worden op afbeeldingen. Bij grote apparaten, "
 "kan dat een tijd duren."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Negeren"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Afbeeldingsapparaat"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Afbeelding Hernoemen"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Afbeeldingsapparaten zijn apparaten waar we foto's van kunnen downloaden "
-"zoals camera's, geheugenkaarten en draagbare opslagmedia.\n"
-"\n"
-"Je kunt foto's van meerdere afbeeldingsapparaten simultaan downloaden.\n"
-"\n"
-"<i>Indien het rechtstreeks downloaden vanaf je camera slecht of helemaal "
-"niet werkt, probeer het via de PTP mode. Als dat niet mogelijk is overweeg "
-"een kaartlezer te gebruiken.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Afbeeldingsplaats:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Importeer je afbeeldingen efficiënt en betrouwbaar"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Job Codes"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr "Locatie:"
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Overschrijven"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr "Foto Mappen"
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr "Foto Hernoemen"
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr "Foto backup foldernaam:"
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Voorkeuren: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "V_erwijder alles"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1590,41 +1831,49 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
 "USA."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Hernoemingsopties"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Rapporteer een verwittiging"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Rapporteer een fout"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Overslaan"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Download overslaan"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+"Sorry, de video download functie is afgezet. Om video's te downloaden moet "
+"je het <i>kaa metadata</i> pakket voor python binnenhalen"
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Specifieer de map waar de backups opgeslagen zijn op het apparaat.  \n"
+"Duid de map aan waar de backups bewaard zijn op dat apparaat.  \n"
 "\n"
-"<i>Nota: dit zal ook gebruikt worden om na te gaan of het apparaat al dan "
-"niet voor backups gebruikt wordt.  Voor ieder apparaat dat je als backup "
-"medium wenst te gebruiken, dien je een map aan te maken met deze naam.</i>"
+"<i>Noot: dit zal ook gebruikt worden om na te gaan of het apparaat al dan "
+"niet voor backups gebruikt wordt. Voor ieder apparaat dat je als backup "
+"wenst te gebruiken, maak er een map in met één van de volgende namen.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1632,111 +1881,149 @@ msgstr ""
 "Specifieer de tijd in 24-uurs formaat waar het <i>Downloads vandaag</i> "
 "volgnummer aan gelijk gezet moet worden.."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Specifieer wat er dient te gebeuren indien een afbeelding met dezelfde naam "
-"reeds gedownload of gebackupped was."
+"Duid aan wat te doen als er een foto of video met dezelfde naam reeds "
+"gedownload of gebackuped werd."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr ""
 "Specifieer wat er dient te gebeuren indien er geen backup apparaten zijn."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Specifieer of tekens dienen verwijderd te worden van een afbeeldings- of "
-"mapnaam  die niet door andere besturingssystemen toegestaan zijn."
+"Duid aan of foto-, video- en  mapnamen tekens die niet toegelaten zijn bij "
+"andere besturingssystemen dien verwijderd te worden."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Start de download tijdens het opstarten van het programma"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Start de download zodra het afbeeldingsapparaat aangekoppeld wordt"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr "Start de download zodra het apparaat wordt aangekoppeld"
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Opgeslagen nummer:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Verwijder niet-compatibele karakters"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchroniseer RAW + JPEG volgnummers"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Ontkoppel (\"verwijder\") het afbeeldingsapparaat na de download"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Ontkoppen (\"eject\") apparaat na beëindigen van de download"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr "Video Mappen"
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr "Video Hernoemen"
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr "Video backup foldernaam:"
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"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 afbeelding met dezelfde naam op het "
-"backupapparaat te overschrijven of over te slaan."
+"Kies om het bestand op het backupapparaat met dezelfde naam te "
+"overschrijven, of over te slaan, gedurende de backup."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Je kan je foto's op meerdere plaatsen backuppen tijdens het downloaden, bv. "
-"externe harde schijven."
+"Je kan je foto's en video's naar meerdere lokaties backuppen terwijl ze "
+"gedownload worden, bv. externe harde schijven."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Toevoegen…"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Verwijder Afgewerkte Downloads"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Fouten log"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Online Help..."
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Help"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Doe een gift..."
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Foto's"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Rapporteer een probleem..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Miniaturen"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Vertaal deze Toepassing"
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Weergave"
 
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Duid een map aan om afbeeldingen naar toe te backuppen"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 van %s afbeeldingen gekopieerd"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Apparaat scan afgelopen: %(number)s afbeeldingen gevonden op %(device)s"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Apparaat scan afgelopen: geen afbeeldingen gevonden op %s"
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Afbeeldingsnaam kon niet aangemaakt worden"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Afbeeldingsnaam kon niet goed aangemaakt worden. Controlleer of er voldoende "
+#~ "afbeeldingsmetadata aanwezig is."
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -1747,6 +2034,18 @@ msgstr "_Weergave"
 #~ "Doel: %(destination)s\n"
 #~ "Probleem: %(problem)s"
 
+#~ msgid "Could not open image"
+#~ msgstr "Kon afbeelding niet openen"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "Afbeelding heeft geen metadata"
+
+#~ msgid "The image was not copied."
+#~ msgstr "De afbeelding werd niet gekopieerd"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Backup afbeelding bestaat al"
+
 #, python-format
 #~ msgid ""
 #~ "Destination directory could not be created\n"
@@ -1757,5 +2056,321 @@ msgstr "_Weergave"
 #~ "%(directory)s\n"
 #~ "Fout: %(errno)s %(strerror)s"
 
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s afbeeldingen gedownload"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s afbeeldingen overgeslaan"
+
+#~ msgid "Image skipped"
+#~ msgstr "Afbeelding overgeslaan"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Afbeelding overschreven"
+
+#~ msgid "Image already exists"
+#~ msgstr "Afbeelding bestaat reeds"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "Afbeelding heeft geen miniatuur"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s van %(total)s afbeeldingen gekopieerd"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Kon afbeelding niet verwijderen van afbeeldingsapparaat"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Afbeelding: %(source)s\n"
+#~ "Fout: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Afbeelding: %(source)s"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Miniatuur kan niet getoond worden"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr "Uitbreiding was gespecifieerd, maar afbeeldingsnaam heeft er geen"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Afbeelding Hernoemen</b>"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Afbeeldings Apparaten</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Voorbeeld: /home/user/photos</i>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Afbeelding Hernoemen</span>\t"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Verwijder de afbeeldingen van het apparaat na de download"
+
+#~ msgid "Image Devices"
+#~ msgstr "Afbeeldingsapparaat"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Verlaat programma na het beëindigen van een gelukte download"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Als je de automatische herkenning uitschakelt, kies de juiste plaats voor de "
+#~ "afbeeldingen."
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Importeer je afbeeldingen efficiënt en betrouwbaar"
+
+#~ msgid "Image location:"
+#~ msgstr "Afbeeldingsplaats:"
+
+#~ msgid "Image Rename"
+#~ msgstr "Afbeelding Hernoemen"
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Specifieer wat er dient te gebeuren indien een afbeelding met dezelfde naam "
+#~ "reeds gedownload of gebackupped was."
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Ontkoppel (\"verwijder\") het afbeeldingsapparaat na de download"
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Je kan je foto's op meerdere plaatsen backuppen tijdens het downloaden, bv. "
+#~ "externe harde schijven."
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Start de download zodra het afbeeldingsapparaat aangekoppeld wordt"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Kies tussen het overslaan van de download van de afbeelding, of er een "
+#~ "unieke identifier aan toe te kennen."
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Afbeeldingsapparaten zijn apparaten waar we foto's van kunnen downloaden "
+#~ "zoals camera's, geheugenkaarten en draagbare opslagmedia.\n"
+#~ "\n"
+#~ "Je kunt foto's van meerdere afbeeldingsapparaten simultaan downloaden.\n"
+#~ "\n"
+#~ "<i>Indien het rechtstreeks downloaden vanaf je camera slecht of helemaal "
+#~ "niet werkt, probeer het via de PTP mode. Als dat niet mogelijk is overweeg "
+#~ "een kaartlezer te gebruiken.</i>"
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Kies tijdens het backuppen om een afbeelding met dezelfde naam op het "
+#~ "backupapparaat te overschrijven of over te slaan."
+
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Fout in Afbeelding Hernoemen  voorkeuren"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Fout in Download Submap voorkeuren"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Duid een afbeeldingsmap aan"
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "De ingevulde submapvoorkeuren zijn ongeldig en kunnen niet gebruikt worden.\n"
+#~ "Ze zullen naar de standaard waardes worden teruggezet."
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Bij de submap voorkeuren werden enkele overbodige waardes verwijderd."
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Opgepast:</b> Er is onvoldoende afbeeldingsmetadata om een volledige "
+#~ "naam aan te maken. Gelieve andere hernoemingsopties te gebruiken.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Opgepast:</b> Er is onvoldoende afbeeldingsmetadata om een submap aan "
+#~ "te maken. Gelieve andere submap benoemingsopties te gebruiken.</i>"
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Metadata is essentieel om submappen / afbeeldingsnamen aan te maken.\n"
+#~ "Bron: %s"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Submapnaam kon niet goed aangemaakt worden. Controlleer of er voldoende "
+#~ "afbeeldingsmetadata aanwezig is."
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Submap: %(subfolder)s\n"
+#~ "Afbeelding: %(image)s\n"
+#~ "Probleem: %(problem)s"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Geen backup apparaat gevonden."
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Dit apparaat bevat geen afbeeldingen die gedownload kunnen worden."
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "%i afbeeldingen van afbeeldingsapparaat verwijderd"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr ""
+#~ "Moet dit apparaat of deze partitie gebruikt worden om afbeeldingen van te "
+#~ "downloaden?"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr ""
+#~ "toon een lijst van bestandextenties welke het programma herkent en keer terug"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Subsecond metadata niet aanwezig in de afbeelding"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "%s metadata is niet aanwezig in de afbeelding"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr ""
+#~ "afbeeldingsnummer was gespecifieerd, maar de bestandsnaam heeft er geen"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Afbeeldingsnaam conflicteert</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">DownloadMap</span>"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Foto's backuppen gedurende download"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Automatisch detecteren van afbeeldingsapparaten"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Backupmap naam:"
+
+#~ msgid "Download Folder"
+#~ msgstr "Download Map"
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Specifieer de map waar de backups opgeslagen zijn op het apparaat.  \n"
+#~ "\n"
+#~ "<i>Nota: dit zal ook gebruikt worden om na te gaan of het apparaat al dan "
+#~ "niet voor backups gebruikt wordt.  Voor ieder apparaat dat je als backup "
+#~ "medium wenst te gebruiken, dien je een map aan te maken met deze naam.</i>"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Specifieer of tekens dienen verwijderd te worden van een afbeeldings- of "
+#~ "mapnaam  die niet door andere besturingssystemen toegestaan zijn."
+
+#~ msgid "images skipped"
+#~ msgstr "afbeeldingen overgeslaan"
+
+#~ msgid "images downloaded"
+#~ msgstr "afbeeldingen gedownload"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Afbeeldings Apparaten</span>"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Afbeeldingen gevonden met identieke bestandsnamen, maar op verschillend "
+#~ "tijdstip genomen"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Eerste afbeelding: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Tweede afbeelding: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Afbeeldingsapparaat: %s\n"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Sorry, deze afbeeldingsplaats bestaat niet:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Los het probleem op, of verander je voorkeuren."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Sorry, de Download Map bestaat maar is niet beschrijfbaar. Controlleer de "
+#~ "schrijfrechten van de map, of pas je voorkeuren aan"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Sorry, de Download map bestaat niet. Maak de map aan, of verander je "
+#~ "voorkeuren"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Probleem met de Afbeeldingsplaats Map"
diff --git a/po/pl.po b/po/pl.po
index aa7c64f..d6e0680 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,217 +7,274 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 11:23+0000\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-29 19:29+0000\n"
 "Last-Translator: mmiicc <mpredotka@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-30 14:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "Nowy Jork"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Paryż"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapeszt"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Rzym"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moskwa"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Warszawa"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Dżakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madryt"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Sztokholm"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Nieprawidłowa wartość Pobierań dzisiaj.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Resetowanie wartości do zera.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Wartość preferencji \"Początek dnia\" jest uszkodzona.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Resetowanie do północy.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
 msgstr "Błąd w preferencjach zmiany nazw obrazów"
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Przepraszamy, te preferencje zawierają błąd:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Resetowanie do wartości domyślnych."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Kod pracy"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Błąd w preferencjach podkatalogu pobierania"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr "Błąd w preferencjach zmiany nazw filmów"
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Błąd w preferencjach podkatalogów pobierania zdjęć"
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Błąd w preferencjach podkatalogów pobierania filmów"
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr "zdjęcia i filmy"
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "zdjęcia"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Wybór katalogu dla pobieranych zdjęć"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Wybór katalogu obrazów"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr "Wybór katalogu dla pobieranych filmów"
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Wybór katalogu do utworzenia kopii zapasowej"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Wybór katalogu zawierającego %(file_types)s"
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr "Wybór katalogu do którego będą kopiowane %(file_types)s"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<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 obrazu są niewystarczające do pełnego "
-"wygenerowania nazwy. Proszę użyć innych 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>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<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 obrazu 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>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Przykład: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "Wartość \"Pobierań dzisiaj\" nie została zaktualizowana, ponieważ właśnie "
 "trwa pobieranie"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
 "Wartość \"Numer zachowany\" nie została zaktualizowana, ponieważ właśnie "
 "trwa pobieranie"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Pewne niepotrzebne wartości zostały usunięte z preferencji podkatalogu."
+"Pewne niepotrzebne wartości zostały usunięte z preferencji podkatalogu "
+"%(filetype)s."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"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 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."
 
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "zdjęcie"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "film"
+
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "dyskzewnętrzny1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "dyskzewnętrzny2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "zdjęcia lub filmy"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "filmy"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "wyszukiwanie..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr "Następująca ścieżka pobierania nie mogła zostać utworzona:\n"
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr "%(path)s: "
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Pobieranie nie może się odbyć"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Błąd w preferencjach programu."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -226,43 +283,42 @@ msgstr ""
 "Proszę sprawdzić preferencje, uruchomić program ponownie i spróbować jeszcze "
 "raz."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Pobieranie nie może się odbyć"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "skopiowano 0 z %s obrazów"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr "0 z %(number)s plików typu %(filetypes)s"
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Wyszukiwanie zakończone: w katalogu %(device)s znaleziono obrazów %(number)s"
+"Wyszukiwanie zakończone: w katalogu %(device)s znaleziono %(number)s plików "
+"typu %(filetypes)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Wyszukiwanie zakończone: nie znaleziono obrazów w katalogu %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
+"Wyszukiwanie zakończone: nie znaleziono plików typu %(filetypes)s w katalogu "
+"%(device)s"
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Nazwa pliku obrazu nie mogła zostać wygenerowana"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr "Nazwa pliku %(filetype)s nie mogła zostać wygenerowana"
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -271,15 +327,16 @@ msgstr ""
 "Źródło: %(source)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Nazwa pliku obrazu nie mogła zostać prawidłowo wygenerowana. Proszę "
-"sprawdzić, czy metadane obrazu są wystarczające."
+"Nazwa pliku %(filetype)s nie mogła zostać prawidłowo wygenerowana. Proszę "
+"sprawdzić, czy metadane są wystarczające."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -292,7 +349,8 @@ msgstr ""
 "Cel: %(destination)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -301,21 +359,21 @@ msgstr ""
 "Źródło: %(source)s\n"
 "Cel: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Dodano unikatowy identyfikator \"%s\""
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Źródło: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Błąd pobierania"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -326,87 +384,105 @@ msgstr ""
 "Cel: %(destination)s\n"
 "Błąd: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "Obraz nie został skopiowany."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr "%(filetype)s nie został skopiowany."
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"Znalezione zdjęcia, które mają taką samą nazwę, ale zostały zrobione w "
-"różnym czasie:"
+"Znalezione zdjęcia mające taką samą nazwę, ale zrobione w różnym czasie:"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
 "Pierwsze zdjęcie: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
 "Drugie zdjęcie: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Nie można otworzyć obrazu"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr "%(filetype)s nie mógł zostać otwarty"
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Źródło: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "Obraz nie posiada metadanych"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr "%(filetype)s nie posiada metadanych"
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Metadane są niezbędne aby wygenerować nazw podkatalogów / obrazów.\n"
-"Źródło: %s"
+"Metadane są niezbędne aby wygenerować nazwy podkatalogów oraz/lub plików.\n"
+"Źródło:%s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
 "Nazwa podkatalogu nie mogła zostać prawidłowo wygenerowana. Proszę "
-"sprawdzić, czy metadane obrazu są wystarczające."
+"sprawdzić, czy metadane są wystarczające."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
 "Podkatalog: %(subfolder)s\n"
-"Obraz: %(image)s\n"
+"Plik: %(file)s\n"
 "Problem: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Rozpoczął się nowy dzień - resetowanie numeru sekwencji \"Pobierań dzisiaj\""
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Kopia zapasowa obrazu już istnieje"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Kopia zapasowa %(file_type)s już istnieje"
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Kopia zapasowa %(file_type)s nadpisana"
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr "%(file_type)s nie został skopiowany do %(volume)s"
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "Kopia zapasowa %(file_type)s nie utworzona"
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Błąd tworzenia kopii zapasowej"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Katalog docelowy nie mógł zostać utworzony:  %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -415,12 +491,17 @@ msgstr ""
 "Źródło: %(source)s\n"
 "Cel: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Błąd: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr "Kopia zapasowa %(file_type)s nie została utworzona."
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -431,274 +512,343 @@ msgstr ""
 "Cel: %(destination)s\n"
 "Błąd: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr "Kopia zapasowa %(file_type)s nie mogła zostać utworzona"
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr "Nie znaleziono odpowiedniego nośnika dla kopii zapasowych"
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr "Nie znaleziono położenia kopii zapasowej"
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Teraz można bezpiecznie usunąć urządzenie"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "obrazów pobranych: %s"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(filetypes)s pobrane: %(noFiles)s"
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "obrazów pominiętych: %s"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr "%(filetypes)s pominięte: %(noFiles)s"
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "ostrzeżenia"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "błędy"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Brak urządzenia do zapisu kopii zapasowej"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Nie wykryto urządzenia na którym można utworzyć kopię zapasową"
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Ten nośnik nie zawiera obrazów, które można pobrać."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Rozpoczęto pobieranie z %s"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr "Nie udało się wyodrębnić miniatur zdjęć"
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Źródło: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Nośnik obrazów: %s\n"
+msgid "Device: %s\n"
+msgstr "Urządzenie: %s\n"
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Cel: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Nie można utworzyć tymczasowego katalogu pobierania"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Błąd:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Obraz pominięto"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr ""
+"Urządzenie nie posiada %(types_searched_for)s z których można pobierać."
+
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Rozpoczęto pobieranie z %s"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr "Ścieżka kopii zapasowej nie istnieje"
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr "NIe można utworzyć ścieżki %s"
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr "Kopia zapasowa nie może być utworzona"
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Brak urządzenia do zapisu kopii zapasowej"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr "Nie wykryto urządzenia do utworzenia kopii zapasowej"
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr "Zdjęcie"
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr "Zdjęcie pominięto"
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Obraz nadpisano"
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr "Zdjęcie już istnieje"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "Obraz już istnieje"
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr "Film"
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "Obraz nie posiada miniatury"
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr "Film pominięto"
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr "FIlm już istnieje"
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "Skopiowano %(number)s z %(total)s obrazów"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s z %(total)s plików typu %(filetypes)s"
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Nie można usunąć obrazów z urządzenia"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr "Nie można usunąć zdjęcia lub filmu z urządzenia"
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Obraz: %(source)s\n"
+"Zdjęcie: %(source)s\n"
 "Błąd: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Obraz: %(source)s"
+msgid "Photo: %(source)s"
+msgstr "Zdjęcie: %(source)s"
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "Usunięto %i obrazów z urządzenia"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr "Usuniętych plików typu %(filetypes)s z urządzenia: %(number)i"
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Ukończono pobieranie z %s"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Urządzenie"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Rozmiar"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Postęp pobierania"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Nie można wyświetlić miniatury"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Może być uszkodzone"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Znalezione urządzenie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
-msgstr "Pobierać obrazy z tego urządzenia lub partycji?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr "Pobierać zdjęcia lub filmy z tego urządzenia lub partycji?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "Zapa_miętaj ten wybór"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "jako źródło pobierania wybrano %s"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr ""
 "To urządzenie lub partycja zawsze będzie używane jako źródło pobierania"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "urządzenie %s odrzucone jako źródło pobierania"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr ""
 "To urządzenie lub partycja nigdy nie będzie używane jako źródło pobierania"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Usunąć wszystkie kody pracy?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Usunąć wszystkie kody pracy?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Wprowadzenie kodu pracy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Proszę wprowadzić nowy kod pracy lub wybrać poprzedni."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Proszę wprowadzić nowy kod pracy."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Kod pracy:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Kod pracy wprowadzony"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Nie wprowadzono kodu pracy"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Przepraszamy, takie położenie obrazu nie istnieje:\n"
+"Przepraszamy, to położenie urządzenia nie istnieje:\n"
 "%(path)s"
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Problem z katalogiem położenia obrazów"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr "Problem z katalogiem położenia urządzenia"
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr "Katalog pobierania %(file_type)s nie istnieje.\n"
+
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
 msgstr ""
-"Przepraszamy, katalog pobierania nie istnieje. Proszę utworzyć katalog lub "
-"zmienić preferencje"
+"Katalog pobierania %(file_type)s istnieje ale nie ma możliwości zapisu w "
+"nim.\n"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Przepraszamy, katalog pobierania istnieje, ale nie można nic w nim zapisać. "
-"Proszę sprawdzić uprawnienia katalogu lub zmienić preferencje"
+"Przepraszamy, wystąpiły problemy z katalogami pobierania. Prosimy je "
+"rozwiązać lub zmienić preferencje.\n"
+"\n"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Problem z katalogiem pobierania"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr "Problem z katalogami pobierania"
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Niektóre preferencje zostaną zresetowane."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Zapytanie o użycie %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Zapytanie o kod pracy"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Już pytano o kod pracy, nie zapytuj ponownie"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Rozpoczynanie pobierania oczekującego na kod pracy"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Rozpoczynanie pobierania"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr "Tworzenie katalogu pobierania zdjęć %(folder)s"
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+"Nie udało się utworzyć domyślnego katalogu pobierania zdjęć %(folder)s"
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr "Tworzenie katalogu pobierania filmów %(folder)s"
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+"Nie udało się utworzyć domyślnego katalogu pobierania filmów %(folder)s"
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -706,7 +856,7 @@ msgstr ""
 "Nowsza wersja tego programu była poprzednio uruchomiona na tym komputerze.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -714,16 +864,16 @@ msgstr ""
 "Preferencje programu wydają się być właściwe, proszę jednak sprawdzić, czy "
 "zapewniają prawidłowe działanie."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Przepraszamy, niektóre preferencje są nieprawidłowe i zostaną zresetowane."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Ostrzeżenie:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -731,11 +881,11 @@ msgstr ""
 "Ta wersja programu jest nowsza od uruchomionej poprzednio. Sprawdzanie "
 "preferencji."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Preferencje zostały zmodyfikowane."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -747,11 +897,11 @@ msgstr ""
 "\n"
 "Proszę je sprawdzić, czy zapewniają prawidłowe działanie."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Żadne preferencje nie muszą zostać zmienione."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -761,118 +911,131 @@ msgstr ""
 "poprzednich preferencji były nieprawidłowe i nie mogły zostać "
 "zaktualizowane. Zostaną one zresetowane."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Problem z użyciem pynotify."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Pobranie właściwości serwera pynotify nieudane."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Ostrzeżenie: serwer powiadomień środowiska graficznego jest skonfigurowany "
 "niepoprawnie."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "oraz"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Użycie urządzeń do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Użycie urządzenia do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Nie wykryto urządzeń na których można utworzyć kopię zapasową"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Urzadzenie %(device)s (%(path)s) zignorowane"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Wykryto %(device)s ze ścieżką %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Automatyczne rozpoczęcie pobierania jest włączone"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Automatyczne rozpoczęcie pobierania jest wyłączone"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Użycie ręcznie wprowadzonej ścieżki"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr "Tworzenie kopii zapasowej w %(path)s"
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Ukończono wszystkie pobierania"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Pozostała około sekunda"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Pozostało około %i sekund"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Pozostała około minuta"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Pozostało około %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "obrazów pobranych"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr "zdjęcia pobrane"
+
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr "zdjęcia pominięte"
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "obrazów pominiętych"
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr "filmy pobrane"
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr "filmy pominięte"
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Pobierz "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "W_strzymaj"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Preferencje zostały zmienione."
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Do zobaczenia"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -881,337 +1044,386 @@ msgstr ""
 "wyświetl informacje programu w linii komend podczas działania programu "
 "(domyślnie: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "wyświetlaj jedynie błędy w linii komend"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "wypisz typy plików rozpoznawane przez program i zakończ"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr "zresetuj wszystkie ustawienia oraz preferencje programu i zakończ"
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr "Zdjęcia:"
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr "Filmy:"
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "oraz %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr "Wszystkie ustawienia oraz preferencje zostały zresetowane"
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Użycie"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s jest już uruchomiony"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Data czas"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metadane"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Sekwencje"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Data zdjęcia"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr "Data filmu"
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Nazwa + rozszerzenie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Nazwa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Rozszerzenie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Numer obrazu"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr "Numer filmu"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Przysłona"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Czas naświetlania"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Ogniskowa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Producent aparatu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Model aparatu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Skrót modelu aparatu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Skrót z myślnikiem modelu aparatu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Numer seryjny"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Licznik migawki"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Nazwa właściciela"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr "Kodek"
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr "Szerokość"
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr "Wysokość"
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr "Długość"
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr "Klatki na sekundę"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Pobierań dzisiaj"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Numer sesji"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Numer podkatalogu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Numer zachowany"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Litera sekwencji"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Wszystkie cyfry"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Ostatnia cyfra"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Ostatnie 2 cyfry"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Ostatnie 3 cyfry"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Ostatnie 4 cyfry"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Oryginalna wielkość liter"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "WIELKIE LITERY"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "małe litery"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Jedna cyfra"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Dwie cyfry"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Trzy cyfry"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Cztery cyfry"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Pięć cyfr"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Sześć cyfr"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Siedem cyfr"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Części sekundy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "RRRR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "RR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "GGMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "GGMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "GG-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "GG-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "GG"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM (minuty)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1220,55 +1432,68 @@ msgstr ""
 "Klucz preferencji \"%(key)s\" jest nieprawidłowy.\n"
 "Oczekiwano %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Wartość preferencji \"%(value)s\" jest nieprawidłowa"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Następujące preferencje nie są dobrze sformułowane:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
 msgstr "Obraz nie zawiera metadanych części sekundy"
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "Obraz nie zawiera metadanych %s"
+msgid "%s metadata is not present"
+msgstr "Brak metadanych %s"
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Błąd w składniku data czas. Nieprawidłowa wartość %s"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
 msgstr ""
-"rozszerzenie zostało określone ale obraz nie posiada żadnego rozszerzenia"
+"rozszerzenie zostało określone ale nazwa pliku nie posiada żadnego "
+"rozszerzenia"
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
 msgstr ""
-"numer obrazu został określony ale nazwa pliku nie posiada żadnego numeru"
+"numer obrazu lub filmu został określony ale nazwa pliku nie posiada żadnego "
+"numeru"
+
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr "Zdjęcie nie zawiera metadanych %s"
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "błąd przy tworzeniu nazwy ze składową %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr "Film nie zawiera metadanych %s"
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferencje podkatalogu nie powinny zaczynać się od %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferencje podkatalogu nie powinny kończyć się na %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1299,36 +1524,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Zgodność z innymi systemami operacyjnymi</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr "<b>Urządzenia</b>"
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Katalog pobierania</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Podkatalogi pobierania</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Przykład</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Nośniki obrazów</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Konflikty nazw obrazów</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Kody pracy</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Zmiana nazw obrazów</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Brak urządzeń do zapisu kopii zapasowej</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Kody pracy</b>"
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Zmiana nazw zdjęć</b>"
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Brak urządzeń do zapisu kopii zapasowej</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Konflikty między nazwami zdjęć i filmów</b>"
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1343,8 +1568,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/dyskzewnętrzny/Photos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Przykład: /home/user/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Przykład: /home/użytkownik/Obrazy</i>"
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1367,67 +1592,73 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Kopia zapasowa</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Katalog pobierania</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Urządzenia</span>"
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Obsługa błędów</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Nośniki obrazów</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Kody pracy</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Zmiana nazw obrazów</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Katalogi pobierania zdjęć</span>"
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Kody pracy</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Zmiana nazw zdjęć</span>\t"
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Opcje zmiany nazw</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Katalogi pobierania filmów</span>"
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Zmiana nazw filmów</span>\t"
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Dodaj unikatowy identyfikator"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Automatycznie wykryj przenośne magazyny danych"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr ""
 "Automatycznie wykryj urządzenia na których można utworzyć kopię zapasową"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Automatycznie wykryj nośniki obrazów"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr "Automatycznie wykryj urządzenia"
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatyzacja"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Kopia zapasowa"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Nazwa katalogu z kopią zapasową:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Położenie kopii zapasowej:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Utwórz kopię zapasową podczas pobierania zdjęć"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr "Utwórz kopię zapasową zdjęć i filmów podczas pobierania"
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1435,67 +1666,98 @@ msgstr ""
 "Proszę wybrać katalog pobierania. Podkatalogi dla pobranych zdjęć zostaną w "
 "nim automatycznie utworzone w oparciu o poniższą specyfikację."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
+msgid ""
+"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ę."
+
+#: rapid/glade3/rapid.glade.h:42
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
-"Proszę wybrać czy pominąć pobieranie obrazu, czy dodać unikatowy "
+"Proszę wybrać czy pominąć pobieranie pliku, czy dodać unikatowy "
 "identyfikator."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Początek dnia:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Usuń obrazy z urządzenia po ukończeniu pobierania"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr "Usuń zdjęcia i filmy z urządzenia po ukończeniu pobierania"
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr "Urządzenia"
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+"Nośniki obrazów to urządzenia z których można pobrać zdjęcia i filmy, takie "
+"jak aparaty fotograficzne, karty pamięci czy przenośne magazyny danych.\n"
+"Zdjęcia mogą być pobierane jednocześnie z kilku nośników obrazów, lub z "
+"określonego położenia na dysku.\n"
+"<i>Jeżeli pobieranie bezpośrednio z aparatu fotograficznego działa "
+"nieprawidłowo lub wcale, proszę spróbować przestawić go do trybu PTP. Jeśli "
+"jest to niemożliwe, proszę rozważyć użycie czytnika kart pamięci.</i>"
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Pobierz / Wstrzymaj"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Katalog pobierania"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Katalog pobierania:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Pobierań dzisiaj:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Obsługa błędów"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Dziennik błędów"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Zakończ działanie programu po udanym ukończeniu pobierania"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
+"Zakończ działanie programu, jeśli pobieranie zostanie ukończone bez błędów "
+"czy ostrzeżeń"
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "W przypadku wyłączenia wykrywania automatycznego, proszę określić dokładne "
 "położenie kopii zapasowej."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
 "W przypadku wyłączenia wykrywania automatycznego, proszę wybrać dokładne "
-"położenie obrazów."
+"położenie obrazów i filmów."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1505,63 +1767,47 @@ msgstr ""
 "obrazy będą wyszukiwane na całym nośniku. W przypadku nośników o dużych "
 "pojemnościach, może to chwilę potrwać."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Nośniki obrazów"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Zmiana nazw obrazów"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Nośniki obrazów to urządzenia z których można pobrać zdjęcia, takie jak "
-"aparaty fotograficzne, karty pamięci czy przenośne magazyny danych,\n"
-"\n"
-"Zdjęcia mogą być pobierane jednocześnie z kilku nośników obrazów.\n"
-"\n"
-"<i>Jeżeli pobieranie bezpośrednio z aparatu fotograficznego działa "
-"nieprawidłowo lub wcale, proszę spróbować przestawić go na tryb PTP. Jeśli "
-"jest to niemożliwe, proszę rozważyć użycie czytnika kart pamięci.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Położenie obrazów:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Importuj obrazy wydajnie i niezawodnie"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Kody pracy"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr "Położenie:"
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Nadpisz"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr "Katalogi zdjęć"
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr "Zmiana nazw zdjęć"
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr "Nazwa katalogu z kopią zapasową zdjęć:"
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Preferencje: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "U_suń wszystko"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1593,33 +1839,42 @@ msgstr ""
 " proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, Fifth "
 "Floor, Boston, MA 02110-130159 USA"
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Opcje zmiany nazw"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Zgłoś ostrzeżenie"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Zgłoś błąd"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Pomiń"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Pomiń pobieranie"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+"Przepraszamy, funkcja pobierania filmów jest nieaktywna. Prosimy "
+"zainstalować pakiet <i>kaa metadata</i>, aby mieć możliwość pobierania "
+"filmów."
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"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"
@@ -1629,7 +1884,7 @@ msgstr ""
 "podanej nazwie dla każdego urządzenia, które będzie używane do zapisu kopii "
 "zapasowych.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1637,115 +1892,236 @@ msgstr ""
 "Proszę określić czas, w formacie 24-godzinnym, w którym numer sekwencji "
 "<i>Pobierań dzisiaj</i> powinien zostać zresetowany."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Proszę określić zachowanie w przypadku, kiedy obraz o tej samej nazwie "
-"został już pobrany lub posiada kopię zapasową."
+"Proszę określić zachowanie w przypadku, kiedy obraz lub film o tej samej "
+"nazwie został już pobrany lub posiada kopię zapasową."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr ""
 "Proszę określić zachowanie w przypadku braku urządzeń na których można "
 "utworzyć kopię zapasową."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
 "Proszę określić czy znaki, które są niedozwolone przez inne systemy "
 "operacyjne, powinny zostać usunięte z nazw obrazów i katalogów."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Rozpocznij pobieranie przy uruchomieniu programu"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Rozpocznij pobieranie po podłączeniu nośnika zdjęć"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr "Rozpocznij pobieranie po podłączeniu urządzenia"
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Numer zachowany:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Usuń niezgodne znaki"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchronizuj numery sekwencji RAW + JPEG"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Odmontuj (\"wysuń\") nośnik zdjęć po ukończeniu pobierania"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Odmontuj (\"wysuń\") urządzenie po ukończeniu pobierania"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr "Katalogi filmów"
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr "Zmiana nazw filmów"
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr "Nazwa katalogu z kopią zapasową filmów:"
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 "Proszę wybrać, czy podczas tworzenia kopii zapasowej nadpisać, czy pominąć "
-"obraz o tej samej nazwie na urządzeniu docelowym."
+"plik o tej samej nazwie na urządzeniu docelowym."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Możliwe jest utworzenie wielu kopii zapasowych dla pobieranych zdjęć, np. na "
-"zewnętrznych dyskach twardych."
+"Możliwe jest utworzenie wielu kopii zapasowych dla pobieranych zdjęć i "
+"filmów, np. na zewnętrznych dyskach twardych."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Dodaj..."
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "Wyczyść _ukończone pobierania"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Dziennik błędów"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "Z_najdź pomoc w sieci..."
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Darowizna"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Zdjęcia"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "Zgłoś _błąd w programie..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Miniatury"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Przetłumacz ten program..."
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Widok"
 
+#~ msgid "Download Folder"
+#~ msgstr "Katalog pobierania"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Katalog pobierania</span>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Przykład: /home/user/photos</i>"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Nazwa katalogu z kopią zapasową:"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
 
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Konflikty nazw obrazów</b>"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Proszę wybrać czy pominąć pobieranie obrazu, czy dodać unikatowy "
+#~ "identyfikator."
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Rozpocznij pobieranie po podłączeniu nośnika zdjęć"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Zakończ działanie programu po udanym ukończeniu pobierania"
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Odmontuj (\"wysuń\") nośnik zdjęć po ukończeniu pobierania"
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Możliwe jest utworzenie wielu kopii zapasowych dla pobieranych zdjęć, np. na "
+#~ "zewnętrznych dyskach twardych."
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Utwórz kopię zapasową podczas pobierania zdjęć"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Zmiana nazw obrazów</span>\t"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Nośniki obrazów</span>"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Nośniki obrazów</b>"
+
+#~ msgid "Image Devices"
+#~ msgstr "Nośniki obrazów"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Automatycznie wykryj nośniki obrazów"
+
+#~ msgid "Image location:"
+#~ msgstr "Położenie obrazów:"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Wybór katalogu obrazów"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Wybór katalogu do utworzenia kopii zapasowej"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "skopiowano 0 z %s obrazów"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Zmiana nazw obrazów</b>"
+
+#~ msgid "Image Rename"
+#~ msgstr "Zmiana nazw obrazów"
+
+#~ msgid "Could not open image"
+#~ msgstr "Nie można otworzyć obrazu"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "Obraz nie posiada metadanych"
+
+#~ msgid "The image was not copied."
+#~ msgstr "Obraz nie został skopiowany."
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "obrazów pominiętych: %s"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "obrazów pobranych: %s"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Nie można wyświetlić miniatury"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "Obraz nie posiada miniatury"
+
+#~ msgid "Image skipped"
+#~ msgstr "Obraz pominięto"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Obraz nadpisano"
+
+#~ msgid "Image already exists"
+#~ msgstr "Obraz już istnieje"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Błąd w preferencjach podkatalogu pobierania"
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -1758,6 +2134,56 @@ msgstr "_Widok"
 
 #, python-format
 #~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Podkatalog: %(subfolder)s\n"
+#~ "Obraz: %(image)s\n"
+#~ "Problem: %(problem)s"
+
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Błąd w preferencjach zmiany nazw obrazów"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Wyszukiwanie zakończone: w katalogu %(device)s znaleziono obrazów %(number)s"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Wyszukiwanie zakończone: nie znaleziono obrazów w katalogu %s"
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Nazwa pliku obrazu nie mogła zostać wygenerowana"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Nazwa pliku obrazu nie mogła zostać prawidłowo wygenerowana. Proszę "
+#~ "sprawdzić, czy metadane obrazu są wystarczające."
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Metadane są niezbędne aby wygenerować nazw podkatalogów / obrazów.\n"
+#~ "Źródło: %s"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Nazwa podkatalogu nie mogła zostać prawidłowo wygenerowana. Proszę "
+#~ "sprawdzić, czy metadane obrazu są wystarczające."
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Kopia zapasowa obrazu już istnieje"
+
+#, python-format
+#~ msgid ""
 #~ "Destination directory could not be created\n"
 #~ "%(directory)s\n"
 #~ "Error: %(errno)s %(strerror)s"
@@ -1765,3 +2191,198 @@ msgstr "_Widok"
 #~ "Nie można utworzyć katalogu docelowego\n"
 #~ "%(directory)s\n"
 #~ "Błąd: %(errno)s %(strerror)s"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Nie wykryto urządzenia na którym można utworzyć kopię zapasową"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Ten nośnik nie zawiera obrazów, które można pobrać."
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "Skopiowano %(number)s z %(total)s obrazów"
+
+#~ msgid "images downloaded"
+#~ msgstr "obrazów pobranych"
+
+#~ msgid "images skipped"
+#~ msgstr "obrazów pominiętych"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr "wypisz typy plików rozpoznawane przez program i zakończ"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Obraz nie zawiera metadanych części sekundy"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "Obraz nie zawiera metadanych %s"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr ""
+#~ "rozszerzenie zostało określone ale obraz nie posiada żadnego rozszerzenia"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr ""
+#~ "numer obrazu został określony ale nazwa pliku nie posiada żadnego numeru"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "W przypadku wyłączenia wykrywania automatycznego, proszę wybrać dokładne "
+#~ "położenie obrazów."
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Importuj obrazy wydajnie i niezawodnie"
+
+#~ 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 this name.</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>"
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Proszę określić zachowanie w przypadku, kiedy obraz o tej samej nazwie "
+#~ "został już pobrany lub posiada kopię zapasową."
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Proszę określić czy znaki, które są niedozwolone przez inne systemy "
+#~ "operacyjne, powinny zostać usunięte z nazw obrazów i katalogów."
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Proszę wybrać, czy podczas tworzenia kopii zapasowej nadpisać, czy pominąć "
+#~ "obraz o tej samej nazwie na urządzeniu docelowym."
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Wprowadzone preferencje podkatalogu są nieprawidłowe i nie mogą zostać "
+#~ "użyte.\n"
+#~ "Zostaną przywrócone ich domyślne wartości."
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Pewne niepotrzebne wartości zostały usunięte z preferencji podkatalogu."
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Nośniki obrazów to urządzenia z których można pobrać zdjęcia, takie jak "
+#~ "aparaty fotograficzne, karty pamięci czy przenośne magazyny danych,\n"
+#~ "\n"
+#~ "Zdjęcia mogą być pobierane jednocześnie z kilku nośników obrazów.\n"
+#~ "\n"
+#~ "<i>Jeżeli pobieranie bezpośrednio z aparatu fotograficznego działa "
+#~ "nieprawidłowo lub wcale, proszę spróbować przestawić go na tryb PTP. Jeśli "
+#~ "jest to niemożliwe, proszę rozważyć użycie czytnika kart pamięci.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Ostrzeżenie:</b> Metadane obrazu są niewystarczające do pełnego "
+#~ "wygenerowania nazwy. Proszę użyć innych opcji zmiany nazwy.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Ostrzeżenie:</b> Metadane obrazu są niewystarczające do pełnego "
+#~ "wygenerowania podkatalogów. Proszę użyć innej opcji określenia nazw "
+#~ "podkatalogów</i>"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr "Pobierać obrazy z tego urządzenia lub partycji?"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Obraz: %(source)s"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Obraz: %(source)s\n"
+#~ "Błąd: %(errno)s %(strerror)s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Nie można usunąć obrazów z urządzenia"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "Usunięto %i obrazów z urządzenia"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Usuń obrazy z urządzenia po ukończeniu pobierania"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Znalezione zdjęcia, które mają taką samą nazwę, ale zostały zrobione w "
+#~ "różnym czasie:"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Pierwsze zdjęcie: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Drugie zdjęcie: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Przepraszamy, takie położenie obrazu nie istnieje:\n"
+#~ "%(path)s"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Przepraszamy, katalog pobierania istnieje, ale nie można nic w nim zapisać. "
+#~ "Proszę sprawdzić uprawnienia katalogu lub zmienić preferencje"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Przepraszamy, katalog pobierania nie istnieje. Proszę utworzyć katalog lub "
+#~ "zmienić preferencje"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Problem z katalogiem położenia obrazów"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Nośnik obrazów: %s\n"
diff --git a/po/rapid-photo-downloader.pot b/po/rapid-photo-downloader.pot
index 4115b9b..a61b954 100644
--- a/po/rapid-photo-downloader.pot
+++ b/po/rapid-photo-downloader.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,246 +17,300 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr ""
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr ""
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr ""
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr ""
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr ""
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr ""
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr ""
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr ""
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr ""
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr ""
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr ""
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr ""
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr ""
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr ""
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr ""
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr ""
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr ""
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr ""
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr ""
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr ""
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr ""
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr ""
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr ""
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr ""
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr ""
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr ""
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr ""
+
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
 msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
 
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr ""
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr ""
+
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr ""
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr ""
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr ""
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr ""
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr ""
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr ""
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr ""
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr ""
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
 msgstr ""
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr ""
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
+msgid "0 of %(number)s %(filetypes)s"
 msgstr ""
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
 msgstr ""
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
 msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Problem: %(problem)s"
 msgstr ""
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -265,28 +319,29 @@ msgid ""
 "Problem: %(problem)s"
 msgstr ""
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr ""
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr ""
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -294,86 +349,110 @@ msgid ""
 "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
 msgstr ""
 
-#: rapid/rapid.py:1548
-msgid "Images detected with the same filenames, but taken at different times:"
+#: rapid/rapid.py:1889
+msgid "Photos detected with the same filenames, but taken at different times:"
 msgstr ""
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
 msgstr ""
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr ""
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
 msgstr ""
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr ""
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
 msgstr ""
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr ""
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s\n"
 msgstr ""
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr ""
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -381,294 +460,359 @@ msgid ""
 "Error: %(errno)s %(strerror)s"
 msgstr ""
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr ""
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr ""
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr ""
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr ""
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
+msgid "%(noFiles)s %(filetypes)s skipped"
 msgstr ""
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr ""
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
 msgstr ""
 
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
+#: rapid/rapid.py:2358
+#, python-format
+msgid "Source: %s\n"
 msgstr ""
 
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
+#: rapid/rapid.py:2360
+#, python-format
+msgid "Device: %s\n"
 msgstr ""
 
-#: rapid/rapid.py:1926
+#: rapid/rapid.py:2361
 #, python-format
-msgid "Download has started from %s"
+msgid "Destination: %s"
 msgstr ""
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
+msgid "Could not create temporary download directory"
+msgstr ""
+
+#: rapid/rapid.py:2365
+msgid "Error:"
+msgstr ""
+
+#: rapid/rapid.py:2382
 #, python-format
-msgid "Source: %s\n"
+msgid "This device has no %(types_searched_for)s to download from."
 msgstr ""
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2417
 #, python-format
-msgid "Image device: %s\n"
+msgid "Download has started from %s"
+msgstr ""
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
 msgstr ""
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2435
 #, python-format
-msgid "Destination: %s"
+msgid "The path %s could not be created"
 msgstr ""
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
-msgid "Could not create temporary download directory"
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
 msgstr ""
 
-#: rapid/rapid.py:1981
-msgid "Error:"
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr ""
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr ""
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
 msgstr ""
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
 msgstr ""
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
+#: rapid/rapid.py:2543
+msgid "Video skipped"
 msgstr ""
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr ""
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
+msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
 msgstr ""
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
+msgid "Photo: %(source)s"
 msgstr ""
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
+msgid "Deleted %(number)i %(filetypes)s from device"
 msgstr ""
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr ""
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr ""
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr ""
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr ""
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr ""
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr ""
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr ""
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr ""
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr ""
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr ""
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr ""
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
 msgstr ""
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr ""
+
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
 msgstr ""
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr ""
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr ""
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr ""
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr ""
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr ""
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr ""
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr ""
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr ""
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
 msgstr ""
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr ""
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr ""
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr ""
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -676,517 +820,590 @@ msgid ""
 "Please check them to ensure correct operation."
 msgstr ""
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr ""
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
 "They will be reset."
 msgstr ""
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr ""
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr ""
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr ""
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr ""
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr ""
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr ""
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr ""
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr ""
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr ""
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr ""
+
+#: rapid/rapid.py:4021
+msgid "photos skipped"
 msgstr ""
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr ""
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
 msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr ""
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr ""
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr ""
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr ""
+
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr ""
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr ""
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr ""
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr ""
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr ""
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr ""
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr ""
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
 "Expected one of %(value)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
+msgid "%s metadata is not present"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1216,35 +1433,35 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:7
-msgid "<b>Download Folder</b>"
+msgid "<b>Devices</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:8
-msgid "<b>Download Subfolders</b>"
+msgid "<b>Download Folder</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:9
-msgid "<b>Example</b>"
+msgid "<b>Download Subfolders</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
+msgid "<b>Example</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
+msgid "<b>Job Codes</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
+msgid "<b>Missing Backup Devices</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
+msgid "<b>Photo Rename</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:15
@@ -1260,7 +1477,7 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:19
@@ -1284,7 +1501,7 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:25
@@ -1292,15 +1509,15 @@ msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:29
@@ -1308,142 +1525,146 @@ msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:30
-msgid "Add unique identifier"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:31
-msgid "Automatically detect Portable Storage Devices"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:32
-msgid "Automatically detect backup devices"
+msgid "Add unique identifier"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
+msgid "Automatically detect Portable Storage Devices"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:34
-msgid "Automation"
+msgid "Automatically detect backup devices"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:35
-msgid "Backup"
+msgid "Automatically detect devices"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
+msgid "Automation"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
+msgid "Backup"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
+msgid "Backup location:"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:39
-msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
+msgid "Backup photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:40
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:42
-msgid "Day start:"
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
+msgid "Copyright Damon Lynch 2007-10"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:44
-msgid "Download / Pause"
+msgid "Day start:"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
+msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:46
-msgid "Download folder:"
+msgid "Devices"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:52
+msgid "Download / Pause"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:53
+msgid "Download folder:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
 "time."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
+msgid "Import your photos and videos efficiently and reliably"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
+msgid "Job Codes"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:64
-msgid "Job Codes"
+msgid "Location:"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:65
@@ -1451,14 +1672,26 @@ msgid "Overwrite"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:66
-msgid "Preferences: Rapid Photo Downloader"
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:69
+msgid "Preferences: Rapid Photo Downloader"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1475,133 +1708,151 @@ msgid ""
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index cfaad5f..ccb1dee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,216 +7,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 07:44+0000\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-30 10:18+0000\n"
 "Last-Translator: Sergey Sedov <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-30 14:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "Нью-Йорк"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Манила"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Прага"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Хельсинки"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Веллингтон"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Тегеран"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Кампала"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Париж"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Берлин"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Сидней"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Будапешт"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Рим"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Москва"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Дели"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Варшава"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Джакарта"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Мадрид"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Стокгольм"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
-msgstr "Неверное значение 'Скачиваний сегодня'.\n"
+msgstr "Неверное значение 'Загрузок сегодня'.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Сбросить значение до нуля.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Значение 'Начало дня' повреждено.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Сброс настроек в полночь.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Ошибка в параметрах настройки переименования фотографий"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr "Ошибка в параметрах Переименования фотографий"
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Извините, эти параметры содержат ошибку:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Восстановить настройки по умолчанию."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Метка"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Ошибка в параметрах настройки подкаталогов для хранения фотографий"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr "Ошибка в параметрах Переименования видеороликов"
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr "фотографии и видеоролики"
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "фотографии"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
-msgstr "Выберите каталог для хранения фотографий"
+msgstr "Выберите каталог для загрузки фотографий"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Выберите каталог с фотографиями"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr "Выберите каталог для загрузки видеороликов"
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Выберите каталог для хранения резервных копий фотографий"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Выберите каталог, содержащий %(file_types)s"
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Внимание:</b> Не хватает метаданных для генерирования названия "
-"фотографии. Пожалуйста, измените настройки переименования фотографий.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Внимание:</b> Не хватает метаданных для генерирования названия "
-"подкаталогов. Пожалуйста, измените настройки переименования подкаталогов "
-"(см. параметр Каталог хранения).</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Пример: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
-"Значение \"скачивание сегодня\" не обновлено, так как сейчас осуществляется "
-"закачка"
+"Значение \"Загрузок сегодня\" не обновлено, так как загрузка идёт прямо "
+"сейчас"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr ""
-"Значение сохранение под номером не обновлено, так как сейчас осуществляется "
-"закачка"
+"Значение `Cохранение под номером` не обновлено, так как прямо сейчас идёт "
+"загрузка"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Параметры подкаталогов, имеющих некоторые ненужные значения, были удалены."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Введённые параметры подкаталога неправильны и не могут быть использованы.\n"
-"Они будут сброшены до значений принятых по умолчанию."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "фотография"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "видеоролик"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
-msgstr "внешний диск 1"
+msgstr "внешнийдиск1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
-msgstr "внешний диск 2"
+msgstr "внешнийдиск2"
+
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "фотографии или видеоролики"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "видеоролики"
 
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "сканирование..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr ""
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr "%(path)s: "
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Невозможно загрузить"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Обнаружена ошибка в параметрах программы."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -224,43 +273,41 @@ msgstr ""
 "\n"
 "Пожалуйста, проверьте параметры, перезапустите программу и попробуйте снова."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Невозможно осуществить скачивание"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 из %s фотографий скачано"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr "0 из %(number)s %(filetypes)s"
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Сканирование носителя завершено: найдено %(number)s фотографий на %(device)s"
+"Сканирование носителя завершено, найдено: %(number)s %(filetypes)s на "
+"%(device)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Сканирование носителя %s завершено: фотографий не найдено"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
+"Сканирование носителя завершено: %(filetypes)s не найдено на %(device)s"
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Не смог сгенерировать название фотографии"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -269,15 +316,14 @@ msgstr ""
 "Источник: %(source)s\n"
 "Проблема: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Название фотографии не получилось сгенерировать должным образом. Проверьте "
-"достаточно ли метаданных."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -290,7 +336,8 @@ msgstr ""
 "Получатель: %(destination)s\n"
 "Проблема: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -299,21 +346,21 @@ msgstr ""
 "Источник: %(source)s\n"
 "Получатель: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
-msgstr "Добавлен уникальный идентификатор '%s'"
+msgstr "Добавлена уникальная метка '%s'"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Источник: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
-msgstr "Ошибка при закачке файлов"
+msgstr "Ошибка при загрузке файлов"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -324,89 +371,102 @@ msgstr ""
 "Получатель: %(destination)s\n"
 "Ошибка: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "Фотография не закачана."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr ""
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
+"Photos detected with the same filenames, but taken at different times:"
 msgstr ""
-"Обнаружены изображения с одними и теми же названиями, но принятыми в разное "
-"время:"
+"Обнаружены фотографии с одинаковыми названиями, но сделанные в разное время:"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Первое изображение: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Второе изображение: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"Первая фотография: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Вторая фотография: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Не смог открыть фотографию"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr "Невозможно открыть %(filetype)s"
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Источник: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "Фотография не содержит метаданных"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr "%(filetype)s не имеет метаданных"
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Метаданные необходимы  для генерирования названий подкаталогов / "
-"фотографий.\n"
-"Источник: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Название подкаталога не получилось сгенерировать должным образом. Проверьте "
-"достаточно ли метаданных."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
 "Подкаталог: %(subfolder)s\n"
-"Фотография: %(image)s\n"
+"Файл: %(file)s\n"
 "Проблема: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
-"Начался новый день - сброшена последовательность номеров параметра "
-"'Скачиваний сегодня'"
+"Начался новый день - сброшена последовательность номеров параметра 'Загрузок "
+"сегодня'"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Носитель для резервного копирования фотографий уже существует"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Резервная копия %(file_type)s уже существует"
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr ""
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Ошибка резервного копирования"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Каталог получателя не может быть создан: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -415,12 +475,17 @@ msgstr ""
 "Источник: %(source)s\n"
 "Получатель: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Ошибка: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr "The %(file_type)s не был скопирован в резервную копию"
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -431,278 +496,333 @@ msgstr ""
 "Получатель: %(destination)s\n"
 "Ошибка: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr ""
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr "Не найдено подходящего носителя для создания резервных копий"
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr "Не найден носитель для создания резервной копии"
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Теперь можно безопасно отсоединить носитель"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s фотографий скачано"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr ""
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "%s фотографий пропущено"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr "%(noFiles)s %(filetypes)s пропущен"
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "предупреждения"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "ошибки"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Пропущен носитель для резервного копирования"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Устройство для хранения резервных копий не обнаружено."
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "На этом устройстве не обнаружены фотографии, которые можно скачать."
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Начато скачивание с %s"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr ""
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Источник: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Носитель изображений: %s\n"
+msgid "Device: %s\n"
+msgstr "Носитель: %s\n"
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Получатель: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
-msgstr "Не удалось создать временный каталог для закачки"
+msgstr "Не удалось создать временный каталог для загрузки"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr ""
+
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Начата загрузка с %s"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr ""
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr ""
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr ""
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Пропущен носитель для резервного копирования"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr ""
+"Не удалось автоматически обнаружить носитель для резервного копирования"
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr "Фотография"
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
 msgstr "Фотография пропущена"
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Фотография перезаписана"
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr "Такая фотография уже существует"
+
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr "Видеоролик"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "Фотография уже существует"
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr "Видеоролик пропущен"
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "У фотографии нет предпросмотра"
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr "Такой видеоролик уже существует"
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s из %(total)s фотографий скачано"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s из %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Не удалось удалить изображение с устройства хранения"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr "Не удалось удалить фотографию или видеоролик с носителя"
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Изображение: %(source)s\n"
+"Фотография: %(source)s\n"
 "Ошибка: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Изображение: %(source)s"
+msgid "Photo: %(source)s"
+msgstr "Фотография: %(source)s"
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "Удалены %i изображений с устройства хранения"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr ""
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
-msgstr "Скачивание с %s завершено"
+msgstr "Загрузка с %s завершена"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Носитель"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Размер"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
-msgstr "Скачано"
-
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Предпросмотр фотографии не может быть выполнен"
+msgstr "Ход загрузки"
 
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Возможно он повреждён"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Обнаружен носитель"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
-"Использовать ли этот носитель или диск как место, с которого скачиваются "
-"фотографии?"
+"Следует ли загрузить фотографии или видеоролики с этого носителя или раздела?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Запомнить мой выбор"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
-msgstr "%s выбран для закачки"
+msgstr "%s выбран для загрузки"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
-msgstr ""
-"Этот носитель или раздел всегда будет использован для скачивания фотографий"
+msgstr "Этот носитель или раздел всегда будет использован для загрузки"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
-msgstr "%s не выбран для закачки"
+msgstr "%s не выбран для загрузки"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
-msgstr ""
-"Этот носитель или раздел никогда не будет использован для скачивания "
-"фотографий"
+msgstr "Этот носитель или раздел никогда не будет использован для загрузки"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Удалить все метки?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Вы действительно хотите удалить все метки?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Введите метку"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Введите новую метку или выберите предыдущую."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Введите новую метку."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Метка:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Метка введена"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Метка не введена"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Извините, этот путь для хранения изображений не существует:\n"
-"%(path)s\n"
-"Пожалуйста, решите эту проблему или измените настройки"
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Проблема с каталогом для закачки фотографий"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr ""
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr ""
+
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
 msgstr ""
-"Извините, каталог для закачки не существует. Пожалуйста, создайте каталог "
-"или измените свои настройки"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Извините, каталог для закачки существует, но он защищен от записи. "
-"Пожалуйста, проверьте права на каталог или измените свои настройки"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
-msgstr "Проблема с каталогом для закачки"
+msgstr "Проблема с каталогом для загрузки"
+
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr "Проблема с каталогами для загрузки"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Некоторые параметры будут сброшены."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
-msgstr "Использовать ли %s"
+msgstr "Напоминать ли об использовании %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Напоминание о вводе метки"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Уже уведомлён о метках, не напоминать снова"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
-msgstr "Начало закачек, которые ожидали ввода метки"
+msgstr "Начинаются загрузки, которые ожидали ввода метки"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
-msgstr "Начало закачек"
+msgstr "Начинаются загрузки"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr "Не удалось создать каталог для загрузки фотографий %(folder)s"
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr "Создание каталога для загрузки видеороликов %(folder)s"
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr "Не удалось создать каталог для загрузки видеороликов %(folder)s"
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -710,7 +830,7 @@ msgstr ""
 "На этом компьютере ранее запускалась более новая версия программы.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -718,26 +838,26 @@ msgstr ""
 "Параметры программы кажется корректны, но, пожалуйста, проверьте их, чтобы "
 "быть уверенными в правильности."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Извините, некоторые параметры были неправильными и будут сброшены."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Предупреждение:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
-"Эта версия программы новее чем запущенная ранее. Проверьте параметры."
+"Эта версия программы новее, чем запущенная ранее. Проверьте параметры."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Параметры были изменены"
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -749,11 +869,11 @@ msgstr ""
 "\n"
 "Пожалуйста, проверьте их, чтобы быть уверенными, что всё прошло правильно."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Отсутствуют параметры, которые необходимо было бы изменить."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -762,118 +882,131 @@ msgstr ""
 "Эта версия программы использует несколько другие параметры, чем предыдущая. "
 "Некоторые из ваших параметров были не верными. Они будут сброшены."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Проблема при использовании pynotify."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Не удалось получить возможности сервера pynotify."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr ""
 "Внимание: сервер уведомлений вашего рабочего окружения не настроен "
 "надлежащим образом."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "и"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Использование носителя для резервного копирования"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Использование носителя для резервного копирования"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Не обнаружено носителей для создания резервных копий"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Носитель %(device)s (%(path)s) проигнорирован"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Обнаружено %(device)s с путём %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
-msgstr "Автоматически начинать скачивание - да"
+msgstr "Автоматически начинать загрузку - да"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
-msgstr "Автоматически начинать скачивание - нет"
+msgstr "Автоматически начинать загрузку - нет"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Использовать путь, который указан вручную"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr "Резервное копирование в  %(path)s"
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
-msgstr "Все скачивания завершены"
+msgstr "Все загрузки завершены"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "МБ/с"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Осталась примерно 1 секунда"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Осталось %i  секунд"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Осталась примерно 1 минута"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Осталось примерно %(minutes)i:%(seconds)02i"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "фотографий скачано"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr "фотографий загружено"
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
+#: rapid/rapid.py:4021
+msgid "photos skipped"
 msgstr "фотографий пропущено"
 
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr "видеороликов загружено"
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr "видеороликов пропущено"
+
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
-msgstr "_Скачать "
+msgstr "_Загрузить "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Пауза"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Параметры были изменены"
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "До свидания"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -882,338 +1015,386 @@ msgstr ""
 "отобразить информацию о программе в командной строке при запуске программы "
 "(по умолчанию: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "выводить в командную строку только ошибки"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
-"вывести расширения файла фотографии, которые распознала программа и выйти"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr "сброс всех параметров настройки и выход"
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr "Фотографии:"
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr "Видеоролики:"
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "и %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr "Все настройки и параметры были сброшены"
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Использование"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s уже запущено"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Дата и время"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Текст"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Название файла"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Последовательности"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Дата фотографии"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr "Дата видеоролика"
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Сегодня"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Имя + расширение"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
-msgstr "Имя"
+msgstr "Название"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Расширение"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Номер фотографии"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr "Номер видеоролика"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Диафрагма"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Время выдержки"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Фокусное расстояние"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Производитель камеры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Модель камеры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Сокращённое название камеры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Расширенное название камеры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Серийный номер"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Счётчик кадров"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Имя владельца"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr "Кодек"
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr "Ширина"
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr "Высота"
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr "Длительность"
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr "Кадров в секунду"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Скачиваний сегодня"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Номер сессии"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Номер подкаталога"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Сохранение под номером"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Последовательность символов"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Все цифры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Последняя цифра"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Последние 2 цифры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Последние 3 цифры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Последние 4 цифры"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Исходный Регистр"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "ВЕРХНИЙ РЕГИСТР"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "нижний регистр"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Одна цифра"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Две цифры"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Три цифры"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Четыре цифры"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Пять цифр"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Шесть цифр"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "семь цифр"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Подсекунды"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "ГГГГММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "ГГГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "ГГММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "ГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "ММДДГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "ММДДГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "ММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "ДДММГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "ДДММГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "ГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "ММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "ЧЧММСС"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "ЧЧММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "ЧЧ-ММ-СС"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "ЧЧ-ММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "ЧЧ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "ММ (мин.)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "СС"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1222,53 +1403,64 @@ msgstr ""
 "Неверен ключ параметров '%(key)s'.\n"
 "Ожидался один из %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Неверное значение параметра '%(value)s'"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Эти параметры не очень хорошо подобраны:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Метаданные подсекунд не представлены в фотографии"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "%s метаданные не представлены в фотографии"
+msgid "%s metadata is not present"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Ошибка в компоненте даты и времени. Значение %s неверно."
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
-msgstr "расширение было указано, но фотографий не имеет расширения"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
-msgstr "номер фотографии был указано, но фотография не имеет номер"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "ошибка генерирования названия компонентом %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr "%s нет метаданных в видеоролике"
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Параметры подкаталога не должны начинаться с %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Параметры подкаталога не должны заканчиваться с %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Параметры подкаталога не должны содержать две %s одну за другой"
@@ -1298,36 +1490,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Совместимость с другими операционными системами</b>"
 
 #: rapid/glade3/rapid.glade.h:7
-msgid "<b>Download Folder</b>"
-msgstr "<b>Каталог хранения фотографий</b>"
+msgid "<b>Devices</b>"
+msgstr "<b>Носители</b>"
 
 #: rapid/glade3/rapid.glade.h:8
-msgid "<b>Download Subfolders</b>"
-msgstr "<b>Подкаталоги хранения фотографий</b>"
+msgid "<b>Download Folder</b>"
+msgstr "<b>Каталог для закачки фотографий</b>"
 
 #: rapid/glade3/rapid.glade.h:9
-msgid "<b>Example</b>"
-msgstr "<b>Пример</b>"
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Подкаталоги для закачки фотографий</b>"
 
 #: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Носители фотографий</b>"
+msgid "<b>Example</b>"
+msgstr "<b>Пример</b>"
 
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Конфликты в названии фотографии</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Метки</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Переименование фотографий</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Отсутствующие носители резервного копирования</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Метки</b>"
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Переименование фотографий</b>"
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Отсутствующие носители резервного копирования</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Конфликт названий между фотографией и видеороликом</b>"
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1342,8 +1534,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Photos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Пример: /home/user/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Пример: /home/user/Pictures</i>"
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1367,26 +1559,27 @@ msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Резервное копирование</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Каталог хранения фотографий</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Носители</span>"
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Обработка ошибок</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Носители фотографий</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Метки</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Переименование фотографий</span>\t"
+"<span weight=\"bold\" size=\"x-large\">Каталоги для загрузки "
+"фотографий</span>"
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Метки</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Переименование фотографий</span>\t"
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
@@ -1394,111 +1587,141 @@ msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Параметры переименования</span>"
 
 #: rapid/glade3/rapid.glade.h:30
-msgid "Add unique identifier"
-msgstr "Добавить уникальный идентификатор"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Каталоги для загрузки "
+"видеороликов</span>"
 
 #: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Переименование видеороликов</span>\t"
+
+#: rapid/glade3/rapid.glade.h:32
+msgid "Add unique identifier"
+msgstr "Добавить уникальную метку"
+
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Автоматически определять внешние съёмные носители"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Автоматически определять носители для резервного копирования"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Автоматически определять носители, которые содержат фотографии"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr "Автоматически обнаруживать носители"
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Автоматизация"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Резервное копирование"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Название каталога:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Местоположение резервных копий"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Выполнять резервное копирование фотографий при их скачивании"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr ""
+"Выполнять резервное копирование фотографий и видеороликов во время загрузки"
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
 "Выберите каталог, в котором будут храниться фотографии. Подкаталоги для "
-"скачиваемых фотографий будут автоматически созданы в каждом каталоге, "
+"загружаемых фотографий будут автоматически созданы в каждом каталоге, "
 "используя структуру указанную вами ниже."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Выберите пропускать ли скачивание такой фотографии или добавлять к ней "
-"уникальный идентификатор."
-
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr "Авторские права Damon Lynch 2007-2010"
+"Выберите каталог, в котором будут храниться видеоролики. Подкаталоги для "
+"загружаемых видеороликов будут автоматически созданы в каждом каталоге, "
+"используя структуру указанную вами ниже."
 
 #: rapid/glade3/rapid.glade.h:42
-msgid "Day start:"
-msgstr "Начало дня:"
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+"Выберите, следует ли пропустить скачивание файла или следует добавить к его "
+"названию уникальную метку."
 
 #: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Удалить изображения с устройства хранения после завершения закачки"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Авторские права Damon Lynch 2007-2010"
 
 #: rapid/glade3/rapid.glade.h:44
-msgid "Download / Pause"
-msgstr "Скачать / Пауза"
+msgid "Day start:"
+msgstr "Начало дня:"
 
 #: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Каталог хранения фотографий"
+msgid "Delete photos and videos from device upon download completion"
+msgstr "Удалить фотографии и видеоролики после окончания загрузки"
 
 #: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr "Носители"
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:52
+msgid "Download / Pause"
+msgstr "Загрузка / Пауза"
+
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Каталог:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
-msgstr "Скачиваний сегодня:"
+msgstr "Загрузок сегодня:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Обработка ошибок"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Журнал ошибок"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Выйти из программы после успешного завершения скачивания фотографий"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
+"Выйти из программы в том случае, если загрузка завершилась без ошибок"
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Если вы отключаете автоматическое определение, то, пожалуйста, выберите "
 "точное местоположение носителя для резервного копирования."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Если вы отключаете автоматическое определение, то, пожалуйста, выберите "
-"точное местоположение фотографий."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1508,64 +1731,47 @@ msgstr ""
 "готовы к тому, что они будут просканированы на наличие фотографий. На "
 "носителях большого объёма это может занять достаточно много времени."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Носители фотографий"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Переименование фотографий"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Носители фотографий - это устройства (фотоаппараты, карты памяти, съёмные "
-"носители) с которых необходимо скачать фотографии.\n"
-"\n"
-"Вы можете одновременно скачивать фотографии с нескольких носителей.\n"
-"\n"
-"<i>Скачивание непосредственно из фотоаппарата может работать медленно или не "
-"работать совсем, в этом случае попытайтесь установить его в режим PTP. Если "
-"это не возможно, то попробуйте использовать устройство для чтения карт "
-"памяти.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Носитель фотографий:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Импортируйте ваши фотографии и видеоролики быстро и надёжно"
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Эффективное и надёжное импортирование ваших фотографий"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Метки"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr "Размещение:"
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Перезаписать"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr "Каталоги фотографий"
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr "Переименование фотографий"
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr "Название каталога резервного копирования фотографий"
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Параметры: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "У_далить все"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1597,153 +1803,187 @@ msgstr ""
 "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
 "1301, USA."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Параметры переименования"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Предупредить"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Сообщить об ошибке"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Пропустить"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
-msgstr "Пропустить скачивание"
+msgstr "Пропустить загрузку"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+"Извините, возможность загрузки видео не работает. Необходимо установить "
+"пакет <i>kaa metadata</i> для python."
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Укажите каталог для хранения резервных копий фотографий на устройстве.\n"
-"\n"
-"<i>Примечание:  На каждом носителе, который вы хотите использовать для "
-"резервного копирования, создайте каталог с этим названием.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
 "Укажите время в 24 часовом формате, в которое будет сброшена "
-"последовательность номеров параметра <i>Скачиваний сегодня</i>."
+"последовательность номеров параметра <i>Загрузок сегодня</i>."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Укажите, как следует поступить с фотографией, имеющей точно такое же "
-"название и уже скачанной или сохранённой в резервной копии."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr ""
 "Укажите, что делать если не обнаружены носители для резервного копирования."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Укажите, должны ли удаляться символы в названиях фотографий и каталогов, "
-"которые не распознаются в других операционных системах."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Начать скачивание фотографий сразу после запуска программы"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Начать скачивание фотографий при вставке носителя"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr "Начать загрузку сразу после подключения носителя"
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Сохранение под номером:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Убрать несовместимые символы"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr "Синхронизировать последовательность номеров при закачке RAW + JPEG"
+msgstr "Синхронизировать последовательность номеров при загрузке RAW + JPEG"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr ""
-"Отсоединить (\"извлечь\") носитель с фотографиями после завершения скачивания"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Отключить (\"извлечь\") носитель после завершения загрузки"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr "Каталоги видеороликов"
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr "Переименование видеороликов"
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr "Название каталога резервного копирования видеороликов"
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
-"Во время резервного копирования могут встретиться фотографии с одинаковыми "
-"названиями. Выберите, перезаписать ли такую фотографию или пропустить её."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Вы можете производить резервное копирование фотографий на различные "
-"носители, в том числе на внешние жёсткие диски."
+"Имеется возможность создания резервной копии ваших фотографий и видеороликов "
+"прямо во время загрузки, в том числе на внешние жёсткие диски."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Добавить..."
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
-msgstr "_Очистить завершённые скачивания"
+msgstr "_Очистить завершённые загрузки"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Журнал ошибок"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Получить помощь в интернете..."
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Помощь"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Сделать пожервование"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Фотографии"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Сообщить о проблеме..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Предпросмотр фотографий"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Перевести это приложение..."
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Просмотр"
 
+#~ msgid "Could not open image"
+#~ msgstr "Не смог открыть фотографию"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "Фотография не содержит метаданных"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s фотографий пропущено"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Фотография перезаписана"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "На этом устройстве не обнаружены фотографии, которые можно скачать."
+
+#~ msgid "Image skipped"
+#~ msgstr "Фотография пропущена"
+
+#~ msgid "Image already exists"
+#~ msgstr "Фотография уже существует"
+
+#~ msgid "images skipped"
+#~ msgstr "фотографий пропущено"
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -1754,6 +1994,22 @@ msgstr "_Просмотр"
 #~ "Получатель: %(destination)s\n"
 #~ "Проблема: %(problem)s"
 
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Подкаталог: %(subfolder)s\n"
+#~ "Фотография: %(image)s\n"
+#~ "Проблема: %(problem)s"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Пример: /home/user/photos</i>"
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Эффективное и надёжное импортирование ваших фотографий"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
 
@@ -1766,3 +2022,319 @@ msgstr "_Просмотр"
 #~ "Невозможно создать каталог получателя\n"
 #~ "%(directory)s\n"
 #~ "Ошибка: %(errno)s %(strerror)s"
+
+#~ msgid "Image Rename"
+#~ msgstr "Переименование фотографий"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Выберите каталог с фотографиями"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Переименование фотографий</b>"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Предпросмотр фотографии не может быть выполнен"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "У фотографии нет предпросмотра"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr "расширение было указано, но фотографий не имеет расширения"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr "номер фотографии был указано, но фотография не имеет номер"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Носители фотографий</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Носители фотографий</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"x-large\">Переименование фотографий</span>\t"
+
+#~ msgid "Image Devices"
+#~ msgstr "Носители фотографий"
+
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Ошибка в параметрах настройки переименования фотографий"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Автоматически определять носители, которые содержат фотографии"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Сканирование носителя %s завершено: фотографий не найдено"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Метаданные подсекунд не представлены в фотографии"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "%s метаданные не представлены в фотографии"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Параметры подкаталогов, имеющих некоторые ненужные значения, были удалены."
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Метаданные необходимы  для генерирования названий подкаталогов / "
+#~ "фотографий.\n"
+#~ "Источник: %s"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr ""
+#~ "вывести расширения файла фотографии, которые распознала программа и выйти"
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Введённые параметры подкаталога неправильны и не могут быть использованы.\n"
+#~ "Они будут сброшены до значений принятых по умолчанию."
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Название фотографии не получилось сгенерировать должным образом. Проверьте "
+#~ "достаточно ли метаданных."
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Не смог сгенерировать название фотографии"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Сканирование носителя завершено: найдено %(number)s фотографий на %(device)s"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Название подкаталога не получилось сгенерировать должным образом. Проверьте "
+#~ "достаточно ли метаданных."
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s фотографий скачано"
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Начать скачивание фотографий при вставке носителя"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Если вы отключаете автоматическое определение, то, пожалуйста, выберите "
+#~ "точное местоположение фотографий."
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr ""
+#~ "Отсоединить (\"извлечь\") носитель с фотографиями после завершения скачивания"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Выйти из программы после успешного завершения скачивания фотографий"
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Вы можете производить резервное копирование фотографий на различные "
+#~ "носители, в том числе на внешние жёсткие диски."
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Выполнять резервное копирование фотографий при их скачивании"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Название каталога:"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Носитель для резервного копирования фотографий уже существует"
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Укажите каталог для хранения резервных копий фотографий на устройстве.\n"
+#~ "\n"
+#~ "<i>Примечание:  На каждом носителе, который вы хотите использовать для "
+#~ "резервного копирования, создайте каталог с этим названием.</i>"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Конфликты в названии фотографии</b>"
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Укажите, как следует поступить с фотографией, имеющей точно такое же "
+#~ "название и уже скачанной или сохранённой в резервной копии."
+
+#~ msgid "images downloaded"
+#~ msgstr "фотографий скачано"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Внимание:</b> Не хватает метаданных для генерирования названия "
+#~ "фотографии. Пожалуйста, измените настройки переименования фотографий.</i>"
+
+#~ msgid "Image location:"
+#~ msgstr "Носитель фотографий:"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Выберите пропускать ли скачивание такой фотографии или добавлять к ней "
+#~ "уникальный идентификатор."
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Укажите, должны ли удаляться символы в названиях фотографий и каталогов, "
+#~ "которые не распознаются в других операционных системах."
+
+#~ msgid "Download Folder"
+#~ msgstr "Каталог хранения фотографий"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Ошибка в параметрах настройки подкаталогов для хранения фотографий"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"x-large\">Каталог хранения фотографий</span>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Внимание:</b> Не хватает метаданных для генерирования названия "
+#~ "подкаталогов. Пожалуйста, измените настройки переименования подкаталогов "
+#~ "(см. параметр Каталог хранения).</i>"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Выберите каталог для хранения резервных копий фотографий"
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Носители фотографий - это устройства (фотоаппараты, карты памяти, съёмные "
+#~ "носители) с которых необходимо скачать фотографии.\n"
+#~ "\n"
+#~ "Вы можете одновременно скачивать фотографии с нескольких носителей.\n"
+#~ "\n"
+#~ "<i>Скачивание непосредственно из фотоаппарата может работать медленно или не "
+#~ "работать совсем, в этом случае попытайтесь установить его в режим PTP. Если "
+#~ "это не возможно, то попробуйте использовать устройство для чтения карт "
+#~ "памяти.</i>"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Устройство для хранения резервных копий не обнаружено."
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr ""
+#~ "Использовать ли этот носитель или диск как место, с которого скачиваются "
+#~ "фотографии?"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Изображение: %(source)s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Не удалось удалить изображение с устройства хранения"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Изображение: %(source)s\n"
+#~ "Ошибка: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "Удалены %i изображений с устройства хранения"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Удалить изображения с устройства хранения после завершения закачки"
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Во время резервного копирования могут встретиться фотографии с одинаковыми "
+#~ "названиями. Выберите, перезаписать ли такую фотографию или пропустить её."
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Обнаружены изображения с одними и теми же названиями, но принятыми в разное "
+#~ "время:"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Первое изображение: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Второе изображение: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Носитель изображений: %s\n"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Извините, каталог для закачки существует, но он защищен от записи. "
+#~ "Пожалуйста, проверьте права на каталог или измените свои настройки"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Извините, каталог для закачки не существует. Пожалуйста, создайте каталог "
+#~ "или измените свои настройки"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Проблема с каталогом для закачки фотографий"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Извините, этот путь для хранения изображений не существует:\n"
+#~ "%(path)s\n"
+#~ "Пожалуйста, решите эту проблему или измените настройки"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 из %s фотографий скачано"
+
+#~ msgid "The image was not copied."
+#~ msgstr "Фотография не закачана."
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s из %(total)s фотографий скачано"
diff --git a/po/sr.po b/po/sr.po
index dd47ae0..012b473 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,212 +7,271 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 09:30+0000\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-29 19:30+0000\n"
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-30 14:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Брзи преносилац фотографија"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "Београд"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Софија"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Праг"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Зајечар"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Нови Сад"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Техеран"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Будва"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Париз"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Берлин"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Сиднеј"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Будимпешта"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Рим"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Москва"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Делфи"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Варшава"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Амазон"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Мадрид"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Истамбул"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Није исправна вредност за данашња преузимања.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Постављам вредност на нулу.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Вредност подешавања за „почетак дана“ је неисправна.\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Постављам на поноћ.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Грешка у подешавањима за преименовање"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr "Грешка у поставкама за преименовање фотографија"
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Ово подешавање садржи грешку:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Враћам на подразумеване вредности."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Код задатка"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Грешка у подешавањима подфасцикли за чување"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr "Грешка у поставкама за преименовање видеа"
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Грешка у поставкама субфасцикли за преузете фотографије"
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Грешка у поставкама субфасцикли за преузет видео"
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr "фотографије и видео"
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr "фотографије"
+
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Изаберите фасциклу за чување фотографија"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Изаберите фасциклу са сликама"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr "Изаберите фасциклу за смештање преузетог видеа"
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Изаберите фасциклу за резервне копије слика"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Изаберите фасциклу која садржи %(file_types)s"
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr "Изаберите фасциклу за резервне копије %(file_types)s"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<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>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<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>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Пример: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "Вредност за данашња преузимања није ажурирана, јер је у току пренос "
 "фотографија"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr "Вредност сачуваног броја није ажурирана, јер је у току преузимање"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
-msgstr "Уклоњене су неке необавезне вредности из подешавања подфасцикли."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
+msgstr ""
+"Из поставке %(filetype)s подфасцикле су уклоњене неке непотребне вредности."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Унета подешавања подфасцикли нису исправна.\n"
-"Она ће бити враћена на подразумеване вредности."
+"Унете поставке %(filetype)s подфасцикле нису исправне и неће бити "
+"коришћене.\n"
+"Враћам поставке на подразумеване вредности."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr "слика"
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr "видео"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "СпољниУређај1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "СпољниУређај2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr "слика или видео"
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "видео"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "претражујем уређај..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr "Не могу да образујем ову путању за преузимање:\n"
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr "%(path)s: "
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Не могу да наставим преузимање"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Постоји грешка у подешавањима програма."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -220,42 +279,41 @@ msgstr ""
 "\n"
 "Проверите поставке и поново покрените програм."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Не могу да наставим преузимање"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "преузето је 0 од %s фотографија"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr "0 од %(number)s %(filetypes)s"
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
-msgstr "Пронађено је %(number)s фотографија на %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+msgstr ""
+"Претрага уређаја је завршена: нађено је %(number)s %(filetypes)s на "
+"%(device)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Није нађена ни једна фотографија на %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
+"Претрага уређаја је завршена: није нађено %(filetypes)s на %(device)s"
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Не могу да образујем назив фотографије"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr "Не могу да образујем назив за %(filetype)s датотеку"
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -264,15 +322,16 @@ msgstr ""
 "Извор: %(source)s\n"
 "Проблем: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Не могу да образујем назив фотографија. Проверите да ли оне садрже довољно "
-"метаподатака."
+"Не могу да образујем исправан назив за %(filetype)s датотеку. Проверите да "
+"ли постоје сви метаподаци."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -285,7 +344,8 @@ msgstr ""
 "Циљ: %(destination)s\n"
 "Проблем: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -294,21 +354,21 @@ msgstr ""
 "Извор: %(source)s\n"
 "Циљ: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Додат је јединствена реч „%s“"
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Извор: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Грешка у преузимању"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -319,85 +379,103 @@ msgstr ""
 "Циљ: %(destination)s\n"
 "Грешка: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "Фотографија није копирана."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr "%(filetype)s није прекопиран."
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
-msgstr ""
-"Фотографије имају исти назив датотека, али су  сликане у различито време:"
+"Photos detected with the same filenames, but taken at different times:"
+msgstr "Фотографије са истим називом сликане у различито време:"
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Прва слика: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Друга слика: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"Прва фотографија: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Друга фотографија: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Не могу да отворим фотографију"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr "Не могу да отворим %(filetype)s"
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Извор: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "Фотографија не садржи метаподатке"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr "%(filetype)s не садржи метаподатке"
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Метаподаци су неопходни за образовање назива подфасцикли и датотека.\n"
+"Метаподаци су неопходни за образовање подфасцикли и/или имена датотека.\n"
 "Извор: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Не могу да образујем називе подфасцикли. Проверите да ли постоје потребни "
+"Не могу да образујем исправна имена подфасцикли. Проверите да ли постоје "
 "метаподаци."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
 "Подфасцикла: %(subfolder)s\n"
-"Слика: %(image)s\n"
+"Датотека: %(file)s\n"
 "Проблем: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Почео је нови дан, поништавам број данашњих преузимања"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Већ постоји резервна копија слике"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Резервна копија %(file_type)s већ постоји"
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Резервна копија %(file_type)s је преписана"
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr "Није направљена резервна копија %(file_type)s на %(volume)s"
+
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "Није направљена резервна копија %(file_type)s"
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Грешка приликом образовања резервне копије"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Не могу да направим циљни директоријум: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -406,12 +484,17 @@ msgstr ""
 "Извор: %(source)s\n"
 "Циљ: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Грешка: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr "Није направљена резервна копија %(file_type)s."
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -422,274 +505,340 @@ msgstr ""
 "Циљ: %(destination)s\n"
 "Грешка: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr "Не могу да направим резервну копију %(file_type)s"
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr "Није пројађен одговарајући диск за резервну копију"
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr "Није пронађена путања за резервне копије"
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Сада је безбедно да уклоните уређај"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "Преузето је %s склика"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s преузето"
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "Прескочено је %s склика"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr "%(noFiles)s %(filetypes)s прескочено"
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "упозорења"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "грешке"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Нама уређаја за резервне копије"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Није пронађен уређај за резервне копије"
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Уређај не садржи фотографије за преузимање."
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr "Не могу да извучем умањени приказ слике"
 
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Преузимам фотографије са %s"
-
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Извор: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Уређај са сликама: %s\n"
+msgid "Device: %s\n"
+msgstr "Уређај: %s\n"
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Циљ: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Не могу да направим привремени директоријум за преузимање"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Грешка:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Прескочена слика"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr "Овај уређај нема %(types_searched_for)s за преузимање."
+
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Преузимам фотографије са %s"
+
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr "Не постоји путања за резервну копију"
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr "Не могу да образујем путању %s"
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr "Не могу да направим резервну копију"
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Нама уређаја за резервне копије"
+
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr "Није пронађен уређај за резервне копије"
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr "Фотографија"
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr "Фотографија је прескочена"
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Преписана слика"
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr "Фотографија већ постоји"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "Већ постојећа слика"
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr "Видео"
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "Слика нема умањени приказ"
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr "Видео је прескочен"
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr "Видео већ постоји"
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "Преузето је %(number)s од %(total)s слика"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s од %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Не могу да уклоним фотографије са уређаја"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr "Не могу да обришем фотографије или видео са уређаја"
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Слика: %(source)s\n"
+"Фотографија: %(source)s\n"
 "Грешка: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Слика: %(source)s"
+msgid "Photo: %(source)s"
+msgstr "Фотографија: %(source)s"
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "Обрисано је %i слика са уређаја"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr "Обрисано је %(number)i %(filetypes)s са уређаја"
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Завршено је преузимање са %s"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Уређај"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Величина"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Напредак преузимања"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Не могу да прикажем умањени приказ"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Можда је оштећен"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Пронађен је нови уређај"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
-msgstr "Да ли да преузимам фотографије са овог уређаја или партиције?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr "Да ли да преузимам фотографије или видео са овог уређаја/партиције?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Запамти овај избор"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s је изабран за преузимање слика"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr "Фотографије ће увек бити преузете са овог уређаја или партиције"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s је забрањен за преузимање слика"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr "Фотографије никада неће бити преузете са овог уређаја или партиције"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Да уклоним све кодове задатка?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Да ли да уклоним све кодове задатка?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Унесите код задатка"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Унесите код задатка или изаберите неки претходни."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Унос новог кода задатка."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Код задатка:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Код задатка је унет"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Код задатка није унет"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Ова путања за слике не постоји:\n"
+"Ова путања до уређаја не постоји:\n"
 "%(path)s\n"
 "\n"
-"Решите овај проблем или измените поставке."
+"Решите проблем са уређајем или измените поставке програма."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Проблем са фасциклом за фотографије"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr "Проблем са фасциклом уређаја"
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
-msgstr ""
-"Фасцикла за преузимање фотографија не постоји. Направите фасциклу или "
-"иамените поставке"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
+msgstr "Фасцикла за преузете %(file_type)s не постоји.\n"
+
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgstr "Фасцикла за преузете %(file_type)s постоји, али не дозвољава упис.\n"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Не могу да упишем датотеке у фасциклу за преузимање. Проверите облашћења "
-"фасцикле или измените поставке"
+"Постоји неки проблем са фасциклом за преузете датотеке. Исправите проблем "
+"или измените поставке програма.\n"
+"\n"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Проблем са фасциклом за фотографије"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr "Преблем са фасциклом за преузете датотеке"
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Нека подешавања ће бити поништена."
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Питај да ли да користим %s"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Питај за код задатка"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Већ сам питао за код задатка, нећу питати поново"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Започињем преузимања која чекају на код задатка"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Почињем преузимање"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr "Правим фасцикли за преузете слике %(folder)s"
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+"Не могу да направим подразумевану фасциклу за преузете слике %(folder)s"
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr "Правим фасцикли за преузети видео %(folder)s"
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+"Не могу да направим подразумевану фасциклу за преузети видео %(folder)s"
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -697,32 +846,32 @@ msgstr ""
 "Новије издање програма је било покретано на овом рачунару.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr "Изгледа да су подешавања програма исправна, али их проверите."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Нека подешавања су неисправна, пе ће бити поништена."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Упозорење:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
 "Ово издање програма не новије од претходно покретаног. Проверавам подешавања."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Поставке су измењене."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -734,11 +883,11 @@ msgstr ""
 "\n"
 "Проверите да ли су жељене радње исправне."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Поставке нису мењане."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -748,116 +897,129 @@ msgstr ""
 "претходних подешавања нису исправна и не могу се ажурурати. Она ће бити "
 "враћена на подразумеване вредности."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Проблем при коришћењу pynotify."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Не могу да користим могућности pynotify сервера."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr "Упозорење: сервер за обавештавање није правино подешен."
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "и"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Употреба резервног уређаја"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Употреба резервног уређаја"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Нису изабрани резервни уређаји"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Уређај %(device)s (%(path)s) је занемарен"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Пронађен је уређај %(device)s у %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Укључено је аутоматско преузимање"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Искључено је аутоматско преузимање"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Користим ручно изабрану путању"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr "Правим резерву у %(path)s"
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Сва преузимања су завршена"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Преостала је 1 секунда"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Преостало је %i секунди"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Преостао је 1 минут"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Преостало је %(minutes)i:%(seconds)02i"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "преузете фотографије"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr "преузете слике"
+
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr "прескочене слике"
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "прескочене фотографије"
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr "преузет видео"
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr "прескочен видео"
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Преузми "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Паузирај"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Поставке су измењене."
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Довиђења"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -866,337 +1028,386 @@ msgstr ""
 "исписује податке о програму у командној линији док је покренут програм "
 "(подразумевано: %default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "исписује грешке само у командној линији"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
-msgstr "исписује наставке датотека са сликом које су подржане"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr "исписује екстензије подржаних слика и видеа и напушта програма"
+
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr "враћа све поставке на подразумевано и напушта програм"
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr "Фотографије:"
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr "Видео:"
+
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "и %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr "Сва подешавања су враћена на подразумеване вредности"
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Користи"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s је већ покренут"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Датум"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Текст"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Име датотеке"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Метаподаци"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Низови"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Датум фотографије"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr "Датум видеа"
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Данас"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Назив + наставак"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Назив"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Наставак"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Број слике"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr "Број видеа"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Отвор бленде"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ИСО"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Време експозиције"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Жижна даљина"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Произвођач фотоапарата"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Модел фотоапарата"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Скраћени назив фотоапарата"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Дужи назив фотоапарата"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Серијски број"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Број окидања"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Име власника"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr "Кодек"
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr "Ширина"
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr "Висина"
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr "Дужина"
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr "Кадрова у секунди"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Данашња преузимања"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Број сесије"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Број подфасцикле"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Сачувани број"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Низ слова"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Све цифре"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Последње цифре"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Последње две цифре"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Последње три цифре"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Последње четири цифре"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Оригинална величина слова"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "ВЕЛИКА СЛОВА"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "мала слова"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "Једна цифра"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Две цифре"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Три цифре"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Четири цифре"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Пет цифре"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Шест цифре"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Седам цифара"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Стотинке"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "ГГГГММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "ГГГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "ГГММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "ГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "ММДДГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "ММДДГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "ММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "ДДММГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "ДДММГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "ГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "ММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "ЧЧММСС"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "ЧЧММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "ЧЧ-ММ-СС"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "ЧЧ-ММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "ЧЧ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "ММ (минута)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "СС"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1205,53 +1416,64 @@ msgstr ""
 "Није исправна поставка „%(key)s“.\n"
 "Очекивано је %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Није исправна поставка „%(value)s“"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Ова подешавања нису исправно образована:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Метаподатак за време у стотинкама не потоји"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr "Не постоје временски метаподаци о стотинкама"
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "Не постоје %s метаподаци у фотографији"
+msgid "%s metadata is not present"
+msgstr "Не постоји %s метаподатак"
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Грешка у датуму. Изгледа да није исправна вредност %s"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
-msgstr "наставак је одређен, али назив фотографије не садржи наставак"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
+msgstr "екстензија је одређена, али име датотеке не садржи екстензију"
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
-msgstr "број слике је одређен, али назив фотографије не садржи број"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
+msgstr "одређен је број слике или видеа, али име датотеке не садржи број"
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr "Слика не садржи %s метаподатак"
+
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "грешка при образовању назива са %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr "Видео не садржи %s метаподатак"
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Подешавања подфасцикле не треба да почиње са %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Подешавања подфасцикле не треба да се завршава са %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Подешавања подфасцикле не треба да садржи два %s један за другим"
@@ -1281,36 +1503,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Сагласност са осталим оперативним системима</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr "<b>Уређаји</b>"
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Фасцикла за чување фотографија</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Подфасцикле за чување фотографија</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Пример</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Уређај са сликама</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Неподударање назива слика</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Кодови задатка</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Преименовање фотографија</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Нису присутни уређај за резервне копије</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Кодови задатка</b>"
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Преименовање фотографија</b>"
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Нису присутни уређај за резервне копије</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Несагласност имена видеа и слика</b>"
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1325,8 +1547,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/Спољни_Уређај/Фотографије</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Example: /home/user/фотографије</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Пример: /home/user/Фотографије</i>"
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1349,133 +1571,169 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Резервна копија</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Фасцикла за чување фотографија</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Уређаји</span>"
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Превазилажење грешака</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Уређаји са сликама</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Кодови задатка</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Преименовање фотографија</span>\t"
+"<span weight=\"bold\" size=\"x-large\">Фасцикла за преузете слике</span>"
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Кодови задатка</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Преименовање фотографија</span>\t"
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Опције за преименовање</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Фасцикла за преузет видео</span>"
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Преименовање видеа</span>\t"
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Додај јединствену реч"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Сам пронађи преносне меморијске уређаје"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Сам пронађи уређаје за резервне копије"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Сам пронађи уређаје са сликама"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr "Сам пронађи уређаје"
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Аутоматизација"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Резервна копија"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Име фасцикле за резервну копију:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Место за резервну копију:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Направи резервну копију приликом преузимања фотографија"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr "Направи резерву слика и видеа при преузимању"
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
 "Изаберите фасциклу за чување преузетих фотографија. Подфасцикле ће бити "
-"аутоматски направљене на основу задатог редоследа."
+"направљене на основу задатог редоследа."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Да ли да прекинем преузимање или да додам јединствену реч на назив "
-"фотографије."
+"Изаберите фасциклу за чување преузетог видеа. Подфасцикле ће бити направљене "
+"на основу задатог редоследа."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:42
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr "Да ли да прескочим датотеку или да додам јој јединствен број."
+
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Ава права су задржана, Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Почетак дана:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Обриши фотографије са изворног уређаја по преузимању"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr "Обриши слике и видео са уређаја након преузимања"
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr "Уређаји"
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+"Уређаји су места из којих можете преузети слике или видео, као што су фото-"
+"апарати, меморијске картице или преносни уређаји.\n"
+"\n"
+"Можете преузети фотографије са више уређаја одједном или одредити неко место "
+"за преузимање са вашег диска.\n"
+"\n"
+"<i>Преузимање директно са фото-апарата ради лоше, или чак уопште не ради. "
+"Пробајте да поставите апрат у ПТП режим, а ако то не помогне размислите о "
+"куповини читача картица.</i>"
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Преузми / Паузирај"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Фасциклe"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Фасцикла за чување фотографија:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Данашњих преузимања:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Грешке"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Испис грешака"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Напусти програм по успешном преузимању фотографија"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr "Напусти програм иколико преузимање прође без грешака"
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Уколико искључите аутоматско налажење, изаберите место за резервну копију."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
-msgstr "Уколико искључите аутоматско налажење, изаберите путању до слика."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
+msgstr ""
+"Уколико искључите аутоматско налажење, морате задати тачну путању до "
+"фотографија и видеа."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1484,63 +1742,47 @@ msgstr ""
 "Уколико омогућите аутоматско налажење покретних меморијских уређаја, цео "
 "уређај ће бити претражен у потрази за фотографијама, што може да потраје."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Занемари"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Уређај са сликама"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Преименовање"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Уређаји са сликама могу бити фотоапарати, разне спољне меморије и покретни "
-"дискови.\n"
-"\n"
-"Можете преузети фотографије са више уређаја одједном.\n"
-"\n"
-"<i>Уколико је преузимање фотографија директно са фотоапарата споро или не "
-"ради, пробајте да подесите фотоапарат тако да ради у PTP режиму. Уколико то "
-"није могуће, набавите спољни читач картица.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Место фотографије:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Увезите ваше фотографије и видео брзо и поуздано"
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Увезите фотографије ефикасно и сигурно"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Код задатка"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr "Место:"
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Препиши"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr "Фасцикла за слике"
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr "Преименовање фотографија"
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr "Име резевне фасцикле за слике:"
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Поставке: Брзи преносилац фотографија"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "У_клони све"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1570,151 +1812,222 @@ msgstr ""
 "фотографија; ако нисте, пишите Задужбини за Слободни Софтвер (Free Software "
 "Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Опције преименовања"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Пријавите упизорење"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Пријави грешку"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Прескочи"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Прескочи преузимање"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+"Преузимање видеа није могуће. За преузимање видеа морате инсталирати Питонов "
+"<i>kaa metadata</i> пакет."
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
 "Одређује фасциклу на уређају у којој се чувају резервне копије.  \n"
 "\n"
-"<i>Примедба: ово одређује и да ли се уређај користи као резервни. За сваки "
-"уређај са резервник копијама направите посебну фасциклу, која се налази "
-"унутар уређаја.</i>"
+"<i>Примедба: ово одређује и да ли се уређаји користе као резервни. Унутар "
+"сваког резервног уређаја морате направити фасцику са неким од ових "
+"назива.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
 "Одређује време у које ће вредност <i>данашњих преузимања</i> бити поништена."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
 msgstr ""
-"Одређује шта треба предузети када већ постоји фотографија са истим именом "
-"међу преузетим или резервним."
+"Одређује радњу када постоји преузета или резервна фотографија и видео са "
+"истим именом."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr "Одређује шта треба предузети када не постоје резервни уређаји."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Одређује да ли треба уклонити знакове које не подржава оперативни систем из "
-"назива датотека и фасцикли."
+"Одређује да ли треба уклонити неподржане знаке из имена фотографија, видеа и "
+"фасцикли."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Започни преузимање по покретању програма"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Започни преузимање по прикључењу уређаја"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr "Започни преузимање по прикључивању уређаја"
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Сачувани бројеви:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Избаци неподржане знакове"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Усагласи називе RAW и JPEG слика"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Демонтирај/избаци уређај са сликама након преузимања"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Демонтирај (избаци) уређај након успешног преузимања"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr "Видео фасцикле"
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr "Преименовање видеа"
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr "Име резервне фасцикле за видео:"
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
-"Приликом прављења резервне копије, уколико већ постоји фотографија са истим "
-"именом, можете је преписати или прескочити."
+"Да ли да препишем датотеку са истим именом на резервном уређају или да је "
+"прескочим приликом прављења резевне копије."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Можете направити резервне копије фотографија на више места приликом "
-"преузимања, нпр. на спољним дисковима."
+"Можете направити резервне кпије фотографија и видеа на више места при "
+"преузимању, нпр. на екстерним дисковима."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Додај..."
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Очисти завршена преузимања"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "Списак са _грешкама"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "Помоћ на _мрежи"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Новчани прилог пројекту"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Фотографија"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Пријављивање грешака"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Умањени прикази"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "Помоћ у _локализацији"
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "П_реглед"
 
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Грешка у подешавањима за преименовање"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Грешка у подешавањима подфасцикли за чување"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Изаберите фасциклу са сликама"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Упозорење:</b> Нема довољно метаподатака за образовање назива "
+#~ "фотографије. Искористите неку другу опцију за преименовање.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Упозорење:</b> Нема довољно метаподатака за образовање подфасцикли. "
+#~ "Искористите неку другу опцију за именовање подфасцикли.</i>"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Изаберите фасциклу за резервне копије слика"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "преузето је 0 од %s фотографија"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Не могу да образујем назив фотографија. Проверите да ли оне садрже довољно "
+#~ "метаподатака."
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Не могу да образујем назив фотографије"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Није нађена ни једна фотографија на %s"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr "Пронађено је %(number)s фотографија на %(device)s"
+
+#~ msgid "Could not open image"
+#~ msgstr "Не могу да отворим фотографију"
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -1727,6 +2040,31 @@ msgstr "П_реглед"
 
 #, python-format
 #~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Метаподаци су неопходни за образовање назива подфасцикли и датотека.\n"
+#~ "Извор: %s"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "Фотографија не садржи метаподатке"
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Подфасцикла: %(subfolder)s\n"
+#~ "Слика: %(image)s\n"
+#~ "Проблем: %(problem)s"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "Прескочено је %s склика"
+
+#, python-format
+#~ msgid ""
 #~ "Destination directory could not be created\n"
 #~ "%(directory)s\n"
 #~ "Error: %(errno)s %(strerror)s"
@@ -1735,5 +2073,276 @@ msgstr "П_реглед"
 #~ "%(directory)s\n"
 #~ "Грешка %(errno)s %(strerror)s"
 
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "Преузето је %s склика"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Већ постоји резервна копија слике"
+
+#~ msgid "The image was not copied."
+#~ msgstr "Фотографија није копирана."
+
+#~ msgid "Image overwritten"
+#~ msgstr "Преписана слика"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Уређај не садржи фотографије за преузимање."
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Није пронађен уређај за резервне копије"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "Слика нема умањени приказ"
+
+#~ msgid "Image skipped"
+#~ msgstr "Прескочена слика"
+
+#~ msgid "Image already exists"
+#~ msgstr "Већ постојећа слика"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Не могу да прикажем умањени приказ"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Не могу да уклоним фотографије са уређаја"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Слика: %(source)s\n"
+#~ "Грешка: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Слика: %(source)s"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "Обрисано је %i слика са уређаја"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "Преузето је %(number)s од %(total)s слика"
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr "Да ли да преузимам фотографије са овог уређаја или партиције?"
+
+#~ msgid "images skipped"
+#~ msgstr "прескочене фотографије"
+
+#~ msgid "images downloaded"
+#~ msgstr "преузете фотографије"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Уређај са сликама</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Example: /home/user/фотографије</i>"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr "Уклоњене су неке необавезне вредности из подешавања подфасцикли."
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "Не постоје %s метаподаци у фотографији"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Метаподатак за време у стотинкама не потоји"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"x-large\">Фасцикла за чување фотографија</span>"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Сам пронађи уређаје са сликама"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Уређаји са сликама</span>"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Сва права су задржана, Дејмон Линч (Damon Lynch) 2007-09"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Име фасцикле за резервну копију:"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Обриши фотографије са изворног уређаја по преузимању"
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Демонтирај/избаци уређај са сликама након преузимања"
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Можете направити резервне копије фотографија на више места приликом "
+#~ "преузимања, нпр. на спољним дисковима."
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Одређује фасциклу на уређају у којој се чувају резервне копије.  \n"
+#~ "\n"
+#~ "<i>Примедба: ово одређује и да ли се уређај користи као резервни. За сваки "
+#~ "уређај са резервник копијама направите посебну фасциклу, која се налази "
+#~ "унутар уређаја.</i>"
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Започни преузимање по прикључењу уређаја"
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Увезите фотографије ефикасно и сигурно"
+
+#~ msgid "Image location:"
+#~ msgstr "Место фотографије:"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr "број слике је одређен, али назив фотографије не садржи број"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr "наставак је одређен, али назив фотографије не садржи наставак"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr "исписује наставке датотека са сликом које су подржане"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Да ли да прекинем преузимање или да додам јединствену реч на назив "
+#~ "фотографије."
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Неподударање назива слика</b>"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Напусти програм по успешном преузимању фотографија"
+
+#~ msgid "Image Devices"
+#~ msgstr "Уређај са сликама"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr "Уколико искључите аутоматско налажење, изаберите путању до слика."
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr ""
+#~ "Одређује шта треба предузети када већ постоји фотографија са истим именом "
+#~ "међу преузетим или резервним."
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Одређује да ли треба уклонити знакове које не подржава оперативни систем из "
+#~ "назива датотека и фасцикли."
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Унета подешавања подфасцикли нису исправна.\n"
+#~ "Она ће бити враћена на подразумеване вредности."
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Не могу да образујем називе подфасцикли. Проверите да ли постоје потребни "
+#~ "метаподаци."
+
+#~ msgid "Download Folder"
+#~ msgstr "Фасциклe"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Направи резервну копију приликом преузимања фотографија"
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Приликом прављења резервне копије, уколико већ постоји фотографија са истим "
+#~ "именом, можете је преписати или прескочити."
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Уређаји са сликама могу бити фотоапарати, разне спољне меморије и покретни "
+#~ "дискови.\n"
+#~ "\n"
+#~ "Можете преузети фотографије са више уређаја одједном.\n"
+#~ "\n"
+#~ "<i>Уколико је преузимање фотографија директно са фотоапарата споро или не "
+#~ "ради, пробајте да подесите фотоапарат тако да ради у PTP режиму. Уколико то "
+#~ "није могуће, набавите спољни читач картица.</i>"
+
+#~ msgid "Image Rename"
+#~ msgstr "Преименовање"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"x-large\">Преименовање фотографија</span>\t"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Преименовање фотографија</b>"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr ""
+#~ "Фотографије имају исти назив датотека, али су  сликане у различито време:"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Уређај са сликама: %s\n"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Прва слика: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Друга слика: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Не могу да упишем датотеке у фасциклу за преузимање. Проверите облашћења "
+#~ "фасцикле или измените поставке"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Ова путања за слике не постоји:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Решите овај проблем или измените поставке."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Фасцикла за преузимање фотографија не постоји. Направите фасциклу или "
+#~ "иамените поставке"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Проблем са фасциклом за фотографије"
diff --git a/po/sv.po b/po/sv.po
index 0dcdd25..fb1a94f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,213 +7,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-21 00:48-0600\n"
-"PO-Revision-Date: 2010-01-21 11:50+0000\n"
-"Last-Translator: Ulf Urdén <ulf.urden@purplescout.com>\n"
+"POT-Creation-Date: 2010-05-27 22:33-0500\n"
+"PO-Revision-Date: 2010-05-28 04:48+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-21 19:24+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 19:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:379
+#: rapid/rapid.py:394
 msgid "New York"
 msgstr "New York"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Manila"
 msgstr "Manilla"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Prague"
 msgstr "Prag"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Helsinki"
 msgstr "Helsingfors"
 
-#: rapid/rapid.py:380
+#: rapid/rapid.py:395
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/rapid.py:381
+#: rapid/rapid.py:396
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Rome"
 msgstr "Rom"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Moscow"
 msgstr "Moskva"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/rapid.py:382
+#: rapid/rapid.py:397
 msgid "Warsaw"
 msgstr "Warszawa"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Jakarta"
 msgstr "Djakarta"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/rapid.py:383
+#: rapid/rapid.py:398
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:410
+#: rapid/rapid.py:425
 msgid "Invalid Downloads Today value.\n"
 msgstr "Felaktigt värde för 'Antal överföringar idag'.\n"
 
-#: rapid/rapid.py:411
+#: rapid/rapid.py:426
 msgid "Resetting value to zero.\n"
 msgstr "Nollställer värde.\n"
 
-#: rapid/rapid.py:450
+#: rapid/rapid.py:465
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Värdet på 'början på dagen' är korrupt\n"
 
-#: rapid/rapid.py:451
+#: rapid/rapid.py:466
 msgid "Resetting to midnight.\n"
 msgstr "Nollställer till midnatt.\n"
 
-#: rapid/rapid.py:480
-msgid "Error in Image Rename preferences"
-msgstr "Fel i inställningarna för bildnamnbyte"
+#: rapid/rapid.py:492
+msgid "Error in Photo Rename preferences"
+msgstr ""
 
-#: rapid/rapid.py:489 rapid/rapid.py:1341
+#: rapid/rapid.py:523 rapid/rapid.py:1567
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Följande inställningar innehåller fel:\n"
 
-#: rapid/rapid.py:500
+#: rapid/rapid.py:534
 msgid "Resetting to default values."
 msgstr "Återställer till standardvärde."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:571 rapid/renamesubfolderprefs.py:185
+#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
 msgid "Job code"
 msgstr "Fototillfälle"
 
-#: rapid/rapid.py:639
-msgid "Error in Download Subfolder preferences"
-msgstr "Fel i inställningar för överföring till underkataloger"
+#: rapid/rapid.py:677
+msgid "Error in Video Rename preferences"
+msgstr ""
+
+#: rapid/rapid.py:695
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:712
+msgid "Error in Video Download Subfolders preferences"
+msgstr ""
+
+#: rapid/rapid.py:745 rapid/rapid.py:1492
+msgid "photos and videos"
+msgstr ""
+
+#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
+msgid "photos"
+msgstr ""
 
-#: rapid/rapid.py:778
+#: rapid/rapid.py:880
 msgid "Select a folder to download photos to"
 msgstr "Välj en katalog att överföra bilder till"
 
-#: rapid/rapid.py:852
-msgid "Select an image folder"
-msgstr "Välj en bildkatalog"
+#: rapid/rapid.py:898
+msgid "Select a folder to download videos to"
+msgstr ""
 
-#: rapid/rapid.py:874
-msgid "Select a folder in which to backup images"
-msgstr "Välj en mapp för säkerhetskopiering av bilder"
+#: rapid/rapid.py:980
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr ""
+
+#: rapid/rapid.py:1002
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
+msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:966
+#: rapid/rapid.py:1095
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
-"the name. Please use other renaming options.</i>"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Varning:</b> Det finns inte tillräckligt med metadata i bildfilen för "
-"att skapa ett filnamn. Var god ändra inställningarna för namnbyte.</i>"
 
-#: rapid/rapid.py:987
+#: rapid/rapid.py:1129
 msgid ""
-"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Varning:</b> Det finns inte tillräckligt med metadata i bildfilen för "
-"att skapa ett namn för underkatalog. Var god ändra inställningarna för "
-"namnbyte av underkatalog.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:991
+#: rapid/rapid.py:1133
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Exempel: %s</i>"
 
-#: rapid/rapid.py:1009
+#: rapid/rapid.py:1159
 msgid ""
 "Downloads today value not updated, as a download is currently occurring"
 msgstr ""
 "Antal nedladdningar idag uppdateras inte, eftersom en överföring pågår"
 
-#: rapid/rapid.py:1025
+#: rapid/rapid.py:1175
 msgid "Stored number value not updated, as a download is currently occurring"
 msgstr "Lagrat nummervärde uppdateras inte, eftersom en överföring pågår"
 
-#: rapid/rapid.py:1050
-msgid "The subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:1205
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences had some unnecessary values removed."
 msgstr ""
-"Inställningar för underkataloger hade överflödiga värden som avlägsnades."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1055
+#: rapid/rapid.py:1210
+#, python-format
 msgid ""
-"The subfolder preferences entered are invalid and cannot be used.\n"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Inställningarna för underkataloger har ogiltiga värden.\n"
-" Använder standardvärden."
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
+msgid "photo"
+msgstr ""
+
+#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
+msgid "video"
+msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1267
+#: rapid/rapid.py:1468
 msgid "externaldrive1"
 msgstr "extern_enhet_1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1269
+#: rapid/rapid.py:1470
 msgid "externaldrive2"
 msgstr "extern_enhet_2"
 
+#: rapid/rapid.py:1494 rapid/rapid.py:1780
+msgid "photos or videos"
+msgstr ""
+
+#: rapid/rapid.py:1497
+msgid "videos"
+msgstr "video"
+
 #. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for images. It is visible initially in the progress bar for each device
-#. (which normally holds "x of y images copied").
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x of y photos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1330
+#: rapid/rapid.py:1556
 msgid "scanning..."
 msgstr "söker av..."
 
-#: rapid/rapid.py:1419 rapid/rapid.py:2800
+#: rapid/rapid.py:1663
+msgid "The following download path could not be created:\n"
+msgstr ""
+
+#: rapid/rapid.py:1664
+#, python-format
+msgid "%(path)s: "
+msgstr ""
+
+#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
+#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
+msgid "Download cannot proceed"
+msgstr "Kan inte fortsätta överföringen"
+
+#: rapid/rapid.py:1679 rapid/rapid.py:3381
 msgid "There is an error in the program preferences."
 msgstr "Det fanns ett fel i programinställningarna."
 
-#: rapid/rapid.py:1420
+#: rapid/rapid.py:1680
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -222,43 +271,38 @@ msgstr ""
 "Var god kontrollera programinställningarna, starta om programmet, och försök "
 "igen."
 
-#: rapid/rapid.py:1421 rapid/rapid.py:1422 rapid/rapid.py:1980
-#: rapid/rapid.py:1983
-msgid "Download cannot proceed"
-msgstr "Kan inte fortsätta överföringen"
-
 #. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of images that can be copied. For example, the user might see the following:
-#. '0 of 512 images copied'.
+#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
+#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1460 rapid/rapid.py:2177
+#: rapid/rapid.py:1791
 #, python-format
-msgid "0 of %s images copied"
-msgstr "0 av %s bilder överförda"
+msgid "0 of %(number)s %(filetypes)s"
+msgstr ""
 
 #. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
 #. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1803
 #, python-format
-msgid "Device scan complete: found %(number)s images on %(device)s"
+msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
 msgstr ""
-"Avsökning av enhet klar: hittade %(number)s bilder på enheten %(device)s"
 
-#: rapid/rapid.py:1478
+#: rapid/rapid.py:1810
 #, python-format
-msgid "Device scan complete: no images found on %s"
-msgstr "Avsökning av enhet klar: hittade inga bilder på enheten %s"
+msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgstr ""
 
-#: rapid/rapid.py:1509
-msgid "Image filename could not be generated"
-msgstr "Kunde inte skapa ett filnamn för bild"
+#: rapid/rapid.py:1844
+#, python-format
+msgid "%(filetype)s filename could not be generated"
+msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1511
+#: rapid/rapid.py:1846
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -267,15 +311,14 @@ msgstr ""
 "Källa: %(source)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1515
+#: rapid/rapid.py:1850
+#, python-format
 msgid ""
-"Image filename could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"%(filetype)s filename could not be properly generated. Check to ensure there "
+"is sufficient metadata."
 msgstr ""
-"Kunde inte skapa filenamn för bild. Kontrollera att bilden har tillräckligt "
-"med metadata."
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1851
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -288,7 +331,8 @@ msgstr ""
 "Mål: %(destination)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1525 rapid/rapid.py:1530 rapid/rapid.py:1783
+#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
+#: rapid/rapid.py:2207
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -297,21 +341,21 @@ msgstr ""
 "Källa: %(source)s\n"
 "Destination: %(destination)s"
 
-#: rapid/rapid.py:1527
+#: rapid/rapid.py:1861
 #, python-format
 msgid "Unique identifier '%s' added"
 msgstr "Lade till unik indentifierare \"%s\""
 
-#: rapid/rapid.py:1535
+#: rapid/rapid.py:1869 rapid/rapid.py:2270
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Källa: %(source)s"
 
-#: rapid/rapid.py:1542
+#: rapid/rapid.py:1877 rapid/rapid.py:1882
 msgid "Download copying error"
 msgstr "Överföringsfel"
 
-#: rapid/rapid.py:1543
+#: rapid/rapid.py:1878
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -322,84 +366,94 @@ msgstr ""
 "Mål: %(destination)s\n"
 "Fel: %(errorno)s %(strerror)s"
 
-#: rapid/rapid.py:1545 rapid/rapid.py:1819 rapid/rapid.py:1831
-msgid "The image was not copied."
-msgstr "Bilden överfördes inte."
+#: rapid/rapid.py:1880 rapid/rapid.py:1885
+#, python-format
+msgid "The %(filetype)s was not copied."
+msgstr ""
 
-#: rapid/rapid.py:1548
+#: rapid/rapid.py:1889
 msgid ""
-"Images detected with the same filenames, but taken at different times:"
-msgstr "Hittade bilder med samma filnamn, men tagna vid olika tillfällen:"
+"Photos detected with the same filenames, but taken at different times:"
+msgstr ""
 
-#: rapid/rapid.py:1549
+#: rapid/rapid.py:1890
 #, python-format
 msgid ""
-"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 msgstr ""
-"Första bilden: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Andra bilden: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
 
-#: rapid/rapid.py:1562
-msgid "Could not open image"
-msgstr "Kunde inte öppna bild"
+#: rapid/rapid.py:1914 rapid/rapid.py:1927
+#, python-format
+msgid "Could not open %(filetype)s"
+msgstr ""
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:1915 rapid/rapid.py:1928
 #, python-format
 msgid "Source: %s"
 msgstr "Källa: %s"
 
-#: rapid/rapid.py:1581
-msgid "Image has no metadata"
-msgstr "Bilden innehåller ingen metadata"
+#: rapid/rapid.py:1950
+#, python-format
+msgid "%(filetype)s has no metadata"
+msgstr ""
 
-#: rapid/rapid.py:1582
+#: rapid/rapid.py:1951
 #, python-format
 msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
+"Metadata is essential for generating subfolder and/or file names.\n"
 "Source: %s"
 msgstr ""
-"Metadata behövs för att kunna skapa underkataloger / filnamn.\n"
-"Källa: %s"
 
-#: rapid/rapid.py:1592
+#: rapid/rapid.py:1962
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+"sufficient metadata."
 msgstr ""
-"Namn på underkatalog kunde inte skapas. Var god kontrollera att det finns "
-"tillräckligt med metadata."
 
-#: rapid/rapid.py:1593
+#: rapid/rapid.py:1963
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
+"File: %(file)s\n"
 "Problem: %(problem)s"
 msgstr ""
-"Underkatalog: %(subfolder)s\n"
-"Bild: %(image)s\n"
-"Problem: %(problem)s"
 
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1744
+#: rapid/rapid.py:2147
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Ny dag påbörjad - nollställer dagens överföringar"
 
-#: rapid/rapid.py:1782
-msgid "Backup image already exists"
-msgstr "Bilden är redan säkerhetskopierad"
+#: rapid/rapid.py:2206
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/rapid.py:2210
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/rapid.py:2215
+#, python-format
+msgid "%(file_type)s not backed up to %(volume)s"
+msgstr ""
 
-#: rapid/rapid.py:1813 rapid/rapid.py:1828
+#: rapid/rapid.py:2217
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/rapid.py:2243 rapid/rapid.py:2260
 msgid "Backing up error"
 msgstr "Fel vid säkerhetskopiering"
 
-#: rapid/rapid.py:1814
+#: rapid/rapid.py:2244
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Målplatsen kunde inte skapas: %(directory)s\n"
 
-#: rapid/rapid.py:1816
+#: rapid/rapid.py:2246
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -408,12 +462,17 @@ msgstr ""
 "Källa: %(source)s\n"
 "Mål: %(destination)s\n"
 
-#: rapid/rapid.py:1818
+#: rapid/rapid.py:2248
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Fel: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:2249 rapid/rapid.py:2263
+#, python-format
+msgid "The %(file_type)s was not backed up."
+msgstr ""
+
+#: rapid/rapid.py:2261
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -424,274 +483,329 @@ msgstr ""
 "Mål: %(destination)s\n"
 "Fel: %(errno)s %(strerror)s"
 
+#: rapid/rapid.py:2269
+#, python-format
+msgid "%(file_type)s could not be backed up"
+msgstr ""
+
+#: rapid/rapid.py:2272
+msgid "No suitable backup volume was found"
+msgstr ""
+
+#: rapid/rapid.py:2274
+msgid "A backup location was not found"
+msgstr ""
+
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1844
+#: rapid/rapid.py:2288
 msgid "The device can now be safely removed"
 msgstr "Enheten kan nu avlägsnas säkert"
 
-#: rapid/rapid.py:1848
+#: rapid/rapid.py:2294
 #, python-format
-msgid "%s images downloaded"
-msgstr "%s bilder överförda"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr ""
 
-#: rapid/rapid.py:1850
+#: rapid/rapid.py:2297
 #, python-format
-msgid "%s images skipped"
-msgstr "hoppade över %s bilder"
+msgid "%(noFiles)s %(filetypes)s skipped"
+msgstr ""
 
-#: rapid/rapid.py:1856 rapid/rapid.py:3411
+#: rapid/rapid.py:2303 rapid/rapid.py:4027
 msgid "warnings"
 msgstr "varningar"
 
-#: rapid/rapid.py:1858 rapid/rapid.py:3413
+#: rapid/rapid.py:2305 rapid/rapid.py:4029
 msgid "errors"
 msgstr "fel"
 
-#: rapid/rapid.py:1887
-msgid "Backup device missing"
-msgstr "Enhet för säkerhetskopiering saknas"
-
-#: rapid/rapid.py:1887
-msgid "No backup device was detected."
-msgstr "Ingen enhet för säkerhetskopiering hittades"
-
-#: rapid/rapid.py:1891
-msgid "This device has no images to download from."
-msgstr "Enheten saknar bilder att överföra"
-
-#: rapid/rapid.py:1926
-#, python-format
-msgid "Download has started from %s"
-msgstr "Överföringen startade vid %s"
+#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
+msgid "Photo thumbnail could not be extracted"
+msgstr ""
 
-#: rapid/rapid.py:1974
+#: rapid/rapid.py:2358
 #, python-format
 msgid "Source: %s\n"
 msgstr "Källa: %s\n"
 
-#: rapid/rapid.py:1976
+#: rapid/rapid.py:2360
 #, python-format
-msgid "Image device: %s\n"
-msgstr "Bildenhet: %s\n"
+msgid "Device: %s\n"
+msgstr ""
 
-#: rapid/rapid.py:1977
+#: rapid/rapid.py:2361
 #, python-format
 msgid "Destination: %s"
 msgstr "Mål: %s"
 
-#: rapid/rapid.py:1978 rapid/rapid.py:1981
+#: rapid/rapid.py:2362 rapid/rapid.py:2365
 msgid "Could not create temporary download directory"
 msgstr "Kunde inte skapa temporär överföringskatalog"
 
-#: rapid/rapid.py:1981
+#: rapid/rapid.py:2365
 msgid "Error:"
 msgstr "Fel:"
 
-#: rapid/rapid.py:1992
-msgid "Image skipped"
-msgstr "Hoppade över bild"
+#: rapid/rapid.py:2382
+#, python-format
+msgid "This device has no %(types_searched_for)s to download from."
+msgstr ""
 
-#: rapid/rapid.py:1993
-msgid "Image overwritten"
-msgstr "Skrev över bild"
+#: rapid/rapid.py:2417
+#, python-format
+msgid "Download has started from %s"
+msgstr "Överföringen startade vid %s"
 
-#: rapid/rapid.py:1994
-msgid "Image already exists"
-msgstr "Bilden finns redan"
+#: rapid/rapid.py:2434
+msgid "Backup path does not exist"
+msgstr ""
+
+#: rapid/rapid.py:2435
+#, python-format
+msgid "The path %s could not be created"
+msgstr ""
+
+#: rapid/rapid.py:2436 rapid/rapid.py:2444
+msgid "No backups can occur"
+msgstr ""
+
+#: rapid/rapid.py:2442
+msgid "Backup device missing"
+msgstr "Enhet för säkerhetskopiering saknas"
 
-#: rapid/rapid.py:2043
-msgid "Image has no thumbnail"
-msgstr "Bilden saknar miniatyr"
+#: rapid/rapid.py:2443
+msgid "No backup device was automatically detected"
+msgstr ""
+
+#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
+msgid "Photo"
+msgstr ""
+
+#: rapid/rapid.py:2535
+msgid "Photo skipped"
+msgstr ""
+
+#: rapid/rapid.py:2536
+msgid "Photo already exists"
+msgstr ""
+
+#: rapid/rapid.py:2542 rapid/rapid.py:3343
+msgid "Video"
+msgstr ""
 
-#: rapid/rapid.py:2053
+#: rapid/rapid.py:2543
+msgid "Video skipped"
+msgstr ""
+
+#: rapid/rapid.py:2544
+msgid "Video already exists"
+msgstr ""
+
+#: rapid/rapid.py:2592
 #, python-format
-msgid "%(number)s of %(total)s images copied"
-msgstr "%(number)s av %(total)s bilder överförda"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr ""
 
-#: rapid/rapid.py:2068 rapid/rapid.py:2072
-msgid "Could not delete image from image device"
-msgstr "Kunde inte radera bilder från bildenhet"
+#: rapid/rapid.py:2607 rapid/rapid.py:2611
+msgid "Could not delete photo or video from device"
+msgstr ""
 
-#: rapid/rapid.py:2069
+#: rapid/rapid.py:2608
 #, python-format
 msgid ""
-"Image: %(source)s\n"
+"Photo: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
-"Bild: %(source)s\n"
-"Fel: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:2073
+#: rapid/rapid.py:2612
 #, python-format
-msgid "Image: %(source)s"
-msgstr "Bild: %(source)s"
+msgid "Photo: %(source)s"
+msgstr ""
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2614
 #, python-format
-msgid "Deleted %i images from image device"
-msgstr "Raderade %i bilder från bildenhet"
+msgid "Deleted %(number)i %(filetypes)s from device"
+msgstr ""
 
-#: rapid/rapid.py:2085
+#: rapid/rapid.py:2624
 #, python-format
 msgid "Download complete from %s"
 msgstr "Överföring från %s är klart"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2161
+#: rapid/rapid.py:2700
 msgid "Device"
 msgstr "Enhet"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2166
+#: rapid/rapid.py:2705
 msgid "Size"
 msgstr "Storlek"
 
-#: rapid/rapid.py:2169
+#: rapid/rapid.py:2708
 msgid "Download Progress"
 msgstr "Överföringsförlopp"
 
-#: rapid/rapid.py:2285 rapid/rapid.py:2291
-msgid "Thumbnail cannot be displayed"
-msgstr "Kunde inte skapa miniatyr"
-
-#: rapid/rapid.py:2286 rapid/rapid.py:2292
+#: rapid/rapid.py:2824 rapid/rapid.py:2839
 msgid "It may be corrupted"
 msgstr "Den kan vara korrupt"
 
-#: rapid/rapid.py:2318
+#: rapid/rapid.py:2869
 msgid "Device Detected"
 msgstr "Enhet hittad"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2327
-msgid "Should this device or partition be used to download images from?"
-msgstr "Vill du överföra bilder från den här enheten eller partitionen?"
+#: rapid/rapid.py:2878
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:2897
 msgid "_Remember this choice"
 msgstr "_Kom ihåg mitt val"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2934
 #, python-format
 msgid "%s selected for downloading from"
 msgstr "%s bilder valda för överföring från"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2937
 msgid "This device or partition will always be used to download from"
 msgstr "Bilder kommer alltid att överföras från denna enhet"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2940
 #, python-format
 msgid "%s rejected as a download device"
 msgstr "%s nekades som överföringsenhet"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2392
+#: rapid/rapid.py:2943
 msgid "This device or partition will never be used to download from"
 msgstr "Bilder kommer aldrig att överföras från denna enhet"
 
-#: rapid/rapid.py:2399
+#: rapid/rapid.py:2950
 msgid "Remove all Job Codes?"
 msgstr "Ta bort alla fototillfällen?"
 
-#: rapid/rapid.py:2416
+#: rapid/rapid.py:2967
 msgid "Should all Job Codes be removed?"
 msgstr "Vill du ta bort alla fototillfällen?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2444
+#: rapid/rapid.py:2995
 msgid "Enter a Job Code"
 msgstr "Ange fototillfälle"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2462
+#: rapid/rapid.py:3013
 msgid "Enter a new job code, or select a previous one."
 msgstr "Ange ett nytt fototillfälle, eller välj ett tidigare."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2465
+#: rapid/rapid.py:3016
 msgid "Enter a new job code."
 msgstr "Ange ett nytt fototillfälle."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3021
 msgid "Job Code:"
 msgstr "Fototillfälle:"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3068
 msgid "Job Code entered"
 msgstr "Ett fototillfälle angavs"
 
-#: rapid/rapid.py:2519
+#: rapid/rapid.py:3070
 msgid "Job Code not entered"
 msgstr "Inget fototillfälle angivet"
 
-#: rapid/rapid.py:2763
+#: rapid/rapid.py:3330
 #, python-format
 msgid ""
-"Sorry, this image location does not exist:\n"
+"Sorry, this device location does not exist:\n"
 "%(path)s\n"
 "\n"
 "Please resolve the problem, or modify your preferences."
 msgstr ""
-"Beklagar, men bildplatsen finns inte:\n"
-"%(path)s\n"
-"\n"
-"Var vänlig lös problemet, eller ändra inställningarna."
 
-#: rapid/rapid.py:2767
-msgid "Problem with Image Location Folder"
-msgstr "Problem med bildkatalogen"
+#: rapid/rapid.py:3334
+msgid "Problem with Device Location Folder"
+msgstr ""
 
-#: rapid/rapid.py:2777
-msgid ""
-"Sorry, the Download Folder does not exist. Please create the folder, or "
-"modify your preferences"
+#: rapid/rapid.py:3350
+#, python-format
+msgid "The %(file_type)s Download Folder does not exist.\n"
 msgstr ""
-"Beklagar, men överföringskatalogen finns inte. Skapa katalogen, eller ändra "
-"inställningarna"
 
-#: rapid/rapid.py:2784
+#: rapid/rapid.py:3359
+#, python-format
+msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgstr ""
+
+#: rapid/rapid.py:3364
 msgid ""
-"Sorry, the Download Folder exists but cannot be written to. Please check the "
-"folder's permissions, or modify your preferences"
+"Sorry, problems were encountered with your download folders. Please fix the "
+"problems or modify the preferences.\n"
+"\n"
 msgstr ""
-"Beklagar, men det går inte att skriva till överföringskatalogen. Ändra "
-"katalogens rättigheter eller inställningarna"
 
-#: rapid/rapid.py:2790
+#: rapid/rapid.py:3367
 msgid "Problem with Download Folder"
 msgstr "Fel med bildöverföringskatalogen"
 
-#: rapid/rapid.py:2801
+#: rapid/rapid.py:3369
+msgid "Problem with Download Folders"
+msgstr ""
+
+#: rapid/rapid.py:3382
 msgid "Some preferences will be reset."
 msgstr "Några inställningar kommer att återställas"
 
-#: rapid/rapid.py:2835
+#: rapid/rapid.py:3416
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Frågar om %s ska användas"
 
-#: rapid/rapid.py:2863
+#: rapid/rapid.py:3444
 msgid "Prompting for Job Code"
 msgstr "Frågar om fototillfälle"
 
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:3448
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Visar redan fråga om fototillfälle, fråga inte igen"
 
-#: rapid/rapid.py:2882
+#: rapid/rapid.py:3463
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Påbörjar överföringar som har väntat på fototillfälle"
 
-#: rapid/rapid.py:2886
+#: rapid/rapid.py:3467
 msgid "Starting downloads"
 msgstr "Påbörjar överföring"
 
-#: rapid/rapid.py:2916
+#: rapid/rapid.py:3482
+#, python-format
+msgid "Creating photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3487
+#, python-format
+msgid "Failed to create default photo download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3491
+#, python-format
+msgid "Creating video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3496
+#, python-format
+msgid "Failed to create default video download folder %(folder)s"
+msgstr ""
+
+#: rapid/rapid.py:3521
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -699,34 +813,34 @@ msgstr ""
 "En nyare version av det här programmet har startats.\n"
 "\n"
 
-#: rapid/rapid.py:2918
+#: rapid/rapid.py:3523
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr ""
 "Inställningarna ser korrekta ut, men kontrollera dem för att vara säker."
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:3525
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Beklagar, några av inställningarna innehåller fel och kommer att återställas."
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:3526
 msgid "Warning:"
 msgstr "Varning:"
 
-#: rapid/rapid.py:2926
+#: rapid/rapid.py:3531
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
 "Programmet är av en nyare version än tidigare, kontrollerar inställningar."
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3538
 msgid "Preferences were modified."
 msgstr "Inställningarna har ändrats."
 
-#: rapid/rapid.py:2934
+#: rapid/rapid.py:3539
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -736,11 +850,11 @@ msgstr ""
 "Denna versionen av programmet använder andra inställningar än äldre "
 "versioner. Inställningarna har därför uppdaterats."
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3543
 msgid "No preferences needed to be changed."
 msgstr "Inga inställningar behöver ändras."
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3545
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
@@ -750,116 +864,129 @@ msgstr ""
 "versioner. Några av inställningarna var felaktiga och kunde inte uppdateras. "
 "De kommer därför att återställas."
 
-#: rapid/rapid.py:2949
+#: rapid/rapid.py:3555
 msgid "Problem using pynotify."
 msgstr "Ett problem uppstod vid användning av pynotify."
 
-#: rapid/rapid.py:2965
+#: rapid/rapid.py:3571
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Kunde inte ta emot serveregenskaper från pynotify."
 
-#: rapid/rapid.py:2974
+#: rapid/rapid.py:3580
 msgid ""
 "Warning: desktop environment notification server is incorrectly configured."
 msgstr "Varning: notifieringssystemets server är felaktigt konfigurerad"
 
-#: rapid/rapid.py:3017
+#: rapid/rapid.py:3626
 msgid "and"
 msgstr "och"
 
-#: rapid/rapid.py:3022
+#: rapid/rapid.py:3631
 msgid "Using backup devices"
 msgstr "Använder enheter för säkerhetskopiering"
 
-#: rapid/rapid.py:3024
+#: rapid/rapid.py:3633
 msgid "Using backup device"
 msgstr "Använder enhet för säkerhetskopiering"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3635
 msgid "No backup devices detected"
 msgstr "Inga enheter för säkerhetskopiering hittades"
 
-#: rapid/rapid.py:3065 rapid/rapid.py:3221
+#: rapid/rapid.py:3674 rapid/rapid.py:3831
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr "Enhete %(device)s (%(path)s) ignorerades"
 
-#: rapid/rapid.py:3180
+#: rapid/rapid.py:3790
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Hittade %(device)s med sökvägen %(path)s"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3794
 msgid "Automatically start download is true"
 msgstr "Automatisk överföring är aktiverad"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3796
 msgid "Automatically start download is false"
 msgstr "Automatisk överföring är avaktiverad"
 
-#: rapid/rapid.py:3239
+#: rapid/rapid.py:3849
 msgid "Using manually specified path"
 msgstr "Använder manuell sökväg"
 
-#: rapid/rapid.py:3357 rapid/rapid.py:3406
+#: rapid/rapid.py:3857
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr ""
+
+#: rapid/rapid.py:3968 rapid/rapid.py:4017
 msgid "All downloads complete"
 msgstr "Alla överföringar klara"
 
-#: rapid/rapid.py:3371
+#: rapid/rapid.py:3982
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3992
 msgid "About 1 second remaining"
 msgstr "Cirka en sekund återstår"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3994
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Cirka %i sekunder återstår"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3996
 msgid "About 1 minute remaining"
 msgstr "Cirka en minut återstår"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3390
+#: rapid/rapid.py:4001
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Ungefär %(minutes)i:%(seconds)02i minuter återstår"
 
-#: rapid/rapid.py:3407
-msgid "images downloaded"
-msgstr "bilder överförda"
+#: rapid/rapid.py:4019
+msgid "photos downloaded"
+msgstr ""
 
-#: rapid/rapid.py:3409
-msgid "images skipped"
-msgstr "bilder skippade"
+#: rapid/rapid.py:4021
+msgid "photos skipped"
+msgstr ""
+
+#: rapid/rapid.py:4023
+msgid "videos downloaded"
+msgstr ""
+
+#: rapid/rapid.py:4025
+msgid "videos skipped"
+msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3509
+#: rapid/rapid.py:4125
 msgid "_Download "
 msgstr "_Överför "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3519
+#: rapid/rapid.py:4135
 msgid "_Pause"
 msgstr "_Paus"
 
-#: rapid/rapid.py:3593
+#: rapid/rapid.py:4209
 msgid "Preferences were changed."
 msgstr "Inställningar ändrades"
 
-#: rapid/rapid.py:3788
+#: rapid/rapid.py:4407
 msgid "Goodbye"
 msgstr "Farväl"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3799
+#: rapid/rapid.py:4418
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -868,337 +995,386 @@ msgstr ""
 "visa programinformation på kommandoraden när programmet körs (standardvärde: "
 "%default)"
 
-#: rapid/rapid.py:3800
+#: rapid/rapid.py:4419
 msgid "only output errors to the command line"
 msgstr "Visa fel endast på kommandoraden"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3802
-msgid "list image file extensions the program recognizes and exit"
-msgstr "visa filändelser för bildformat som programmet hanterar och avsluta"
+#: rapid/rapid.py:4421
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr ""
+
+#: rapid/rapid.py:4422
+msgid "reset all program settings and preferences and exit"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Photos:"
+msgstr ""
+
+#: rapid/rapid.py:4431
+msgid "Videos:"
+msgstr ""
 
-#: rapid/rapid.py:3815
+#: rapid/rapid.py:4436
 #, python-format
 msgid "and %s"
 msgstr "och %s"
 
+#: rapid/rapid.py:4444
+msgid "All settings and preferences have been reset"
+msgstr ""
+
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3820 rapid/rapid.py:3823
+#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
+#: rapid/rapid.py:4456 rapid/rapid.py:4460
 msgid "Using"
 msgstr "Använder"
 
+#: rapid/rapid.py:4453
+msgid "\n"
+msgstr "\n"
+
 #. this application is already running
-#: rapid/rapid.py:3837
+#: rapid/rapid.py:4477
 #, python-format
 msgid "%s is already running"
 msgstr "%s körs redan"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:190
 msgid "Date time"
 msgstr "Datumtid"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:191
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:192
 msgid "Filename"
 msgstr "Filnamn"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:193
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/renamesubfolderprefs.py:183
+#: rapid/renamesubfolderprefs.py:194
 msgid "Sequences"
 msgstr "Sekvenser"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:197
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:198
+msgid "Video date"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:199
 msgid "Today"
 msgstr "Idag"
 
-#: rapid/renamesubfolderprefs.py:188
+#: rapid/renamesubfolderprefs.py:200
 msgid "Yesterday"
 msgstr "Igår"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:190
+#: rapid/renamesubfolderprefs.py:202
 msgid "Name + extension"
 msgstr "Namn + filändelse"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/renamesubfolderprefs.py:204
 msgid "Name"
 msgstr "Namn"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/renamesubfolderprefs.py:206
 msgid "Extension"
 msgstr "Filändelse"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/renamesubfolderprefs.py:208
 msgid "Image number"
 msgstr "Bildnummer"
 
+#: rapid/renamesubfolderprefs.py:209
+msgid "Video number"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/renamesubfolderprefs.py:211
 msgid "Aperture"
 msgstr "Bländare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/renamesubfolderprefs.py:213
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/renamesubfolderprefs.py:215
 msgid "Exposure time"
 msgstr "Bländartid"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/renamesubfolderprefs.py:217
 msgid "Focal length"
 msgstr "Brännvidd"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/renamesubfolderprefs.py:219
 msgid "Camera make"
 msgstr "Kameratillverkare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/renamesubfolderprefs.py:221
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/renamesubfolderprefs.py:223
 msgid "Short camera model"
 msgstr "Förkortning på kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/renamesubfolderprefs.py:225
 msgid "Hyphenated short camera model"
 msgstr "Utökad förkortning på kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/renamesubfolderprefs.py:227
 msgid "Serial number"
 msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/renamesubfolderprefs.py:229
 msgid "Shutter count"
 msgstr "Antal exponeringar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/renamesubfolderprefs.py:231
 msgid "Owner name"
 msgstr "Ägarens namn"
 
+#: rapid/renamesubfolderprefs.py:232
+msgid "Codec"
+msgstr "Kodek"
+
+#: rapid/renamesubfolderprefs.py:233
+msgid "Width"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:234
+msgid "Height"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:235
+msgid "Length"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:236
+msgid "Frames Per Second"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/renamesubfolderprefs.py:238
 msgid "Downloads today"
 msgstr "Överföringar idag"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/renamesubfolderprefs.py:240
 msgid "Session number"
 msgstr "Sessionsnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/renamesubfolderprefs.py:242
 msgid "Subfolder number"
 msgstr "Nummer på underkatalog"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/renamesubfolderprefs.py:244
 msgid "Stored number"
 msgstr "Tidigare sekvensnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/renamesubfolderprefs.py:246
 msgid "Sequence letter"
 msgstr "Sekvensbokstav"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/renamesubfolderprefs.py:248
 msgid "All digits"
 msgstr "Alla siffror"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/renamesubfolderprefs.py:250
 msgid "Last digit"
 msgstr "Senaste siffra"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/renamesubfolderprefs.py:252
 msgid "Last 2 digits"
 msgstr "Senaste två siffrorna"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/renamesubfolderprefs.py:254
 msgid "Last 3 digits"
 msgstr "Senaste tre siffrorna"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/renamesubfolderprefs.py:256
 msgid "Last 4 digits"
 msgstr "Senaste fyra siffrorna"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/renamesubfolderprefs.py:258
 msgid "Original Case"
 msgstr "Använd ursprungligt skiftläge"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/renamesubfolderprefs.py:260
 msgid "UPPERCASE"
 msgstr "VERSALER"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:262
 msgid "lowercase"
 msgstr "gemener"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:263
 msgid "One digit"
 msgstr "En siffra"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:264
 msgid "Two digits"
 msgstr "Två siffror"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:265
 msgid "Three digits"
 msgstr "Tre siffror"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:266
 msgid "Four digits"
 msgstr "Fyra siffror"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:267
 msgid "Five digits"
 msgstr "Fem siffror"
 
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/renamesubfolderprefs.py:268
 msgid "Six digits"
 msgstr "Sex siffror"
 
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/renamesubfolderprefs.py:269
 msgid "Seven digits"
 msgstr "Sju siffror"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:271
 msgid "Subseconds"
 msgstr "Sekunder"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:275
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:277
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:279
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:281
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:283
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:285
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:287
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:289
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:291
 msgid "YYYY"
 msgstr "ÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:293
 msgid "YY"
 msgstr "ÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:295
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:297
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:299
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:301
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:303
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:305
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:307
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:309
 msgid "MM (minutes)"
 msgstr "MM (minuter)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/renamesubfolderprefs.py:311
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:710
+#: rapid/renamesubfolderprefs.py:794
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1207,53 +1383,64 @@ msgstr ""
 "Inställningen '%(key)s' är ogiltig.\n"
 "Förväntat värde är något av %(value)s"
 
-#: rapid/renamesubfolderprefs.py:717
+#: rapid/renamesubfolderprefs.py:801
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Inställningen '%(value)s' är ogiltig"
 
-#: rapid/renamesubfolderprefs.py:721
+#: rapid/renamesubfolderprefs.py:805
 msgid "These preferences are not well formed:"
 msgstr "Följande inställningar är ogiltiga:"
 
-#: rapid/renamesubfolderprefs.py:831
-msgid "Subsecond metadata not present in image"
-msgstr "Metadata för sekunder finns inte i bilden"
+#: rapid/renamesubfolderprefs.py:934
+msgid "Subsecond metadata not present in photo"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#: rapid/renamesubfolderprefs.py:941
 #, python-format
-msgid "%s metadata is not present in image"
-msgstr "%s metadata finns inte i bilden"
+msgid "%s metadata is not present"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
+#: rapid/renamesubfolderprefs.py:977
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr "Fel i komponenten för datumtid. Värdet %s verkar ogiltigt"
 
-#: rapid/renamesubfolderprefs.py:897
-msgid "extension was specified but image name has no extension"
-msgstr "filändelse angavs men bilden saknar filändelse"
+#: rapid/renamesubfolderprefs.py:1004
+msgid "extension was specified but filename does not have an extension"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:901
-msgid "image number was specified but image filename has no number"
-msgstr "Bildnummer angavs men filnamnet saknar nummer"
+#: rapid/renamesubfolderprefs.py:1008
+msgid "image or video number was specified but filename has no number"
+msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1088
+#: rapid/renamesubfolderprefs.py:1081
+#, python-format
+msgid "%s metadata is not present in photo"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1194
 #, python-format
 msgid "error generating name with component %s"
 msgstr "ett fel uppstod med komponenten %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1450
+#, python-format
+msgid "%s metadata is not present in video"
+msgstr ""
+
+#: rapid/renamesubfolderprefs.py:1546
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Inställningen för underkataloger skall inte börja med %s"
 
-#: rapid/renamesubfolderprefs.py:1389
+#: rapid/renamesubfolderprefs.py:1548
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Inställning för underkatalog skall inte börja med %s"
 
-#: rapid/renamesubfolderprefs.py:1393
+#: rapid/renamesubfolderprefs.py:1552
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Inställning för underkatalog skall inte innehålla två %s i rad"
@@ -1283,36 +1470,36 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompatibilitet med andra operativsystem</b>"
 
 #: rapid/glade3/rapid.glade.h:7
+msgid "<b>Devices</b>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:8
 msgid "<b>Download Folder</b>"
 msgstr "<b>Överföringskatalog</b>"
 
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/rapid.glade.h:9
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Underkataloger till överföring</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/rapid.glade.h:10
 msgid "<b>Example</b>"
 msgstr "<b>Exempel</b>"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Image Devices</b>"
-msgstr "<b>Bildenheter</b>"
-
 #: rapid/glade3/rapid.glade.h:11
-msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Bildnamnskonflikter</b>"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Fototillfällen</b>"
 
 #: rapid/glade3/rapid.glade.h:12
-msgid "<b>Image Rename</b>"
-msgstr "<b>Namnbyte av bilder</b>"
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Saknade enheter för säkerhetskopiering</b>"
 
 #: rapid/glade3/rapid.glade.h:13
-msgid "<b>Job Codes</b>"
-msgstr "<b>Fototillfällen</b>"
+msgid "<b>Photo Rename</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:14
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Saknade enheter för säkerhetskopiering</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:15
 msgid "<b>Program Automation</b>"
@@ -1327,8 +1514,8 @@ msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/extern_enhet/Photos</i>"
 
 #: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example: /home/user/photos</i>"
-msgstr "<i>Exempel: /home/user/photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:19
 msgid "<i>Example:</i>"
@@ -1351,24 +1538,24 @@ msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Säkerhetskopiering</span>\t"
 
 #: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Katalog för överföring</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Felhantering</span>"
 
 #: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Bildenheter</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Fototillfällen</span>"
 
 #: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Namnbyte av bilder</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Fototillfällen</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
@@ -1376,42 +1563,46 @@ msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Alternativ för namnbyte</span>"
 
 #: rapid/glade3/rapid.glade.h:30
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:32
 msgid "Add unique identifier"
 msgstr "Lägg till unik identifierare"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/rapid.glade.h:33
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Hitta bärbara lagringsenheter automatiskt"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/rapid.glade.h:34
 msgid "Automatically detect backup devices"
 msgstr "Hitta enheter för säkerhetskopiering automatiskt"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect image devices"
-msgstr "Hitta bildenheter automatiskt"
+#: rapid/glade3/rapid.glade.h:35
+msgid "Automatically detect devices"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/rapid.glade.h:36
 msgid "Automation"
 msgstr "Automatisering"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/rapid.glade.h:37
 msgid "Backup"
 msgstr "Säkerhetskopiering"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup folder name:"
-msgstr "Katalog för säkerhetskopiering:"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/rapid.glade.h:38
 msgid "Backup location:"
 msgstr "Plats för säkerhetskopior:"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos when downloading"
-msgstr "Säkerhetskopiera bilder vid överföring"
-
 #: rapid/glade3/rapid.glade.h:39
+msgid "Backup photos and videos when downloading"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1419,66 +1610,83 @@ msgstr ""
 "Ange en katalog för överföring. Underkataloger kommer att skapas automatiskt "
 "enligt strukturen nedan."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/rapid.glade.h:41
 msgid ""
-"Choose whether to skip downloading the image, or to add a unique indentifier."
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Välj att antingen hoppa över bilden, eller att lägga till en unik "
-"identifierare."
 
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:42
+msgid ""
+"Choose whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:43
 msgid "Copyright Damon Lynch 2007-10"
 msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:44
 msgid "Day start:"
 msgstr "Början på dagen:"
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete images from image device upon download completion"
-msgstr "Radera bilder från bildenhet när bildöverföring är färdig"
+#: rapid/glade3/rapid.glade.h:45
+msgid "Delete photos and videos from device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:46
+msgid "Devices"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:47
+msgid ""
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple devices simultaneously, or you can "
+"specify a location on your hard drive.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:52
 msgid "Download / Pause"
 msgstr "Överföring / Paus"
 
-#: rapid/glade3/rapid.glade.h:45
-msgid "Download Folder"
-msgstr "Katalog för överföring"
-
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:53
 msgid "Download folder:"
 msgstr "Katalog för överföring:"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:54
 msgid "Downloads today:"
 msgstr "Antal överföringar idag:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:55
 msgid "Error Handling"
 msgstr "Felhantering"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:56
 msgid "Error Log"
 msgstr "Fellogg"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Exit program after completion of successful download"
-msgstr "Avsluta programmet efter lyckad överföring"
+#: rapid/glade3/rapid.glade.h:57
+msgid "Exit program if download completes without any warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:58
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Om du avaktiverar automatisk sökning av enheter för säkerhetkopiering, ange "
 "istället en plats."
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:59
 msgid ""
-"If you disable automatic detection, choose the exact location of the images."
+"If you disable automatic detection, choose the exact location of the images "
+"and videos."
 msgstr ""
-"Om du avaktiverar automatisk sökning av bildenheter, ange istället en plats."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:60
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1487,63 +1695,47 @@ msgstr ""
 "Om du avaktiverar automatisk sökning av bärbara lagringsenheter, ange "
 "istället en plats."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:61
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Image Devices"
-msgstr "Bildenheter"
-
-#: rapid/glade3/rapid.glade.h:56
-msgid "Image Rename"
-msgstr "Namnbyte"
-
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"Image devices are devices from which to download photos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple image devices simultaneously.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-"Bildenheter är enheter som bilder kan överföras från, t.ex. kameror, "
-"minneskort eller bärbara lagringsenheter.\n"
-"\n"
-"Du kan överföra bilder från flera olika platser samtidigt.\n"
-"\n"
-"<i>Om det fungerar dåligt eller inte alls att överföra bilder från din "
-"kamera, prova att sätta den i PTP-läge. Om det inte är möjligt, överväg att "
-"använda en minneskortläsare.</i>"
-
 #: rapid/glade3/rapid.glade.h:62
-msgid "Image location:"
-msgstr "Bildplats:"
+msgid "Import your photos and videos efficiently and reliably"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:63
-msgid "Import your images efficiently and reliably"
-msgstr "Överför dina bilder snabbt och säkert"
-
-#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Fototillfällen"
 
+#: rapid/glade3/rapid.glade.h:64
+msgid "Location:"
+msgstr ""
+
 #: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Ersätt"
 
 #: rapid/glade3/rapid.glade.h:66
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:67
+msgid "Photo Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "Photo backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:69
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Inställningar: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/rapid.glade.h:71
 msgid "R_emove All"
 msgstr "_Ta bort alla"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/rapid.glade.h:73
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1573,41 +1765,42 @@ msgstr ""
 "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:78
 msgid "Rename Options"
 msgstr "Inställningar för namnbyte"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:79
 msgid "Report a warning"
 msgstr "Rapportera en varning"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:80
 msgid "Report an error"
 msgstr "Rapportera ett fel"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:81
 msgid "Skip"
 msgstr "Hoppa över"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:82
 msgid "Skip download"
 msgstr "Hoppa över överföring"
 
-#: rapid/glade3/rapid.glade.h:80
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install the <i>kaa metadata</i> package for python."
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:84
 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 this name.</i>"
+"a folder in it with one of these names.</i>"
 msgstr ""
-"Ange i vilken katalog säkerhetskopior finns på enheten.\n"
-"\n"
-"<i>Notera att detta katalognamn också kommer att användas för att avgöra om "
-"enheten används för säkerhetskopior. Skapa en katalog med samma namn på "
-"andra enheter du vill använda för säkerhetskopior.</i>"
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:87
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1615,110 +1808,158 @@ msgstr ""
 "Ange tiden i 24-timmarsformat då <i>Antal överföringar idag</i> ska "
 "nollställas."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:88
 msgid ""
-"Specify what to do when an image of the same name has already been "
+"Specify what to do when a photo or video of the same name has already been "
 "downloaded or backed up."
-msgstr "Ange vad som hända när en bild med samma namn redan har överförts."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:89
 msgid "Specify what to do when there are no backup devices."
 msgstr ""
 "Ange vad som ska hända när det inte finns några enheter för "
 "säkerhetskopiering."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:90
 msgid ""
-"Specify whether image and folder names should have any characters removed "
-"that are not allowed by other operating systems."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
-"Ange om tecken i fil- eller katalognamn som inte stöds av andra "
-"operativsystem ska avlägsnas."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:91
 msgid "Start downloading at program startup"
 msgstr "Börja överföring vid programstart"
 
-#: rapid/glade3/rapid.glade.h:88
-msgid "Start downloading upon image device insertion"
-msgstr "Börja överföring vid inkoppling av enhet"
+#: rapid/glade3/rapid.glade.h:92
+msgid "Start downloading upon device insertion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:93
 msgid "Stored number:"
 msgstr "Lagrat nummer:"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:94
 msgid "Strip incompatible characters"
 msgstr "Avlägsna inkompatibla tecken"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/rapid.glade.h:95
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synkronisera RAW och JPEG-sekvensnummer"
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Unmount (\"eject\") image device upon download completion"
-msgstr "Mata ut enhet när överföring är klar"
+#: rapid/glade3/rapid.glade.h:96
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:97
+msgid "Video Folders"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "Video backup folder name:"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:100
 msgid ""
-"When backing up, choose whether to overwrite an image on the backup device "
+"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 bilder med samma filnamn på enheten för säkerhetskopiering ska "
-"ersättas, eller hoppas över."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:101
 msgid ""
-"You can have your photos backed up to multiple locations as they are "
-"downloaded, e.g. external hard drives."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Du kan säkerhetskopiera bilder till flera platser när de överförs, t.ex. "
-"externa hårddiskar."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Add..."
 msgstr "_Lägg till..."
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Clear Completed Downloads"
 msgstr "_Töm slutförda överföringar"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Error Log"
 msgstr "_Fellogg"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:105
 msgid "_Get Help Online..."
 msgstr "_Få hjälp online"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:106
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:107
 msgid "_Make a Donation..."
 msgstr "_Donera..."
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:108
 msgid "_Photos"
 msgstr "_Bilder"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:109
 msgid "_Report a Problem..."
 msgstr "_Rapportera ett fel..."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:110
 msgid "_Thumbnails"
 msgstr "_Miniatyrbilder"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:111
 msgid "_Translate this Application..."
 msgstr "_Översätt programmet..."
 
-#: rapid/glade3/rapid.glade.h:105
+#: rapid/glade3/rapid.glade.h:112
 msgid "_View"
 msgstr "_Visa"
 
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "Fel i inställningarna för bildnamnbyte"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "Fel i inställningar för överföring till underkataloger"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Välj en bildkatalog"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Välj en mapp för säkerhetskopiering av bilder"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr ""
+#~ "Inställningar för underkataloger hade överflödiga värden som avlägsnades."
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "Inställningarna för underkataloger har ogiltiga värden.\n"
+#~ " Använder standardvärden."
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 av %s bilder överförda"
+
+#, python-format
+#~ msgid "Device scan complete: found %(number)s images on %(device)s"
+#~ msgstr ""
+#~ "Avsökning av enhet klar: hittade %(number)s bilder på enheten %(device)s"
+
+#~ msgid "Image filename could not be generated"
+#~ msgstr "Kunde inte skapa ett filnamn för bild"
+
+#~ msgid ""
+#~ "Image filename could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Kunde inte skapa filenamn för bild. Kontrollera att bilden har tillräckligt "
+#~ "med metadata."
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -1729,9 +1970,65 @@ msgstr "_Visa"
 #~ "Mål: %(destination)s\n"
 #~ "Problem: %(problem)s"
 
+#~ msgid "Could not open image"
+#~ msgstr "Kunde inte öppna bild"
+
+#~ msgid "Image has no metadata"
+#~ msgstr "Bilden innehåller ingen metadata"
+
+#, python-format
+#~ msgid ""
+#~ "Metadata is essential for generating subfolders / image names.\n"
+#~ "Source: %s"
+#~ msgstr ""
+#~ "Metadata behövs för att kunna skapa underkataloger / filnamn.\n"
+#~ "Källa: %s"
+
+#~ msgid ""
+#~ "Subfolder name could not be properly generated. Check to ensure there is "
+#~ "sufficient image metadata."
+#~ msgstr ""
+#~ "Namn på underkatalog kunde inte skapas. Var god kontrollera att det finns "
+#~ "tillräckligt med metadata."
+
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Underkatalog: %(subfolder)s\n"
+#~ "Bild: %(image)s\n"
+#~ "Problem: %(problem)s"
+
+#~ msgid "The image was not copied."
+#~ msgstr "Bilden överfördes inte."
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Bilden är redan säkerhetskopierad"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
 
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "the name. Please use other renaming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Varning:</b> Det finns inte tillräckligt med metadata i bildfilen för "
+#~ "att skapa ett filnamn. Var god ändra inställningarna för namnbyte.</i>"
+
+#~ msgid ""
+#~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+#~ "subfolders. Please use other subfolder naming options.</i>"
+#~ msgstr ""
+#~ "<i><b>Varning:</b> Det finns inte tillräckligt med metadata i bildfilen för "
+#~ "att skapa ett namn för underkatalog. Var god ändra inställningarna för "
+#~ "namnbyte av underkatalog.</i>"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "hoppade över %s bilder"
+
 #, python-format
 #~ msgid ""
 #~ "Destination directory could not be created\n"
@@ -1741,3 +2038,251 @@ msgstr "_Visa"
 #~ "Målkatalog kunde inte skapas\n"
 #~ "%(directory)s\n"
 #~ "Fel: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s bilder överförda"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Skrev över bild"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Ingen enhet för säkerhetskopiering hittades"
+
+#~ msgid "This device has no images to download from."
+#~ msgstr "Enheten saknar bilder att överföra"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "Bilden saknar miniatyr"
+
+#~ msgid "Image already exists"
+#~ msgstr "Bilden finns redan"
+
+#~ msgid "Image skipped"
+#~ msgstr "Hoppade över bild"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Kunde inte skapa miniatyr"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s av %(total)s bilder överförda"
+
+#~ msgid "images skipped"
+#~ msgstr "bilder skippade"
+
+#~ msgid "images downloaded"
+#~ msgstr "bilder överförda"
+
+#~ msgid "list image file extensions the program recognizes and exit"
+#~ msgstr "visa filändelser för bildformat som programmet hanterar och avsluta"
+
+#~ msgid "Subsecond metadata not present in image"
+#~ msgstr "Metadata för sekunder finns inte i bilden"
+
+#, python-format
+#~ msgid "%s metadata is not present in image"
+#~ msgstr "%s metadata finns inte i bilden"
+
+#~ msgid "extension was specified but image name has no extension"
+#~ msgstr "filändelse angavs men bilden saknar filändelse"
+
+#~ msgid "image number was specified but image filename has no number"
+#~ msgstr "Bildnummer angavs men filnamnet saknar nummer"
+
+#~ msgid "<b>Image Rename</b>"
+#~ msgstr "<b>Namnbyte av bilder</b>"
+
+#~ msgid "<i>Example: /home/user/photos</i>"
+#~ msgstr "<i>Exempel: /home/user/photos</i>"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Bildnamnskonflikter</b>"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Bildenheter</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Bildenheter</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Katalog för överföring</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Namnbyte av bilder</span>\t"
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Säkerhetskopiera bilder vid överföring"
+
+#~ msgid "Backup folder name:"
+#~ msgstr "Katalog för säkerhetskopiering:"
+
+#~ msgid "Automatically detect image devices"
+#~ msgstr "Hitta bildenheter automatiskt"
+
+#~ msgid "Download Folder"
+#~ msgstr "Katalog för överföring"
+
+#~ msgid ""
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
+#~ msgstr ""
+#~ "Välj att antingen hoppa över bilden, eller att lägga till en unik "
+#~ "identifierare."
+
+#~ msgid "Image location:"
+#~ msgstr "Bildplats:"
+
+#~ msgid "Image Devices"
+#~ msgstr "Bildenheter"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Avsluta programmet efter lyckad överföring"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images."
+#~ msgstr ""
+#~ "Om du avaktiverar automatisk sökning av bildenheter, ange istället en plats."
+
+#~ msgid "Import your images efficiently and reliably"
+#~ msgstr "Överför dina bilder snabbt och säkert"
+
+#~ msgid "Unmount (\"eject\") image device upon download completion"
+#~ msgstr "Mata ut enhet när överföring är klar"
+
+#~ 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 this name.</i>"
+#~ msgstr ""
+#~ "Ange i vilken katalog säkerhetskopior finns på enheten.\n"
+#~ "\n"
+#~ "<i>Notera att detta katalognamn också kommer att användas för att avgöra om "
+#~ "enheten används för säkerhetskopior. Skapa en katalog med samma namn på "
+#~ "andra enheter du vill använda för säkerhetskopior.</i>"
+
+#~ msgid "Start downloading upon image device insertion"
+#~ msgstr "Börja överföring vid inkoppling av enhet"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr ""
+#~ "Ange om tecken i fil- eller katalognamn som inte stöds av andra "
+#~ "operativsystem ska avlägsnas."
+
+#~ msgid ""
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
+#~ msgstr ""
+#~ "Ange om bilder med samma filnamn på enheten för säkerhetskopiering ska "
+#~ "ersättas, eller hoppas över."
+
+#~ msgid ""
+#~ "You can have your photos backed up to multiple locations as they are "
+#~ "downloaded, e.g. external hard drives."
+#~ msgstr ""
+#~ "Du kan säkerhetskopiera bilder till flera platser när de överförs, t.ex. "
+#~ "externa hårddiskar."
+
+#~ msgid "Image Rename"
+#~ msgstr "Namnbyte"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Avsökning av enhet klar: hittade inga bilder på enheten %s"
+
+#~ msgid ""
+#~ "Image devices are devices from which to download photos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple image devices simultaneously.\n"
+#~ "\n"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
+#~ msgstr ""
+#~ "Bildenheter är enheter som bilder kan överföras från, t.ex. kameror, "
+#~ "minneskort eller bärbara lagringsenheter.\n"
+#~ "\n"
+#~ "Du kan överföra bilder från flera olika platser samtidigt.\n"
+#~ "\n"
+#~ "<i>Om det fungerar dåligt eller inte alls att överföra bilder från din "
+#~ "kamera, prova att sätta den i PTP-läge. Om det inte är möjligt, överväg att "
+#~ "använda en minneskortläsare.</i>"
+
+#~ msgid ""
+#~ "Specify what to do when an image of the same name has already been "
+#~ "downloaded or backed up."
+#~ msgstr "Ange vad som hända när en bild med samma namn redan har överförts."
+
+#~ msgid "Should this device or partition be used to download images from?"
+#~ msgstr "Vill du överföra bilder från den här enheten eller partitionen?"
+
+#, python-format
+#~ msgid "Image: %(source)s"
+#~ msgstr "Bild: %(source)s"
+
+#~ msgid "Could not delete image from image device"
+#~ msgstr "Kunde inte radera bilder från bildenhet"
+
+#, python-format
+#~ msgid ""
+#~ "Image: %(source)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Bild: %(source)s\n"
+#~ "Fel: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid "Deleted %i images from image device"
+#~ msgstr "Raderade %i bilder från bildenhet"
+
+#~ msgid "Delete images from image device upon download completion"
+#~ msgstr "Radera bilder från bildenhet när bildöverföring är färdig"
+
+#~ msgid ""
+#~ "Images detected with the same filenames, but taken at different times:"
+#~ msgstr "Hittade bilder med samma filnamn, men tagna vid olika tillfällen:"
+
+#, python-format
+#~ msgid ""
+#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgstr ""
+#~ "Första bilden: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+#~ "Andra bilden: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#, python-format
+#~ msgid "Image device: %s\n"
+#~ msgstr "Bildenhet: %s\n"
+
+#, python-format
+#~ msgid ""
+#~ "Sorry, this image location does not exist:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Please resolve the problem, or modify your preferences."
+#~ msgstr ""
+#~ "Beklagar, men bildplatsen finns inte:\n"
+#~ "%(path)s\n"
+#~ "\n"
+#~ "Var vänlig lös problemet, eller ändra inställningarna."
+
+#~ msgid ""
+#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
+#~ "folder's permissions, or modify your preferences"
+#~ msgstr ""
+#~ "Beklagar, men det går inte att skriva till överföringskatalogen. Ändra "
+#~ "katalogens rättigheter eller inställningarna"
+
+#~ msgid ""
+#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
+#~ "modify your preferences"
+#~ msgstr ""
+#~ "Beklagar, men överföringskatalogen finns inte. Skapa katalogen, eller ändra "
+#~ "inställningarna"
+
+#~ msgid "Problem with Image Location Folder"
+#~ msgstr "Problem med bildkatalogen"
diff --git a/rapid/ChangeLog b/rapid/ChangeLog
index 0c2d27a..325b386 100644
--- a/rapid/ChangeLog
+++ b/rapid/ChangeLog
@@ -1,10 +1,65 @@
+Version 0.2.0
+-------------
+
+2010-05-30
+
+Videos can now be downloaded in much the same way photos can. 
+
+The package kaa metadata is required to download videos. ffmpegthumbnailer is
+used to display thumbnail images of certain types of videos as the download
+occurs. 
+
+kaa metadata and ffmpegthumbnailer are optional. The program will run without
+them. See the INSTALL file for details.
+
+If a THM file with the same name as the video is present, it will be used to 
+generate a thumbnail for the video. If not, if ffmpegthumbnailer is installed, 
+Rapid Photo Downloader will use it to attempt to extract a thumbnail from the
+video. THM files are not downloaded.
+
+For now, sequence values are shared between the downloads of videos and photos.
+There may be an option to have two sets of sequence numbers in a future release.
+
+Due to the number of changes in the code, it is possible that regressions in the
+photo downloading code may have been introduced. 
+
+This is the first release to use version 0.2.x of the pyexiv2 library.  The 
+most immediate benefit of this change is that thumbnail images from Nikon and 
+other brand cameras can be displayed. This fixes bugs #369640 and #570378.
+
+Please note pyexiv2 0.2.x requires exiv2 0.1.9 or above.
+
+Rapid Photo Downloader will still work with pyexiv2 0.1.x. However it will not
+be able to display the thumbnails of some brands of camera.
+
+If Rapid Photo Downloader detects version 0.18.1 or higher of the exiv2
+library, it will download Panasonic's RW2 files. If it detects version 0.18.0 or
+higher of the exiv2 library, it will download Mamiya's MEF files. For Rapid
+Photo Downloader to be able to detect which version of the exiv2 library your
+system has, it must either be running pyexiv2 >= 0.2.0, or have exiv2 installed.
+
+Fixed bug #483222: sometimes images could not be downloaded to NTFS partitions.
+This fix was a welcome side effect of using GIO to copy images, instead of 
+relying on the python standard libary.
+
+Error message headings in the Error Log are now displayed in a red font.
+
+Program settings and preferences can be reset using a new command line option.
+
+Program preferences are now more thoroughly checked for validity when the
+program starts. 
+
+Further work was done to fix bug #505492, to handle cases where the system
+notification system is not working properly.
+
+
 Version 0.1.3
 -------------
 
 2010-01-22
 
 Fixed bug #509348: When both the backup and "Delete images from image device 
-upon download completion" options are selected, the program should only delete 
+upon download completion" options are selected, the program will only delete 
 an image from the image device if it was both downloaded to the download folder 
 and backed up. Previously it did not check to ensure it was backed up 
 correctly too.
@@ -23,7 +78,7 @@ is writeable. If automatic detection of image devices is not enabled, it checks
 to see if the image location path exists.
 
 Updated Czech, Dutch, Finnish, French, German, Hungarian, Italian, Polish, 
-Russian, Serbian, Spanish and Swedish translations
+Russian, Serbian, Spanish and Swedish translations.
 
 
 Version 0.1.2
diff --git a/rapid/INSTALL b/rapid/INSTALL
index 7972a01..359b265 100644
--- a/rapid/INSTALL
+++ b/rapid/INSTALL
@@ -10,8 +10,20 @@ Rapid Photo Downloader depends on the following software:
 - libexiv2 0.15 or higher
 - pyexiv2 0.1.1 or higher
 
-To run Rapid Photo Downloader you will need all the software mentioned above. To
-start from a fairly basic system, I suggest the following:
+
+To run Rapid Photo Downloader you will need all the software mentioned above. If
+you want to download videos, you can install:
+
+- python-kaa-metadata
+- ffmpegthumbnailer
+
+kaa metadata is required to download videos. ffmpegthumbnailer is used only to 
+display thumbnail images as the download occurs. 
+
+kaa metadata and ffmpegthumbnailer are optional. The program will run without
+them.
+
+To start from a fairly basic system, I suggest the following:
 
 1. Install the required gnome packages from your linux distribution's package 
    repositories.  On a recent linux distribution, expect all to be available for
@@ -24,7 +36,7 @@ start from a fairly basic system, I suggest the following:
    repositories (look for python-pyexiv2). But if not, there are instructions 
    here: 
    
-   http://tilloy.net/dev/pyexiv2/developers.htm
+   http://tilloy.net/dev/pyexiv2/download.html
    
 3. Install this application from the tarball. You probably need to be the 
    super user (root) to be able to do this:
diff --git a/rapid/TODO b/rapid/TODO
deleted file mode 100644
index 5465850..0000000
--- a/rapid/TODO
+++ /dev/null
@@ -1,26 +0,0 @@
-For major release (0.10.0):
-===========================
-
-* sequencing:
-   - allow generation of unique sequences based on date time for last 1 - n days, via menu
-   
-* download profiles (combinations of subfolder and image renaming preferences)
-* better handle preference changes while downloads are occurring
-* handle unexpected media removal, disk full, all kinds of write errors
-* indicate different levels of error better in log window
-* sum amount of images to be downloaded, and how much free space on the file system
-* check download locations and sources still valid when starting the application
-* rework checkPrefsForValidity() to account for multiple subfolder problems
-
-For future releases:
-====================
-
-* Better application icon -- help needed!
-* Get more metadata
-  - lens
-* User defined camera model mapping
-* Job codes
-* use python's high performance deque to improve idletube
-
-
-
diff --git a/rapid/config.py b/rapid/config.py
index d9f4b1f..1ece2b0 100644
--- a/rapid/config.py
+++ b/rapid/config.py
@@ -15,7 +15,7 @@
 ### along with this program; if not, write to the Free Software
 ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-version = '0.1.3'
+version = '0.2.0'
 
 GCONF_KEY="/apps/rapid-photo-downloader"
 GLADE_FILE = "glade3/rapid.glade"
@@ -36,15 +36,11 @@ IGNORE = "ignore"
 
 DEFAULT_PHOTO_LOCATIONS = ['Pictures',  'Photos']
 DEFAULT_BACKUP_LOCATION = 'Pictures'
+DEFAULT_VIDEO_BACKUP_LOCATION = 'Videos'
 
-MAX_NO_READERS = 20
-
-RAW_FILE_EXTENSIONS = ['arw', 'dcr', 'cr2', 'crw',  'dng', 'mef', 'mos', 'mrw', 
-                        'nef', 'orf', 'pef', 'raf', 'raw', 'sr2']
+DEFAULT_VIDEO_LOCATIONS = ['Videos']
 
-#exiv2 0.18.1 introduces support for Panasonic .RW2 files
-
-NON_RAW_IMAGE_FILE_EXTENSIONS = ['jpg', 'jpe', 'jpeg', 'tif', 'tiff']
+MAX_NO_READERS = 20
 
 CRITICAL_ERROR = 1
 SERIOUS_ERROR = 2
diff --git a/rapid/glade3/filmstrip-100x75.xpm b/rapid/glade3/filmstrip-100x75.xpm
new file mode 100644
index 0000000..5e3428e
--- /dev/null
+++ b/rapid/glade3/filmstrip-100x75.xpm
@@ -0,0 +1,106 @@
+/* XPM */
+static char * thumbnail_100x75_xpm[] = {
+"100 75 28 1",
+" 	c None",
+".	c #000000",
+"+	c #232323",
+"@	c #7A7A7A",
+"#	c #838383",
+"$	c #8C8C8C",
+"%	c #909090",
+"&	c #8E8E8E",
+"*	c #525252",
+"=	c #6E6E6E",
+"-	c #939393",
+";	c #A3A3A3",
+">	c #ABABAB",
+",	c #A8A8A8",
+"'	c #9B9B9B",
+")	c #727272",
+"!	c #A4A4A4",
+"~	c #BBBBBB",
+"{	c #C4C4C4",
+"]	c #C1C1C1",
+"^	c #AFAFAF",
+"/	c #3E3E3E",
+"(	c #A6A6A6",
+"_	c #BEBEBE",
+":	c #C8C8C8",
+"<	c #070707",
+"[	c #090909",
+"}	c #0A0A0A",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"....+@#$%&*.                                                                            .*&%$#@+....",
+"....=#-;>,'.                                                                            .',>;-#=....",
+"....)&!~{]^.                                                                            .^]{~!&)....",
+"..../%(_:{&.                                                                            .&{:_(%/....",
+".....<[}}}..                                                                            ..}}}[<.....",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"....+@#$%&*.                                                                            .*&%$#@+....",
+"....=#-;>,'.                                                                            .',>;-#=....",
+"....)&!~{]^.                                                                            .^]{~!&)....",
+"..../%(_:{&.                                                                            .&{:_(%/....",
+".....<[}}}..                                                                            ..}}}[<.....",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"....+@#$%&*.                                                                            .*&%$#@+....",
+"....=#-;>,'.                                                                            .',>;-#=....",
+"....)&!~{]^.                                                                            .^]{~!&)....",
+"..../%(_:{&.                                                                            .&{:_(%/....",
+".....<[}}}..                                                                            ..}}}[<.....",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"....+@#$%&*.                                                                            .*&%$#@+....",
+"....=#-;>,'.                                                                            .',>;-#=....",
+"....)&!~{]^.                                                                            .^]{~!&)....",
+"..../%(_:{&.                                                                            .&{:_(%/....",
+".....<[}}}..                                                                            ..}}}[<.....",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"....+@#$%&*.                                                                            .*&%$#@+....",
+"....=#-;>,'.                                                                            .',>;-#=....",
+"....)&!~{]^.                                                                            .^]{~!&)....",
+"..../%(_:{&.                                                                            .&{:_(%/....",
+".....<[}}}..                                                                            ..}}}[<.....",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"....+@#$%&*.                                                                            .*&%$#@+....",
+"....=#-;>,'.                                                                            .',>;-#=....",
+"....)&!~{]^.                                                                            .^]{~!&)....",
+"..../%(_:{&.                                                                            .&{:_(%/....",
+".....<[}}}..                                                                            ..}}}[<.....",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"....+@#$%&*.                                                                            .*&%$#@+....",
+"....=#-;>,'.                                                                            .',>;-#=....",
+"....)&!~{]^.                                                                            .^]{~!&)....",
+"..../%(_:{&.                                                                            .&{:_(%/....",
+".....<[}}}..                                                                            ..}}}[<.....",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"............                                                                            ............",
+"....+@#$%&*.                                                                            .*&%$#@+...."};
diff --git a/rapid/glade3/rapid.glade b/rapid/glade3/rapid.glade
index f379024..48a32a8 100644
--- a/rapid/glade3/rapid.glade
+++ b/rapid/glade3/rapid.glade
@@ -65,7 +65,7 @@
                             <child>
                               <widget class="GtkImage" id="image2">
                                 <property name="visible">True</property>
-                                <property name="stock">gtk-open</property>
+                                <property name="stock">gtk-directory</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
@@ -75,7 +75,7 @@
                             <child>
                               <widget class="GtkLabel" id="label2">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Download Folder&lt;/span&gt;</property>
+                                <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Photo Download Folders&lt;/span&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
@@ -124,26 +124,12 @@
                             <property name="n_rows">7</property>
                             <property name="n_columns">3</property>
                             <child>
-                              <widget class="GtkVBox" id="subfolder_vbox">
-                                <property name="visible">True</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                                <property name="y_padding">12</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="example_download_path_label">
+                              <widget class="GtkLabel" id="example_photo_download_path_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;i&gt;Example: /home/user/photos&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">&lt;i&gt;Example: /home/user/Pictures&lt;/i&gt;</property>
                                 <property name="use_markup">True</property>
+                                <property name="wrap">True</property>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -211,7 +197,7 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="subfolder_warning_label">
+                              <widget class="GtkLabel" id="photo_subfolder_warning_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
@@ -227,6 +213,21 @@
                               </packing>
                             </child>
                             <child>
+                              <widget class="GtkVBox" id="subfolder_vbox">
+                                <property name="visible">True</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                                <property name="y_padding">12</property>
+                              </packing>
+                            </child>
+                            <child>
                               <placeholder/>
                             </child>
                             <child>
@@ -260,7 +261,6 @@
                         </child>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
                         <property name="padding">12</property>
                         <property name="position">1</property>
                       </packing>
@@ -273,7 +273,7 @@
                 <child>
                   <widget class="GtkLabel" id="download_label">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Download Folder</property>
+                    <property name="label" translatable="yes">Photo Folders</property>
                   </widget>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -304,7 +304,7 @@
                             <child>
                               <widget class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Image Rename&lt;/span&gt;	</property>
+                                <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Photo Rename&lt;/span&gt;	</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
@@ -353,7 +353,7 @@
                             <child>
                               <widget class="GtkLabel" id="label42">
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Image Rename&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Photo Rename&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
@@ -527,7 +527,7 @@
                 <child>
                   <widget class="GtkLabel" id="rename_label">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Image Rename</property>
+                    <property name="label" translatable="yes">Photo Rename</property>
                   </widget>
                   <packing>
                     <property name="position">1</property>
@@ -536,6 +536,514 @@
                   </packing>
                 </child>
                 <child>
+                  <widget class="GtkVBox" id="folder_tab1">
+                    <property name="visible">True</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox12">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox8">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkImage" id="image5">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-directory</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label46">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Video Download Folders&lt;/span&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHSeparator" id="hseparator8">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="folder_videos_cannot_be_downloaded_hbox">
+                        <child>
+                          <widget class="GtkLabel" id="folder_videos_cannot_be_downloaded_label">
+                            <property name="xalign">0</property>
+                            <property name="xpad">12</property>
+                            <property name="ypad">10</property>
+                            <property name="label" translatable="yes">Sorry, video downloading functionality disabled. To download videos, please install the &lt;i&gt;kaa metadata&lt;/i&gt; package for python.</property>
+                            <property name="use_markup">True</property>
+                            <property name="wrap">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="video_folders_hbox">
+                        <property name="visible">True</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <widget class="GtkLabel" id="label57">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkTable" id="video_download_folder_table">
+                            <property name="visible">True</property>
+                            <property name="n_rows">7</property>
+                            <property name="n_columns">3</property>
+                            <child>
+                              <widget class="GtkLabel" id="lblPhotos2">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Download folder:</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options"></property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label59">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="ypad">12</property>
+                                <property name="label" translatable="yes">Choose the download folder. Subfolders for the downloaded videos will be automatically created in this folder using the structure specified below.</property>
+                                <property name="use_markup">True</property>
+                                <property name="wrap">True</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label61">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Download Folder&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="right_attach">3</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label62">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Download Subfolders&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="example_video_download_path_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">&lt;i&gt;Example: /home/user/Pictures&lt;/i&gt;</property>
+                                <property name="use_markup">True</property>
+                                <property name="wrap">True</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="video_subfolder_warning_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">0</property>
+                                <property name="wrap">True</property>
+                                <property name="wrap_mode">word-char</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">6</property>
+                                <property name="bottom_attach">7</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkVBox" id="video_subfolder_vbox">
+                                <property name="visible">True</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                                <property name="y_padding">12</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label63">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="padding">12</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="video_download_folder">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Video Folders</property>
+                  </widget>
+                  <packing>
+                    <property name="position">2</property>
+                    <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="video_rename_tab">
+                    <property name="visible">True</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox10">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox1">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkImage" id="image1">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-convert</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label32">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Video Rename&lt;/span&gt;	</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHSeparator" id="hseparator3">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox6">
+                        <property name="visible">True</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <widget class="GtkLabel" id="label44">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkVBox" id="rename_vbox1">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkLabel" id="videos_cannot_be_downloaded_label">
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Sorry, video downloading functionality disabled. To download videos, please install the &lt;i&gt;kaa metadata&lt;/i&gt; package for python.</property>
+                                <property name="use_markup">True</property>
+                                <property name="wrap">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkScrolledWindow" id="video_rename_scrolledwindow">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
+                                <property name="window_placement_set">True</property>
+                                <child>
+                                  <widget class="GtkViewport" id="viewport1">
+                                    <property name="visible">True</property>
+                                    <property name="resize_mode">queue</property>
+                                    <property name="shadow_type">none</property>
+                                    <child>
+                                      <widget class="GtkVBox" id="video_rename_table_vbox">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkTable" id="video_rename_example_table">
+                                <property name="visible">True</property>
+                                <property name="n_rows">3</property>
+                                <property name="n_columns">3</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label55">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes"> </property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label56">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes"> </property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="video_new_name_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="yalign">0</property>
+                                    <property name="label">translators please ignore this</property>
+                                    <property name="wrap">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="video_original_name_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label">translators please ignore this</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="new_video_filename_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="yalign">0</property>
+                                    <property name="label" translatable="yes">&lt;i&gt;New:&lt;/i&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="original_video_filename_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">&lt;i&gt;Original:&lt;/i&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="example_video_filename_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Example&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="right_attach">3</property>
+                                    <property name="y_padding">12</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label60">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="padding">12</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="video_rename_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Video Rename</property>
+                  </widget>
+                  <packing>
+                    <property name="position">3</property>
+                    <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
+                  </packing>
+                </child>
+                <child>
                   <widget class="GtkVBox" id="rename_options_tab">
                     <property name="visible">True</property>
                     <property name="spacing">12</property>
@@ -844,7 +1352,7 @@
                                   <widget class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Specify whether image and folder names should have any characters removed that are not allowed by other operating systems.</property>
+                                    <property name="label" translatable="yes">Specify whether photo, video and folder names should have any characters removed that are not allowed by other operating systems.</property>
                                     <property name="wrap">True</property>
                                   </widget>
                                   <packing>
@@ -896,7 +1404,7 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
                 <child>
@@ -905,7 +1413,7 @@
                     <property name="label" translatable="yes">Rename Options</property>
                   </widget>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="position">4</property>
                     <property name="tab_fill">False</property>
                     <property name="type">tab</property>
                   </packing>
@@ -969,7 +1477,6 @@
                         <child>
                           <widget class="GtkVBox" id="job_code_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
                             <child>
                               <widget class="GtkLabel" id="job_code_label">
                                 <property name="xalign">0</property>
@@ -1101,7 +1608,7 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="position">5</property>
                   </packing>
                 </child>
                 <child>
@@ -1110,7 +1617,7 @@
                     <property name="label" translatable="yes">Job Codes</property>
                   </widget>
                   <packing>
-                    <property name="position">3</property>
+                    <property name="position">5</property>
                     <property name="tab_fill">False</property>
                     <property name="type">tab</property>
                   </packing>
@@ -1139,7 +1646,7 @@
                             <child>
                               <widget class="GtkLabel" id="label22">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Image Devices&lt;/span&gt;</property>
+                                <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Devices&lt;/span&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
@@ -1176,7 +1683,7 @@
                           <widget class="GtkLabel" id="label41">
                             <property name="xalign">0</property>
                             <property name="xpad">12</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Image Devices&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Devices&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
@@ -1189,9 +1696,9 @@
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="xpad">12</property>
-                            <property name="label" translatable="yes">Image devices are devices from which to download photos, such as cameras, memory cards or Portable Storage Devices.
+                            <property name="label" translatable="yes">Devices are from where to download photos and videos, such as cameras, memory cards or Portable Storage Devices.
 
-You can download photos from multiple image devices simultaneously.
+You can download photos from multiple devices simultaneously, or you can specify a location on your hard drive.
 
 &lt;i&gt;If downloading directly from your camera works poorly or not at all, try setting it to PTP mode. If that is not possible, consider using a card reader.&lt;/i&gt;</property>
                             <property name="use_markup">True</property>
@@ -1238,7 +1745,7 @@ You can download photos from multiple image devices simultaneously.
                                 </child>
                                 <child>
                                   <widget class="GtkCheckButton" id="autodetect_device_checkbutton">
-                                    <property name="label" translatable="yes">Automatically detect image devices</property>
+                                    <property name="label" translatable="yes">Automatically detect devices</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1305,7 +1812,7 @@ You can download photos from multiple image devices simultaneously.
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="xpad">12</property>
-                                    <property name="label" translatable="yes">Image location:</property>
+                                    <property name="label" translatable="yes">Location:</property>
                                   </widget>
                                   <packing>
                                     <property name="top_attach">1</property>
@@ -1321,7 +1828,7 @@ You can download photos from multiple image devices simultaneously.
                                     <property name="xalign">0</property>
                                     <property name="xpad">12</property>
                                     <property name="ypad">12</property>
-                                    <property name="label" translatable="yes">If you disable automatic detection, choose the exact location of the images.</property>
+                                    <property name="label" translatable="yes">If you disable automatic detection, choose the exact location of the images and videos.</property>
                                     <property name="wrap">True</property>
                                   </widget>
                                   <packing>
@@ -1363,16 +1870,16 @@ You can download photos from multiple image devices simultaneously.
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">4</property>
+                    <property name="position">6</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkLabel" id="device_label">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Image Devices</property>
+                    <property name="label" translatable="yes">Devices</property>
                   </widget>
                   <packing>
-                    <property name="position">4</property>
+                    <property name="position">6</property>
                     <property name="tab_fill">False</property>
                     <property name="type">tab</property>
                   </packing>
@@ -1460,7 +1967,7 @@ You can download photos from multiple image devices simultaneously.
                             <child>
                               <widget class="GtkTable" id="backup_table">
                                 <property name="visible">True</property>
-                                <property name="n_rows">8</property>
+                                <property name="n_rows">9</property>
                                 <property name="n_columns">4</property>
                                 <child>
                                   <widget class="GtkLabel" id="backup_location_explanation_label">
@@ -1474,8 +1981,8 @@ You can download photos from multiple image devices simultaneously.
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">4</property>
-                                    <property name="top_attach">6</property>
-                                    <property name="bottom_attach">7</property>
+                                    <property name="top_attach">7</property>
+                                    <property name="bottom_attach">8</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1501,7 +2008,7 @@ You can download photos from multiple image devices simultaneously.
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="ypad">12</property>
-                                    <property name="label" translatable="yes">You can have your photos backed up to multiple locations as they are downloaded, e.g. external hard drives.</property>
+                                    <property name="label" translatable="yes">You can have your photos and videos backed up to multiple locations as they are downloaded, e.g. external hard drives.</property>
                                     <property name="wrap">True</property>
                                   </widget>
                                   <packing>
@@ -1511,7 +2018,7 @@ You can download photos from multiple image devices simultaneously.
                                 </child>
                                 <child>
                                   <widget class="GtkCheckButton" id="backup_checkbutton">
-                                    <property name="label" translatable="yes">Backup photos when downloading</property>
+                                    <property name="label" translatable="yes">Backup photos and videos when downloading</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1533,7 +2040,7 @@ You can download photos from multiple image devices simultaneously.
                                     <property name="ypad">6</property>
                                     <property name="label" translatable="yes">Specify the folder in which backups are stored on the device.  
 
-&lt;i&gt;Note: this will also be used to determine whether or not the device is used for backups. For each device you wish to use for backing up to, create a folder in it with this name.&lt;/i&gt;</property>
+&lt;i&gt;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.&lt;/i&gt;</property>
                                     <property name="use_markup">True</property>
                                     <property name="wrap">True</property>
                                   </widget>
@@ -1553,8 +2060,8 @@ You can download photos from multiple image devices simultaneously.
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">3</property>
-                                    <property name="top_attach">7</property>
-                                    <property name="bottom_attach">8</property>
+                                    <property name="top_attach">8</property>
+                                    <property name="bottom_attach">9</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options"></property>
                                   </packing>
@@ -1563,7 +2070,7 @@ You can download photos from multiple image devices simultaneously.
                                   <widget class="GtkLabel" id="backup_identifier_label">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Backup folder name:</property>
+                                    <property name="label" translatable="yes">Photo backup folder name:</property>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -1572,6 +2079,7 @@ You can download photos from multiple image devices simultaneously.
                                     <property name="bottom_attach">5</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options"></property>
+                                    <property name="y_padding">6</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1586,8 +2094,8 @@ You can download photos from multiple image devices simultaneously.
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
-                                    <property name="top_attach">5</property>
-                                    <property name="bottom_attach">6</property>
+                                    <property name="top_attach">6</property>
+                                    <property name="bottom_attach">7</property>
                                     <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
@@ -1603,8 +2111,8 @@ You can download photos from multiple image devices simultaneously.
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
-                                    <property name="top_attach">5</property>
-                                    <property name="bottom_attach">6</property>
+                                    <property name="top_attach">6</property>
+                                    <property name="bottom_attach">7</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1620,10 +2128,49 @@ You can download photos from multiple image devices simultaneously.
                                     <property name="top_attach">4</property>
                                     <property name="bottom_attach">5</property>
                                     <property name="y_options"></property>
-                                    <property name="y_padding">12</property>
+                                    <property name="y_padding">6</property>
                                   </packing>
                                 </child>
                                 <child>
+                                  <widget class="GtkLabel" id="video_backup_identifier_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Video backup folder name:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                    <property name="y_padding">6</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="video_backup_identifier_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                    <signal name="changed" handler="on_video_backup_identifier_entry_changed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="y_options"></property>
+                                    <property name="y_padding">6</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
                                   <placeholder/>
                                 </child>
                                 <child>
@@ -1681,7 +2228,7 @@ You can download photos from multiple image devices simultaneously.
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">5</property>
+                    <property name="position">7</property>
                   </packing>
                 </child>
                 <child>
@@ -1690,7 +2237,7 @@ You can download photos from multiple image devices simultaneously.
                     <property name="label" translatable="yes">Backup</property>
                   </widget>
                   <packing>
-                    <property name="position">5</property>
+                    <property name="position">7</property>
                     <property name="tab_fill">False</property>
                     <property name="type">tab</property>
                   </packing>
@@ -1780,7 +2327,7 @@ You can download photos from multiple image devices simultaneously.
                                 <property name="n_columns">3</property>
                                 <child>
                                   <widget class="GtkCheckButton" id="auto_unmount_checkbutton">
-                                    <property name="label" translatable="yes">Unmount ("eject") image device upon download completion</property>
+                                    <property name="label" translatable="yes">Unmount ("eject") device upon download completion</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1810,7 +2357,7 @@ You can download photos from multiple image devices simultaneously.
                                 </child>
                                 <child>
                                   <widget class="GtkCheckButton" id="auto_insertion_checkbutton">
-                                    <property name="label" translatable="yes">Start downloading upon image device insertion</property>
+                                    <property name="label" translatable="yes">Start downloading upon device insertion</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1826,7 +2373,7 @@ You can download photos from multiple image devices simultaneously.
                                 </child>
                                 <child>
                                   <widget class="GtkCheckButton" id="auto_exit_checkbutton">
-                                    <property name="label" translatable="yes">Exit program after completion of successful download</property>
+                                    <property name="label" translatable="yes">Exit program if download completes without any warnings or errors</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1841,7 +2388,7 @@ You can download photos from multiple image devices simultaneously.
                                 </child>
                                 <child>
                                   <widget class="GtkCheckButton" id="auto_delete_checkbutton">
-                                    <property name="label" translatable="yes">Delete images from image device upon download completion</property>
+                                    <property name="label" translatable="yes">Delete photos and videos from device upon download completion</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1902,7 +2449,7 @@ You can download photos from multiple image devices simultaneously.
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">6</property>
+                    <property name="position">8</property>
                   </packing>
                 </child>
                 <child>
@@ -1912,7 +2459,7 @@ You can download photos from multiple image devices simultaneously.
                     <property name="label" translatable="yes">Automation</property>
                   </widget>
                   <packing>
-                    <property name="position">6</property>
+                    <property name="position">8</property>
                     <property name="tab_fill">False</property>
                     <property name="type">tab</property>
                   </packing>
@@ -2005,7 +2552,7 @@ You can download photos from multiple image devices simultaneously.
                               <widget class="GtkLabel" id="label12">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Image Name Conflicts&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Photo and Video Name Conflicts&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
@@ -2131,7 +2678,7 @@ You can download photos from multiple image devices simultaneously.
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="ypad">12</property>
-                                <property name="label" translatable="yes">Choose whether to skip downloading the image, or to add a unique indentifier.</property>
+                                <property name="label" translatable="yes">Choose whether to skip downloading the file, or to add a unique indentifier.</property>
                                 <property name="wrap">True</property>
                               </widget>
                               <packing>
@@ -2165,7 +2712,7 @@ You can download photos from multiple image devices simultaneously.
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="ypad">12</property>
-                                <property name="label" translatable="yes">Specify what to do when an image of the same name has already been downloaded or backed up.</property>
+                                <property name="label" translatable="yes">Specify what to do when a photo or video of the same name has already been downloaded or backed up.</property>
                                 <property name="wrap">True</property>
                               </widget>
                               <packing>
@@ -2196,7 +2743,7 @@ You can download photos from multiple image devices simultaneously.
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="ypad">12</property>
-                                <property name="label" translatable="yes">When backing up, choose whether to overwrite an image on the backup device that has the same name, or skip backing it up.</property>
+                                <property name="label" translatable="yes">When backing up, choose whether to overwrite a file on the backup device that has the same name, or skip backing it up.</property>
                                 <property name="wrap">True</property>
                               </widget>
                               <packing>
@@ -2298,7 +2845,7 @@ You can download photos from multiple image devices simultaneously.
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">7</property>
+                    <property name="position">9</property>
                   </packing>
                 </child>
                 <child>
@@ -2308,7 +2855,7 @@ You can download photos from multiple image devices simultaneously.
                     <property name="label" translatable="yes">Error Handling</property>
                   </widget>
                   <packing>
-                    <property name="position">7</property>
+                    <property name="position">9</property>
                     <property name="tab_fill">False</property>
                     <property name="type">tab</property>
                   </packing>
@@ -2382,7 +2929,7 @@ You can download photos from multiple image devices simultaneously.
     <property name="type_hint">normal</property>
     <property name="program_name">Rapid Photo Downloader</property>
     <property name="copyright" translatable="yes">Copyright Damon Lynch 2007-10</property>
-    <property name="comments" translatable="yes">Import your images efficiently and reliably</property>
+    <property name="comments" translatable="yes">Import your photos and videos efficiently and reliably</property>
     <property name="website">http://www.damonlynch.net/rapid</property>
     <property name="license" translatable="yes">Rapid Photo Downloader is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 
@@ -2749,7 +3296,6 @@ Julien Valroff &lt;julien@kirya.net&gt;</property>
                             <child>
                               <widget class="GtkVSeparator" id="warning_vseparator">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
@@ -2806,7 +3352,6 @@ Julien Valroff &lt;julien@kirya.net&gt;</property>
             <child>
               <widget class="GtkVSeparator" id="vseparator2">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
diff --git a/rapid/glade3/video.svg b/rapid/glade3/video.svg
new file mode 100644
index 0000000..a03c672
--- /dev/null
+++ b/rapid/glade3/video.svg
@@ -0,0 +1,1638 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg4417"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/mimetypes"
+   sodipodi:docname="video-x-generic.svg"
+   inkscape:export-filename="/home/andreas/project/gnome-icon-theme/scalable/categories/applications-multimedia.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4419">
+    <linearGradient
+       id="linearGradient2998">
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="0"
+         id="stop3001" />
+      <stop
+         id="stop3007"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop3003" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2996">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2998" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop3000" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2992">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop2994" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2996" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6593">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop6595" />
+      <stop
+         id="stop6601"
+         offset="0.5"
+         style="stop-color:#424a4d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="1"
+         id="stop6597" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3010">
+      <stop
+         id="stop3012"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop3014"
+         offset="1"
+         style="stop-color:white;stop-opacity:0.4269006;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3002">
+      <stop
+         id="stop3004"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop3006"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5737">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5739" />
+      <stop
+         style="stop-color:white;stop-opacity:0.32163742;"
+         offset="1"
+         id="stop5741" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5683">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5685" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop5687" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3897">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop3899" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop3901" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3209">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop3211" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop3213" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3202">
+      <stop
+         id="stop3204"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop3206"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3101">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3103" />
+      <stop
+         id="stop3109"
+         offset="0.12824793"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0.56024098"
+         id="stop3111" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1"
+         id="stop3105" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3089">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop3092" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1"
+         id="stop3094" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3032">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop3034" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop3036" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3169">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3173" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3116">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop3118" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop3120" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3093">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3095" />
+      <stop
+         id="stop2022"
+         offset="0.72289157"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         style="stop-color:#71736e;stop-opacity:1;"
+         offset="1"
+         id="stop3097" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3041">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3043" />
+      <stop
+         id="stop3049"
+         offset="0.32630172"
+         style="stop-color:#898b86;stop-opacity:1;" />
+      <stop
+         style="stop-color:#525450;stop-opacity:1;"
+         offset="0.62983823"
+         id="stop3051" />
+      <stop
+         id="stop3053"
+         offset="0.85847878"
+         style="stop-color:#535551;stop-opacity:1;" />
+      <stop
+         style="stop-color:#3e3f3d;stop-opacity:1;"
+         offset="1"
+         id="stop3045" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2982">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2984" />
+      <stop
+         id="stop2990"
+         offset="0.0547975"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.90963858"
+         id="stop2992" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2986" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2927">
+      <stop
+         style="stop-color:#ddd;stop-opacity:1;"
+         offset="0"
+         id="stop2929" />
+      <stop
+         style="stop-color:#ddd;stop-opacity:0;"
+         offset="1"
+         id="stop2931" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2919">
+      <stop
+         style="stop-color:#646464;stop-opacity:1;"
+         offset="0"
+         id="stop2921" />
+      <stop
+         style="stop-color:#646464;stop-opacity:0;"
+         offset="1"
+         id="stop2923" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2911">
+      <stop
+         style="stop-color:#464f52;stop-opacity:1;"
+         offset="0"
+         id="stop2913" />
+      <stop
+         style="stop-color:#464f52;stop-opacity:0;"
+         offset="1"
+         id="stop2915" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="-1.2432"
+       y1="-3.2012"
+       x2="26.5278"
+       y2="28.3922">
+      <stop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="stop6468" />
+      <stop
+         offset="1"
+         style="stop-color:#959595"
+         id="stop6470" />
+    </linearGradient>
+    <radialGradient
+       id="aigrd3"
+       cx="23.1567"
+       cy="29.0337"
+       r="26.966"
+       fx="23.1567"
+       fy="29.0337"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#767676"
+         id="stop6443" />
+      <stop
+         offset="1"
+         style="stop-color:#484848"
+         id="stop6445" />
+    </radialGradient>
+    <radialGradient
+       id="aigrd2"
+       cx="13.5024"
+       cy="12.3457"
+       r="10.8808"
+       fx="13.5024"
+       fy="12.3457"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#454545"
+         id="stop6436" />
+      <stop
+         offset="1"
+         style="stop-color:#333333"
+         id="stop6438" />
+    </radialGradient>
+    <linearGradient
+       y2="248.6311"
+       x2="153.0005"
+       y1="15.4238"
+       x1="99.7773"
+       gradientUnits="userSpaceOnUse"
+       id="aigrd1">
+      <stop
+         id="stop53300"
+         style="stop-color:#707070;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop53302"
+         style="stop-color:#cdcdcd;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd3"
+       id="radialGradient4553"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.101263,0,0,1.101263,-57.56432,3.17435)"
+       cx="23.1567"
+       cy="29.0337"
+       fx="23.1567"
+       fy="29.0337"
+       r="26.966" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd2"
+       id="radialGradient4556"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.101263,0,0,1.101263,-57.56432,3.17435)"
+       cx="13.5024"
+       cy="12.3457"
+       fx="13.5024"
+       fy="12.3457"
+       r="10.8808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd6"
+       id="linearGradient6380"
+       x1="0.88337302"
+       y1="-37.643921"
+       x2="30.994286"
+       y2="-0.67233789"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-57.87868,40.00204)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd1"
+       id="linearGradient2001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(3.505583,42.36313)"
+       x1="4.6333733"
+       y1="-33.518921"
+       x2="34.056786"
+       y2="2.1401622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2911"
+       id="linearGradient2917"
+       x1="29.75"
+       y1="38.420128"
+       x2="29.75"
+       y2="43.9375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2919"
+       id="linearGradient2925"
+       x1="34.25"
+       y1="38.804165"
+       x2="34.25"
+       y2="44.380974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2927"
+       id="linearGradient2933"
+       x1="35.625"
+       y1="38.874573"
+       x2="35.625"
+       y2="43.444958"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2982"
+       id="linearGradient2988"
+       x1="61.933079"
+       y1="31.25"
+       x2="106.09679"
+       y2="31.25"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2982"
+       id="linearGradient3000"
+       x1="62.3125"
+       y1="40"
+       x2="106.06924"
+       y2="40"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3041"
+       id="linearGradient3047"
+       x1="63.5"
+       y1="29.4375"
+       x2="104.79548"
+       y2="29.4375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3093"
+       id="linearGradient3099"
+       x1="91.339241"
+       y1="19.333946"
+       x2="105.30366"
+       y2="19.333946"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3116"
+       id="linearGradient3122"
+       x1="75.875"
+       y1="28.625"
+       x2="77.375"
+       y2="39.40625"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3202"
+       id="linearGradient3072"
+       x1="73.337959"
+       y1="25.384384"
+       x2="76.955917"
+       y2="12.306049"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3032"
+       id="linearGradient3087"
+       gradientUnits="userSpaceOnUse"
+       x1="77.000015"
+       y1="13.524997"
+       x2="80.39064"
+       y2="-5.0196266" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3089"
+       id="linearGradient3096"
+       x1="87.5"
+       y1="13.75"
+       x2="90.249092"
+       y2="14.446928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3101"
+       id="linearGradient3107"
+       x1="76.937096"
+       y1="15.875"
+       x2="93.063683"
+       y2="15.875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2982"
+       id="linearGradient3060"
+       x1="18.738331"
+       y1="16.695379"
+       x2="44.680313"
+       y2="23.499962"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2982"
+       id="linearGradient3062"
+       x1="18.738331"
+       y1="15.695379"
+       x2="44.680313"
+       y2="22.499962"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.970504,0,0,0.407216,-56.50939,11.32708)"
+       cx="85.500011"
+       cy="16.999587"
+       fx="85.500011"
+       fy="16.999587"
+       r="22.249191" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3209"
+       id="linearGradient3215"
+       x1="82.489655"
+       y1="14.582699"
+       x2="80.921646"
+       y2="5.6930151"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3897"
+       id="linearGradient3903"
+       x1="76.781258"
+       y1="15.414051"
+       x2="81.75782"
+       y2="2.0453157"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="linearGradient4796"
+       x1="-26.853115"
+       y1="10.70663"
+       x2="-29.875"
+       y2="24.003584"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5683"
+       id="radialGradient5689"
+       cx="13.67201"
+       cy="7.8948545"
+       fx="13.67201"
+       fy="7.8948545"
+       r="17.503583"
+       gradientTransform="matrix(2.396145,0,0,1.213358,-19.88512,-7.579285)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5737"
+       id="linearGradient5743"
+       x1="81.92186"
+       y1="14.49374"
+       x2="81.690651"
+       y2="3.1698563"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3002"
+       id="radialGradient3907"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.03989,0,0,1.032958,-64.86939,-4.409191)"
+       cx="13.171977"
+       cy="21.697666"
+       fx="13.171977"
+       fy="21.697666"
+       r="17.503583" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3010"
+       id="linearGradient3909"
+       gradientUnits="userSpaceOnUse"
+       x1="80.992172"
+       y1="15.317177"
+       x2="84.55397"
+       y2="5.7076802" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6593"
+       id="linearGradient6599"
+       x1="26.641592"
+       y1="8.5011101"
+       x2="24.358414"
+       y2="10.498891"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2992"
+       id="radialGradient2998"
+       cx="25.546875"
+       cy="10"
+       fx="25.546875"
+       fy="10"
+       r="8.453125"
+       gradientTransform="matrix(1,0,0,0.469501,0,5.304991)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2996"
+       id="linearGradient3003"
+       x1="25.5"
+       y1="15.453269"
+       x2="24.942444"
+       y2="1.2227453"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2998"
+       id="linearGradient3005"
+       x1="22.4375"
+       y1="32.25"
+       x2="28.25"
+       y2="31.75"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(14.75,-0.75)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2998"
+       id="linearGradient3017"
+       x1="44.331707"
+       y1="22.49238"
+       x2="46.908863"
+       y2="22.693205"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#d8d8d8"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="61.621338"
+     inkscape:cy="29.26585"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="997"
+     inkscape:window-height="743"
+     inkscape:window-x="628"
+     inkscape:window-y="223"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     inkscape:grid-points="true">
+    <sodipodi:guide
+       orientation="vertical"
+       position="13.5"
+       id="guide2099" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="21.4375"
+       id="guide2101" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="29.4375"
+       id="guide2103" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="37.375"
+       id="guide2105" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="47"
+       id="guide2107" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="9.9878833"
+       id="guide2133" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="20.32932"
+       id="guide2135" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="30.670757"
+       id="guide2137" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="40.967999"
+       id="guide2139" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="47.729708"
+       id="guide3008" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4422">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Applications Multimedia</dc:title>
+        <dc:date>August 2006</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Lapo Calamandrei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://www.gnome.org</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>multimedia</rdf:li>
+            <rdf:li>sound</rdf:li>
+            <rdf:li>video</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Jakub Steiner, Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:0.8;color:black;fill:url(#radialGradient3143);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 37.265718,10.402843 C 26.947159,7.9031525 13.725313,9.3896756 7.7678855,13.719266 C 1.8104576,18.048857 5.3532386,23.59664 15.671801,26.09633 C 25.990362,28.596021 39.212206,27.109496 45.16963,22.779906 C 51.127064,18.450317 47.584288,12.902533 37.265718,10.402843 z "
+       id="path3141"
+       sodipodi:nodetypes="csssc" />
+    <path
+       style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 26.513532,3.069333 C 27.494068,3.144641 27.625715,3.264127 27.593697,3.379126 L 25.353295,7.201505 C 25.241199,7.392753 24.858508,7.513819 24.307494,7.605839 C 23.749135,7.647763 23.314524,7.628665 23.015452,7.491943 L 16.895253,4.686457 C 16.661667,4.546046 16.821602,4.319954 19.490909,3.569783 C 20.984007,3.258201 22.590966,3.065644 24.257151,3 C 25.237216,3.014582 26.030543,3.032239 26.513532,3.069333 z M 31.282791,3.653536 C 31.750192,3.705773 32.579862,3.871181 33.795668,4.168406 C 35.16683,4.606105 36.347892,5.140176 37.300167,5.751299 C 38.791373,7.011106 38.682595,7.243464 38.326732,7.311671 L 29.958044,8.342364 C 29.523357,8.395612 29.110469,8.293131 28.640151,8.106981 C 28.310696,7.916013 28.145983,7.735758 28.251072,7.556464 L 30.491474,3.734084 C 30.569914,3.648554 30.74289,3.593199 31.282791,3.653536 z M 14.624127,5.635824 C 14.672763,5.642736 14.726595,5.654075 14.766964,5.66811 L 20.895251,8.459797 C 21.198262,8.598318 21.220027,8.804396 21.123149,9.064521 C 20.922542,9.31194 20.678301,9.485432 20.26438,9.536135 L 11.903779,10.553029 C 11.524573,10.575096 11.159907,10.395586 11.066412,9.001043 C 11.140424,8.627402 11.274477,8.259682 11.494076,7.885023 C 11.713674,7.510364 11.999766,7.161268 12.344331,6.820768 C 13.737443,5.79183 14.306188,5.590641 14.624127,5.635824 z M 39.255235,8.652972 C 39.579997,8.686515 39.852498,8.990752 39.933588,10.20027 C 39.859576,10.573911 39.725523,10.941631 39.505924,11.31629 C 39.286326,11.69095 39.000234,12.040045 38.655669,12.380545 C 37.04945,13.566883 36.537303,13.638989 36.233036,13.533203 L 30.104749,10.741516 C 29.81764,10.610264 29.776139,10.418878 29.852587,10.17819 C 29.862751,10.164742 29.866324,10.149776 29.876851,10.136792 C 29.881935,10.123141 29.895209,10.109364 29.901116,10.095394 C 30.098159,9.869478 30.343421,9.71322 30.73562,9.665178 L 39.096221,8.648284 C 39.146533,8.645356 39.205556,8.647841 39.255235,8.652972 z M 21.647827,10.874004 C 21.852925,10.908941 22.06662,10.973673 22.28547,11.055641 C 22.662017,11.261281 22.861024,11.453602 22.748928,11.644849 L 20.508526,15.467229 C 20.362179,15.626804 19.824526,15.673458 17.204332,15.032907 C 15.833169,14.595211 14.652109,14.061136 13.699833,13.450014 C 12.20863,12.190207 12.317406,11.957847 12.673268,11.889642 L 21.041956,10.858949 C 21.246227,10.833927 21.442729,10.839068 21.647827,10.874004 z M 27.473567,11.587619 C 27.677762,11.605656 27.840994,11.643744 27.984548,11.709371 L 34.104747,14.514857 C 34.338335,14.655265 34.1784,14.881358 31.509091,15.63153 C 30.015994,15.943111 28.409033,16.135671 26.742849,16.201313 C 23.773106,16.157133 23.358511,15.993835 23.406303,15.822188 L 25.646705,11.999808 C 25.763112,11.801204 26.173739,11.68218 26.760965,11.589069 C 27.024213,11.571596 27.269373,11.569582 27.473567,11.587619 z "
+       id="path2995"
+       sodipodi:nodetypes="cccccccccccccccccccccccccsccccscccsssccccccccccccccccccccc" />
+    <g
+       id="g3901"
+       transform="matrix(0.976118,0,0,0.976118,49.41488,6.4418)">
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccccccsccccscccsssccccccccccccccccccccc"
+         id="path2984"
+         d="M -23.486468,3.069333 C -22.505932,3.144641 -22.374285,3.264127 -22.406303,3.379126 L -24.646705,7.201505 C -24.758801,7.392753 -25.141492,7.513819 -25.692506,7.605839 C -26.250865,7.647763 -26.685476,7.628665 -26.984548,7.491943 L -33.104747,4.686457 C -33.338333,4.546046 -33.178398,4.319954 -30.509091,3.569783 C -29.015993,3.258201 -27.409034,3.065644 -25.742849,3 C -24.762784,3.014582 -23.969457,3.032239 -23.486468,3.069333 z M -18.717209,3.653536 C -18.249808,3.705773 -17.420138,3.871181 -16.204332,4.168406 C -14.83317,4.606105 -13.652108,5.140176 -12.699833,5.751299 C -11.208627,7.011106 -11.317405,7.243464 -11.673268,7.311671 L -20.041956,8.342364 C -20.476643,8.395612 -20.889531,8.293131 -21.359849,8.106981 C -21.689304,7.916013 -21.854017,7.735758 -21.748928,7.556464 L -19.508526,3.734084 C -19.430086,3.648554 -19.25711,3.593199 -18.717209,3.653536 z M -35.375873,5.635824 C -35.327237,5.642736 -35.273405,5.654075 -35.233036,5.66811 L -29.104749,8.459797 C -28.801738,8.598318 -28.779973,8.804396 -28.876851,9.064521 C -29.077458,9.31194 -29.321699,9.485432 -29.73562,9.536135 L -38.096221,10.553029 C -38.475427,10.575096 -38.840093,10.395586 -38.933588,9.001043 C -38.859576,8.627402 -38.725523,8.259682 -38.505924,7.885023 C -38.286326,7.510364 -38.000234,7.161268 -37.655669,6.820768 C -36.262557,5.79183 -35.693812,5.590641 -35.375873,5.635824 z M -10.744765,8.652972 C -10.420003,8.686515 -10.147502,8.990752 -10.066412,10.20027 C -10.140424,10.573911 -10.274477,10.941631 -10.494076,11.31629 C -10.713674,11.69095 -10.999766,12.040045 -11.344331,12.380545 C -12.95055,13.566883 -13.462697,13.638989 -13.766964,13.533203 L -19.895251,10.741516 C -20.18236,10.610264 -20.223861,10.418878 -20.147413,10.17819 C -20.137249,10.164742 -20.133676,10.149776 -20.123149,10.136792 C -20.118065,10.123141 -20.104791,10.109364 -20.098884,10.095394 C -19.901841,9.869478 -19.656579,9.71322 -19.26438,9.665178 L -10.903779,8.648284 C -10.853467,8.645356 -10.794444,8.647841 -10.744765,8.652972 z M -28.352173,10.874004 C -28.147075,10.908941 -27.93338,10.973673 -27.71453,11.055641 C -27.337983,11.261281 -27.138976,11.453602 -27.251072,11.644849 L -29.491474,15.467229 C -29.637821,15.626804 -30.175474,15.673458 -32.795668,15.032907 C -34.166831,14.595211 -35.347891,14.061136 -36.300167,13.450014 C -37.79137,12.190207 -37.682594,11.957847 -37.326732,11.889642 L -28.958044,10.858949 C -28.753773,10.833927 -28.557271,10.839068 -28.352173,10.874004 z M -22.526433,11.587619 C -22.322238,11.605656 -22.159006,11.643744 -22.015452,11.709371 L -15.895253,14.514857 C -15.661665,14.655265 -15.8216,14.881358 -18.490909,15.63153 C -19.984006,15.943111 -21.590967,16.135671 -23.257151,16.201313 C -26.226894,16.157133 -26.641489,15.993835 -26.593697,15.822188 L -24.353295,11.999808 C -24.236888,11.801204 -23.826261,11.68218 -23.239035,11.589069 C -22.975787,11.571596 -22.730627,11.569582 -22.526433,11.587619 z "
+         style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2.04893351;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         sodipodi:nodetypes="csssccccccccccccccccccccccccccsccccscccsssccccccccccccccccccccc"
+         id="path2998"
+         d="M -19.970667,2.274237 C -29.301506,1.13127 -38.90351,3.665589 -41.403702,7.931199 C -43.903895,12.196811 -38.360174,16.58638 -29.029333,17.729347 C -19.698494,18.872313 -10.096492,16.337996 -7.596298,12.072384 C -5.096106,7.806773 -10.639827,3.417203 -19.970667,2.274237 z M -23.486468,3 C -22.505932,3.075308 -22.374285,3.194794 -22.406303,3.309793 L -24.646705,7.132172 C -24.758801,7.32342 -25.141492,7.444486 -25.692506,7.536506 C -26.250865,7.57843 -26.685476,7.559332 -26.984548,7.42261 L -33.104747,4.617124 C -33.338333,4.476713 -33.178398,4.250621 -30.509091,3.50045 C -29.015993,3.188868 -27.409034,2.996311 -25.742849,2.930667 C -24.762784,2.945249 -23.969457,2.962906 -23.486468,3 z M -18.717209,3.584203 C -18.249808,3.63644 -17.420138,3.801848 -16.204332,4.099073 C -14.83317,4.536772 -13.652108,5.070843 -12.699833,5.681966 C -11.208627,6.941773 -11.317405,7.174131 -11.673268,7.242338 L -20.041956,8.273031 C -20.476643,8.326279 -20.889531,8.223798 -21.359849,8.037648 C -21.689304,7.84668 -21.854017,7.666425 -21.748928,7.487131 L -19.508526,3.664751 C -19.430086,3.579221 -19.25711,3.523866 -18.717209,3.584203 z M -35.375873,5.566491 C -35.327237,5.573403 -35.273405,5.584742 -35.233036,5.598777 L -29.104749,8.390464 C -28.801738,8.528985 -28.779973,8.735063 -28.876851,8.995188 C -29.077458,9.242607 -29.321699,9.416099 -29.73562,9.466802 L -38.096221,10.483696 C -38.475427,10.505763 -38.840093,10.326253 -38.933588,8.93171 C -38.859576,8.558069 -38.725523,8.190349 -38.505924,7.81569 C -38.286326,7.441031 -38.000234,7.091935 -37.655669,6.751435 C -36.262557,5.722497 -35.693812,5.521308 -35.375873,5.566491 z M -10.744765,8.583639 C -10.420003,8.617182 -10.147502,8.921419 -10.066412,10.130937 C -10.140424,10.504578 -10.274477,10.872298 -10.494076,11.246957 C -10.713674,11.621617 -10.999766,11.970712 -11.344331,12.311212 C -12.95055,13.49755 -13.462697,13.569656 -13.766964,13.46387 L -19.895251,10.672183 C -20.18236,10.540931 -20.223861,10.349545 -20.147413,10.108857 C -20.137249,10.095409 -20.133676,10.080443 -20.123149,10.067459 C -20.118065,10.053808 -20.104791,10.040031 -20.098884,10.026061 C -19.901841,9.800145 -19.656579,9.643887 -19.26438,9.595845 L -10.903779,8.578951 C -10.853467,8.576023 -10.794444,8.578508 -10.744765,8.583639 z M -28.352173,10.804671 C -28.147075,10.839608 -27.93338,10.90434 -27.71453,10.986308 C -27.337983,11.191948 -27.138976,11.384269 -27.251072,11.575516 L -29.491474,15.397896 C -29.637821,15.557471 -30.175474,15.604125 -32.795668,14.963574 C -34.166831,14.525878 -35.347891,13.991803 -36.300167,13.380681 C -37.79137,12.120874 -37.682594,11.888514 -37.326732,11.820309 L -28.958044,10.789616 C -28.753773,10.764594 -28.557271,10.769735 -28.352173,10.804671 z M -22.526433,11.518286 C -22.322238,11.536323 -22.159006,11.574411 -22.015452,11.640038 L -15.895253,14.445524 C -15.661665,14.585932 -15.8216,14.812025 -18.490909,15.562197 C -19.984006,15.873778 -21.590967,16.066338 -23.257151,16.13198 C -26.226894,16.0878 -26.641489,15.924502 -26.593697,15.752855 L -24.353295,11.930475 C -24.236888,11.731871 -23.826261,11.612847 -23.239035,11.519736 C -22.975787,11.502263 -22.730627,11.500249 -22.526433,11.518286 z "
+         style="opacity:1;color:black;fill:url(#radialGradient3907);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         transform="matrix(1.210083,0,0,1.462367,-127.7352,-5.811834)"
+         d="M 100.1875 10.8125 A 14.875 5.8125 0 1 1  70.4375,10.8125 A 14.875 5.8125 0 1 1  100.1875 10.8125 z"
+         sodipodi:ry="5.8125"
+         sodipodi:rx="14.875"
+         sodipodi:cy="10.8125"
+         sodipodi:cx="85.3125"
+         id="path2986"
+         style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:0.77012676;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.142856,0,0,1.290324,-121.9999,-3.951621)"
+         d="M 100.1875 10.8125 A 14.875 5.8125 0 1 1  70.4375,10.8125 A 14.875 5.8125 0 1 1  100.1875 10.8125 z"
+         sodipodi:ry="5.8125"
+         sodipodi:rx="14.875"
+         sodipodi:cy="10.8125"
+         sodipodi:cx="85.3125"
+         id="path2988"
+         style="opacity:0.5;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3909);stroke-width:0.84363157;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="color:black;fill:url(#linearGradient3107);fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 25.5,5.5 C 20.536155,5.5 16.5,7.52016 16.5,10 L 16.5,16 C 16.5,18.47984 20.536157,20.5 25.5,20.5 C 30.463845,20.5 34.5,18.47984 34.5,16 L 34.5,10 C 34.5,7.52016 30.463848,5.5 25.5,5.5 z "
+       id="path2003"
+       sodipodi:nodetypes="csssssc" />
+    <path
+       style="opacity:1;fill:url(#linearGradient3099);fill-opacity:1;stroke:url(#linearGradient3096);stroke-width:1.01100004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 22.812512,20.28125 L 41.60134,24.28125 C 46.85523,25.399764 46.49128,29.361359 46.49128,29.361359 L 46.49128,21.486359 C 46.49128,21.486359 46.132703,17.663667 41.60134,16.8125 L 24,13.506282"
+       id="rect2953"
+       sodipodi:nodetypes="czcczc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;color:black;fill:url(#linearGradient6599);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path5706"
+       sodipodi:cx="25.5"
+       sodipodi:cy="9.5"
+       sodipodi:rx="8.5"
+       sodipodi:ry="3.5"
+       d="M 34 9.5 A 8.5 3.5 0 1 1  17,9.5 A 8.5 3.5 0 1 1  34 9.5 z"
+       transform="matrix(1,0,0,1.142857,0,-0.857143)" />
+    <path
+       transform="translate(0,-1)"
+       style="opacity:0.4;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3060);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0.7;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 17.5625,16 C 17.5625,16.536843 17.92744,17.18169 18.875,17.8125 C 19.82256,18.44331 21.26461,18.980918 22.96875,19.25 C 22.989579,19.249384 23.010421,19.249384 23.03125,19.25 L 41.8125,23.25 C 43.42996,23.594345 44.694406,24.079834 45.5625,24.8125"
+       id="path3043"
+       sodipodi:nodetypes="cssccc" />
+    <path
+       style="opacity:0.39849626;color:black;fill:url(#radialGradient2998);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.96992087;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 26.34375,6.03125 L 25.28125,7.84375 C 25.169154,8.034998 24.801014,8.15798 24.25,8.25 C 23.691642,8.291924 23.267822,8.292972 22.96875,8.15625 L 20.21875,6.90625 C 19.435475,7.2019093 18.739204,7.5309064 18.21875,7.9375 L 20.84375,9.125 C 21.146761,9.2635209 21.159378,9.458625 21.0625,9.71875 C 20.861894,9.9661689 20.632671,10.136797 20.21875,10.1875 L 17.09375,10.5625 C 17.234387,11.031002 17.545294,11.473239 18,11.875 L 20.96875,11.5 C 21.173021,11.474978 21.388652,11.496314 21.59375,11.53125 C 21.798848,11.566187 21.9999,11.636782 22.21875,11.71875 C 22.595298,11.92439 22.799596,12.121253 22.6875,12.3125 L 21.90625,13.625 C 22.800402,13.822195 23.781767,13.929355 24.8125,13.96875 L 25.59375,12.65625 C 25.710156,12.457646 26.100274,12.343111 26.6875,12.25 C 26.950747,12.232527 27.202056,12.231963 27.40625,12.25 C 27.610446,12.268037 27.793946,12.309373 27.9375,12.375 L 30.09375,13.34375 C 30.931804,13.088908 31.680434,12.779683 32.28125,12.40625 L 30.03125,11.40625 C 29.74414,11.274998 29.704802,11.084438 29.78125,10.84375 C 29.791414,10.830302 29.801973,10.794234 29.8125,10.78125 C 29.817585,10.767599 29.837843,10.76397 29.84375,10.75 C 30.040793,10.524084 30.295301,10.360542 30.6875,10.3125 L 34,9.90625 C 33.97667,9.4345321 33.779459,8.9803565 33.4375,8.5625 L 29.90625,9 C 29.471563,9.0532484 29.064068,8.93615 28.59375,8.75 C 28.264296,8.5590324 28.082411,8.398044 28.1875,8.21875 L 29.25,6.4375 C 28.355889,6.2289546 27.381597,6.0799454 26.34375,6.03125 z "
+       id="path3099" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0574123"
+       inkscape:original="M 25.5 5.5 C 20.536155 5.5 16.5 7.52016 16.5 10 L 16.5 16 C 16.5 18.009253 19.166589 19.705564 22.8125 20.28125 L 41.59375 24.28125 C 46.847639 25.399764 46.5 29.375 46.5 29.375 L 46.5 21.5 C 46.5 21.5 46.14223 17.566861 41.59375 16.8125 L 34.5 15.625 L 34.5 10 C 34.5 7.52016 30.463848 5.5 25.5 5.5 z "
+       style="opacity:0.1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:white;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3030"
+       d="M 25.5,6.5625 C 23.161524,6.5625 21.062537,7.0622517 19.625,7.78125 C 18.187463,8.5002483 17.5625,9.3337568 17.5625,10 L 17.5625,16 C 17.5625,16.536843 17.92744,17.18169 18.875,17.8125 C 19.82256,18.44331 21.26461,18.980918 22.96875,19.25 C 22.989579,19.249384 23.010421,19.249384 23.03125,19.25 L 41.8125,23.25 C 43.42996,23.594345 44.569406,24.236084 45.4375,24.96875 L 45.4375,21.59375 C 45.4375,21.59375 45.374858,20.869771 44.84375,20 C 44.312642,19.130229 43.392274,18.17313 41.40625,17.84375 L 34.3125,16.65625 C 33.810416,16.5683 33.442516,16.134704 33.4375,15.625 L 33.4375,10 C 33.4375,9.3337563 32.812537,8.5002482 31.375,7.78125 C 29.937463,7.0622518 27.838477,6.5625 25.5,6.5625 z " />
+    <g
+       id="g3035">
+      <path
+         sodipodi:nodetypes="cczcczccc"
+         id="rect2949"
+         d="M 1.50002,29.499973 C 1.50002,29.499973 3.532822,27.499973 8.506322,27.499973 L 31.512623,27.499973 C 44.18377,27.499973 46.50001,25.003118 46.50001,21.499973 C 46.50001,24.174151 46.50001,29.499986 46.50001,29.499986 C 46.50001,35.359796 44.22293,37.947515 31.512623,38.499986 L 8.506322,39.499986 C 3.847089,39.941928 1.50002,43.499986 1.50002,43.499986 L 1.50002,29.499973 z "
+         style="opacity:1;fill:url(#linearGradient3047);fill-opacity:1;stroke:#2e3436;stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cczc"
+         id="path2978"
+         d="M 2.12502,31.874973 C 2.12502,31.874973 3.532822,29.499973 8.506322,29.499973 L 31.512623,29.499973 C 44.18377,29.499973 46.50001,27.003118 46.50001,23.499973"
+         style="opacity:0.6;fill:none;fill-opacity:1;stroke:url(#linearGradient2988);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0.5;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="czcc"
+         id="path2980"
+         d="M 46.56251,25.968736 C 46.56251,31.828546 45.93712,36.499986 31.512623,36.499986 L 8.506322,37.499986 C 3.847089,37.941928 1.50002,41.499986 1.50002,41.499986"
+         style="opacity:0.6;fill:none;fill-opacity:1;stroke:url(#linearGradient3000);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0.9;stroke-opacity:1" />
+      <path
+         id="path3004"
+         d="M 45.0625,28.71875 C 44.37308,29.200323 43.74836,29.777176 42,30.21875 L 42,33.4375 C 45.16645,32.177079 45.06242,30.62266 45.0625,30.59375 L 45.0625,28.71875 z M 41,30.40625 C 40.20657,30.55277 39.21189,30.683386 38,30.78125 L 38,34.46875 C 39.187273,34.27185 40.17881,34.037517 41,33.78125 L 41,30.40625 z M 37,30.84375 C 35.848926,30.914726 34.565444,30.981472 33,31 L 33,34.96875 C 34.511976,34.894324 35.84389,34.78099 37,34.625 L 37,30.84375 z M 32,31 L 28,31.03125 L 28,35.1875 L 32,35.03125 L 32,31 z M 27,31.03125 L 23,31.0625 L 23,35.375 L 27,35.21875 L 27,31.03125 z M 22,31.09375 L 18,31.125 L 18,35.59375 L 22,35.4375 L 22,31.09375 z M 17,31.125 L 13,31.15625 L 13,35.78125 L 17,35.625 L 17,31.125 z M 12,31.15625 L 8.34375,31.1875 C 8.225387,31.184386 8.117212,31.186035 8,31.1875 L 8,36.03125 C 8.163488,36.008835 8.337513,35.974104 8.46875,35.96875 L 12,35.8125 L 12,31.15625 z M 7,31.25 C 5.871329,31.386685 4.830104,31.709176 4,32.125 L 4,37.375 C 4.94283,36.868709 6.054189,36.456108 7,36.21875 L 7,31.25 z M 3,32.75 C 2.399986,33.209949 2.017888,33.69653 2,34.125 L 2,39.25 C 2.138532,38.805351 2.509781,38.379775 3,38 L 3,32.75 z "
+         style="opacity:0.3;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         transform="translate(-60,0)"
+         d="M 105.5,25.8125 C 105.11869,26.131585 104.70169,26.466625 104.1875,26.71875 C 101.75082,27.913525 97.901254,28.5 91.5,28.5 L 68.5,28.5 C 66.147294,28.5 64.53517,28.961373 63.53125,29.40625 C 62.760319,29.74788 62.632868,29.916333 62.5,30.03125 L 62.5,41.03125 C 63.789632,39.926876 65.68087,38.758511 68.40625,38.5 C 68.427078,38.499349 68.447922,38.499349 68.46875,38.5 L 91.46875,37.5 C 97.758835,37.226593 101.36312,36.399909 103.21875,35.15625 C 105.07438,33.912591 105.5,32.299656 105.5,29.5 C 105.5,29.5 105.5,27.294332 105.5,25.8125 z "
+         id="path3065"
+         style="opacity:0.2;fill:none;fill-opacity:1;stroke:url(#linearGradient3122);stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         inkscape:original="M 106.5 21.5 C 106.5 25.003145 104.17114 27.5 91.5 27.5 L 68.5 27.5 C 63.5265 27.5 61.500001 29.5 61.5 29.5 L 61.5 43.5 C 61.5 43.5 63.840764 39.941943 68.5 39.5 L 91.5 38.5 C 104.21031 37.947529 106.5 35.359809 106.5 29.5 C 106.5 29.5 106.5 24.174178 106.5 21.5 z "
+         inkscape:radius="-1"
+         sodipodi:type="inkscape:offset" />
+      <rect
+         ry="0.47940475"
+         rx="0.42824069"
+         y="29.53125"
+         x="2.0182304"
+         height="12.03125"
+         width="0.96354169"
+         id="rect3114"
+         style="opacity:1;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1.01100004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.9;stroke-opacity:1" />
+    </g>
+    <path
+       style="opacity:0.4;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3062);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 44.84375,21 C 44.312642,20.130229 43.392274,19.17313 41.40625,18.84375 L 34.3125,17.65625 C 28.132886,16.621777 17.500893,15.478056 17.500893,11.390758"
+       id="path3046"
+       sodipodi:nodetypes="cczc" />
+    <path
+       style="opacity:0.15;color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 18,13.875 L 18,15.90625 L 20,16.65625 L 20,14.78125 C 19.159795,14.440675 18.469808,14.133901 18,13.875 z M 21,15.15625 L 21,17.03125 L 23,17.78125 L 23,15.75 C 22.445474,15.648993 21.73377,15.420922 21,15.15625 z M 24,15.96875 L 24,18 L 26,18.40625 L 26,16.375 L 24,15.96875 z M 27,16.5625 L 27,18.59375 L 29,19 L 29,16.96875 L 27,16.5625 z M 30,17.1875 L 30,19.21875 L 32,19.625 L 32,17.59375 L 30,17.1875 z M 33,17.78125 L 33,19.8125 L 35,20.21875 L 35,18.21875 L 33,17.78125 z M 36,18.40625 L 36,20.4375 L 38,20.84375 L 38,18.8125 L 36,18.40625 z M 39,19.03125 L 39,21.03125 L 41,21.4375 L 41,19.4375 L 39,19.03125 z M 42,19.625 L 42,21.6875 C 42.817262,21.904793 43.456287,22.197387 44,22.59375 L 44,20.3125 C 43.403373,20.028973 42.747736,19.784187 42,19.625 z M 45,20.875 L 45,23.46875 L 45.4375,23.90625 L 46,22.15625 L 46,21.6875 C 45.689896,21.392151 45.36,21.118532 45,20.875 z "
+       id="path3071" />
+    <path
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3087);stroke-width:0.82348335;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2966"
+       sodipodi:cx="85.3125"
+       sodipodi:cy="10.8125"
+       sodipodi:rx="14.875"
+       sodipodi:ry="5.8125"
+       d="M 100.1875 10.8125 A 14.875 5.8125 0 1 1  70.4375,10.8125 A 14.875 5.8125 0 1 1  100.1875 10.8125 z"
+       transform="matrix(1.142857,0,0,1.290323,-72.00001,-3.95161)" />
+    <path
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.75173426;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3165"
+       sodipodi:cx="85.3125"
+       sodipodi:cy="10.8125"
+       sodipodi:rx="14.875"
+       sodipodi:ry="5.8125"
+       d="M 100.1875 10.8125 A 14.875 5.8125 0 1 1  70.4375,10.8125 A 14.875 5.8125 0 1 1  100.1875 10.8125 z"
+       transform="matrix(1.210083,0,0,1.462367,-77.73519,-5.811834)" />
+    <path
+       style="opacity:1;color:black;fill:url(#radialGradient5689);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 30.029333,2.274237 C 20.698494,1.13127 11.09649,3.665589 8.596298,7.931199 C 6.0961053,12.196811 11.639826,16.58638 20.970667,17.729347 C 30.301506,18.872313 39.903508,16.337996 42.403702,12.072384 C 44.903894,7.806773 39.360173,3.417203 30.029333,2.274237 z M 26.513532,3 C 27.494068,3.075308 27.625715,3.194794 27.593697,3.309793 L 25.353295,7.132172 C 25.241199,7.32342 24.858508,7.444486 24.307494,7.536506 C 23.749135,7.57843 23.314524,7.559332 23.015452,7.42261 L 16.895253,4.617124 C 16.661667,4.476713 16.821602,4.250621 19.490909,3.50045 C 20.984007,3.188868 22.590966,2.996311 24.257151,2.930667 C 25.237216,2.945249 26.030543,2.962906 26.513532,3 z M 31.282791,3.584203 C 31.750192,3.63644 32.579862,3.801848 33.795668,4.099073 C 35.16683,4.536772 36.347892,5.070843 37.300167,5.681966 C 38.791373,6.941773 38.682595,7.174131 38.326732,7.242338 L 29.958044,8.273031 C 29.523357,8.326279 29.110469,8.223798 28.640151,8.037648 C 28.310696,7.84668 28.145983,7.666425 28.251072,7.487131 L 30.491474,3.664751 C 30.569914,3.579221 30.74289,3.523866 31.282791,3.584203 z M 14.624127,5.566491 C 14.672763,5.573403 14.726595,5.584742 14.766964,5.598777 L 20.895251,8.390464 C 21.198262,8.528985 21.220027,8.735063 21.123149,8.995188 C 20.922542,9.242607 20.678301,9.416099 20.26438,9.466802 L 11.903779,10.483696 C 11.524573,10.505763 11.159907,10.326253 11.066412,8.93171 C 11.140424,8.558069 11.274477,8.190349 11.494076,7.81569 C 11.713674,7.441031 11.999766,7.091935 12.344331,6.751435 C 13.737443,5.722497 14.306188,5.521308 14.624127,5.566491 z M 39.255235,8.583639 C 39.579997,8.617182 39.852498,8.921419 39.933588,10.130937 C 39.859576,10.504578 39.725523,10.872298 39.505924,11.246957 C 39.286326,11.621617 39.000234,11.970712 38.655669,12.311212 C 37.04945,13.49755 36.537303,13.569656 36.233036,13.46387 L 30.104749,10.672183 C 29.81764,10.540931 29.776139,10.349545 29.852587,10.108857 C 29.862751,10.095409 29.866324,10.080443 29.876851,10.067459 C 29.881935,10.053808 29.895209,10.040031 29.901116,10.026061 C 30.098159,9.800145 30.343421,9.643887 30.73562,9.595845 L 39.096221,8.578951 C 39.146533,8.576023 39.205556,8.578508 39.255235,8.583639 z M 21.647827,10.804671 C 21.852925,10.839608 22.06662,10.90434 22.28547,10.986308 C 22.662017,11.191948 22.861024,11.384269 22.748928,11.575516 L 20.508526,15.397896 C 20.362179,15.557471 19.824526,15.604125 17.204332,14.963574 C 15.833169,14.525878 14.652109,13.991803 13.699833,13.380681 C 12.20863,12.120874 12.317406,11.888514 12.673268,11.820309 L 21.041956,10.789616 C 21.246227,10.764594 21.442729,10.769735 21.647827,10.804671 z M 27.473567,11.518286 C 27.677762,11.536323 27.840994,11.574411 27.984548,11.640038 L 34.104747,14.445524 C 34.338335,14.585932 34.1784,14.812025 31.509091,15.562197 C 30.015994,15.873778 28.409033,16.066338 26.742849,16.13198 C 23.773106,16.0878 23.358511,15.924502 23.406303,15.752855 L 25.646705,11.930475 C 25.763112,11.731871 26.173739,11.612847 26.760965,11.519736 C 27.024213,11.502263 27.269373,11.500249 27.473567,11.518286 z "
+       id="path2992"
+       sodipodi:nodetypes="csssccccccccccccccccccccccccccsccccscccsssccccccccccccccccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5743);stroke-width:0.82348359;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3882"
+       sodipodi:cx="85.3125"
+       sodipodi:cy="10.8125"
+       sodipodi:rx="14.875"
+       sodipodi:ry="5.8125"
+       d="M 100.1875 10.8125 A 14.875 5.8125 0 1 1  70.4375,10.8125 A 14.875 5.8125 0 1 1  100.1875 10.8125 z"
+       transform="matrix(1.142856,0,0,1.290324,-71.99989,-3.951621)" />
+    <path
+       style="opacity:0.7;color:black;fill:url(#linearGradient3003);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 24.21875,2.46875 C 22.529463,2.535304 20.928347,2.713616 19.40625,3.03125 C 19.395836,3.030905 19.385414,3.030905 19.375,3.03125 C 18.030353,3.409144 17.31816,3.671511 16.90625,3.875 C 16.700295,3.976745 16.533745,4.024698 16.40625,4.3125 C 16.342503,4.456401 16.359638,4.683059 16.4375,4.8125 C 16.515362,4.941941 16.592126,4.992705 16.65625,5.03125 C 16.676283,5.043196 16.697173,5.053642 16.71875,5.0625 L 22.8125,7.875 C 23.277073,8.087382 23.766882,8.043314 24.34375,8 C 24.354164,8.000345 24.364586,8.000345 24.375,8 C 24.66736,7.951176 24.93252,7.897112 25.15625,7.8125 C 25.37998,7.727888 25.602277,7.627033 25.75,7.375 L 28,3.5625 C 28.02692,3.524165 28.047984,3.482037 28.0625,3.4375 C 28.10103,3.299111 28.051103,3.040171 27.9375,2.90625 C 27.823897,2.772329 27.713327,2.729453 27.59375,2.6875 C 27.354596,2.603594 27.039179,2.57026 26.53125,2.53125 C 26.016219,2.491695 25.229781,2.483328 24.25,2.46875 C 24.239586,2.468405 24.229164,2.468405 24.21875,2.46875 z M 24.25,2.9375 C 25.230065,2.952082 26.017011,2.962906 26.5,3 C 27.480535,3.075308 27.625768,3.197501 27.59375,3.3125 L 25.34375,7.125 C 25.231655,7.316248 24.863514,7.43923 24.3125,7.53125 C 23.754142,7.573174 23.299072,7.574222 23,7.4375 L 16.90625,4.625 C 16.672665,4.484589 16.830693,4.250171 19.5,3.5 C 20.993097,3.188418 22.583815,3.003144 24.25,2.9375 z M 30.65625,3.09375 C 30.474425,3.112971 30.282388,3.206211 30.15625,3.34375 C 30.133508,3.362583 30.112583,3.383508 30.09375,3.40625 L 27.84375,7.25 C 27.710285,7.477708 27.766317,7.846965 27.90625,8.03125 C 28.046183,8.215535 28.187487,8.328808 28.375,8.4375 C 28.395033,8.449446 28.415923,8.459892 28.4375,8.46875 C 28.938239,8.66694 29.475613,8.818064 30.03125,8.75 L 38.375,7.71875 C 38.385414,7.719095 38.395836,7.719095 38.40625,7.71875 C 38.538892,7.693327 38.708411,7.654058 38.875,7.4375 C 39.041589,7.220942 39.030807,6.912667 38.9375,6.71875 C 38.750886,6.330917 38.38701,5.956264 37.625,5.3125 C 37.604967,5.300554 37.584077,5.290108 37.5625,5.28125 C 36.56488,4.641027 35.340283,4.104044 33.9375,3.65625 C 33.927577,3.645351 33.917149,3.634923 33.90625,3.625 C 32.678785,3.324925 31.850309,3.181613 31.34375,3.125 C 31.057919,3.093057 30.838075,3.074529 30.65625,3.09375 z M 30.71875,3.5625 C 30.839287,3.545512 31.0113,3.563581 31.28125,3.59375 C 31.748651,3.645987 32.565444,3.796525 33.78125,4.09375 C 35.15241,4.531449 36.360225,5.076377 37.3125,5.6875 C 38.803706,6.947307 38.668363,7.181793 38.3125,7.25 L 29.96875,8.28125 C 29.534063,8.334498 29.095318,8.2174 28.625,8.03125 C 28.295546,7.840282 28.144911,7.679294 28.25,7.5 L 30.5,3.65625 C 30.53922,3.613485 30.598213,3.579488 30.71875,3.5625 z M 14.6875,5.09375 C 14.096019,5.009693 13.481171,5.327185 12.0625,6.375 C 12.040923,6.383858 12.020033,6.394304 12,6.40625 C 11.632082,6.769827 11.337374,7.14685 11.09375,7.5625 C 10.849839,7.978638 10.67867,8.415039 10.59375,8.84375 C 10.588209,8.885233 10.588209,8.927267 10.59375,8.96875 C 10.643206,9.706413 10.75471,10.158753 11,10.5 C 11.24529,10.841247 11.673435,10.952867 11.9375,10.9375 C 11.947914,10.937845 11.958336,10.937845 11.96875,10.9375 L 20.3125,9.9375 C 20.829557,9.874163 21.240367,9.632717 21.5,9.3125 C 21.530023,9.26458 21.551193,9.211656 21.5625,9.15625 C 21.628907,8.977942 21.693002,8.781478 21.625,8.53125 C 21.556998,8.281022 21.331424,8.046152 21.09375,7.9375 L 14.96875,5.15625 C 14.958336,5.155905 14.947914,5.155905 14.9375,5.15625 C 14.811235,5.112352 14.740824,5.101328 14.6875,5.09375 z M 14.625,5.5625 C 14.673636,5.569412 14.740881,5.579715 14.78125,5.59375 L 20.90625,8.375 C 21.209262,8.513521 21.221878,8.739875 21.125,9 C 20.924392,9.247419 20.663921,9.418047 20.25,9.46875 L 11.90625,10.46875 C 11.527044,10.490817 11.155995,10.332043 11.0625,8.9375 C 11.136512,8.563859 11.280401,8.187159 11.5,7.8125 C 11.719598,7.437841 11.999185,7.0905 12.34375,6.75 C 13.736862,5.721062 14.307061,5.517317 14.625,5.5625 z M 39.03125,8.125 L 30.6875,9.125 C 30.227736,9.181318 29.879783,9.392513 29.625,9.65625 C 29.623983,9.656939 29.598616,9.684777 29.59375,9.6875 C 29.584051,9.698064 29.571837,9.708045 29.5625,9.71875 C 29.551601,9.728673 29.541173,9.739101 29.53125,9.75 L 29.5,9.75 C 29.550744,9.687412 29.541034,9.716862 29.46875,9.8125 C 29.468405,9.822914 29.468405,9.833336 29.46875,9.84375 C 29.444249,9.872393 29.423266,9.903867 29.40625,9.9375 C 29.34829,10.119981 29.292723,10.361835 29.375,10.59375 C 29.457277,10.825665 29.678664,11.020959 29.90625,11.125 L 36.03125,13.90625 C 36.041664,13.906595 36.052086,13.906595 36.0625,13.90625 C 36.327468,13.998373 36.691653,13.992584 37.125,13.8125 C 37.558347,13.632416 38.118404,13.292476 38.9375,12.6875 C 38.959077,12.678642 38.979967,12.668196 39,12.65625 C 39.367917,12.292673 39.662626,11.915652 39.90625,11.5 C 40.150161,11.083863 40.321331,10.647464 40.40625,10.21875 C 40.411791,10.177268 40.411791,10.135232 40.40625,10.09375 C 40.363432,9.455094 40.270005,9.018395 40.09375,8.6875 C 39.917495,8.356605 39.598432,8.154532 39.3125,8.125 C 39.212859,8.114709 39.119476,8.121684 39.0625,8.125 C 39.052086,8.124655 39.041664,8.124655 39.03125,8.125 z M 39.09375,8.59375 C 39.144061,8.590822 39.200321,8.588619 39.25,8.59375 C 39.574763,8.627293 39.85641,8.915482 39.9375,10.125 C 39.86349,10.498641 39.719599,10.875341 39.5,11.25 C 39.280402,11.62466 39.000815,11.972 38.65625,12.3125 C 37.05003,13.498838 36.523017,13.574536 36.21875,13.46875 L 30.09375,10.6875 C 29.80664,10.556248 29.767302,10.334438 29.84375,10.09375 C 29.853914,10.080302 29.864473,10.075484 29.875,10.0625 C 29.880085,10.048849 29.900343,10.04522 29.90625,10.03125 C 30.103294,9.805334 30.357801,9.641792 30.75,9.59375 L 39.09375,8.59375 z M 20.96875,10.3125 L 12.625,11.34375 C 12.614586,11.343405 12.604164,11.343405 12.59375,11.34375 C 12.461108,11.369172 12.291589,11.408441 12.125,11.625 C 11.958411,11.841559 11.969193,12.149834 12.0625,12.34375 C 12.249114,12.731583 12.612992,13.106236 13.375,13.75 C 13.395033,13.761946 13.415923,13.772392 13.4375,13.78125 C 14.435119,14.421471 15.659713,14.958459 17.0625,15.40625 C 17.072423,15.417149 17.082851,15.427577 17.09375,15.4375 C 18.413166,15.760054 19.231179,15.914896 19.75,15.96875 C 20.00941,15.995677 20.199598,15.995126 20.375,15.96875 C 20.550402,15.942374 20.721219,15.852356 20.84375,15.71875 C 20.866492,15.699917 20.887417,15.678992 20.90625,15.65625 L 23.15625,11.8125 C 23.230934,11.685081 23.282536,11.503864 23.25,11.34375 C 23.217464,11.183636 23.110915,11.054933 23.03125,10.96875 C 22.87192,10.796385 22.70354,10.704907 22.5,10.59375 C 22.479967,10.581804 22.459077,10.571358 22.4375,10.5625 C 22.213091,10.47845 22.008525,10.387788 21.75,10.34375 C 21.522274,10.30496 21.244957,10.278666 20.96875,10.3125 z M 21.03125,10.78125 C 21.235521,10.756228 21.451152,10.777564 21.65625,10.8125 C 21.861348,10.847437 22.0624,10.918032 22.28125,11 C 22.657798,11.20564 22.862096,11.371253 22.75,11.5625 L 20.5,15.40625 C 20.353653,15.565825 19.838944,15.609301 17.21875,14.96875 C 15.847587,14.531054 14.639776,13.986122 13.6875,13.375 C 12.196297,12.115193 12.331638,11.880705 12.6875,11.8125 L 21.03125,10.78125 z M 26.6875,11.0625 C 26.380288,11.111212 26.108719,11.167973 25.875,11.25 C 25.641281,11.332027 25.404512,11.423882 25.25,11.6875 L 23,15.5 C 22.97308,15.538335 22.952016,15.580463 22.9375,15.625 C 22.904935,15.741959 22.920591,15.932646 23,16.0625 C 23.079409,16.192354 23.19427,16.237608 23.28125,16.28125 C 23.45521,16.368533 23.617124,16.400918 23.875,16.4375 C 24.390753,16.510664 25.25703,16.571539 26.75,16.59375 C 26.760414,16.594095 26.770836,16.594095 26.78125,16.59375 C 28.470537,16.527198 30.071654,16.348883 31.59375,16.03125 C 31.604164,16.031595 31.614586,16.031595 31.625,16.03125 C 32.969648,15.653356 33.681841,15.39099 34.09375,15.1875 C 34.299705,15.085755 34.466255,15.037804 34.59375,14.75 C 34.657497,14.606098 34.640364,14.37944 34.5625,14.25 C 34.484636,14.12056 34.407874,14.069795 34.34375,14.03125 C 34.323717,14.019304 34.302827,14.008858 34.28125,14 L 28.1875,11.1875 C 27.922241,11.066235 27.694869,11.079713 27.5,11.0625 C 27.261132,11.0414 27.001137,11.043757 26.71875,11.0625 C 26.708336,11.062155 26.697914,11.062155 26.6875,11.0625 z M 26.75,11.53125 C 27.013248,11.513777 27.264556,11.513213 27.46875,11.53125 C 27.672946,11.549287 27.856446,11.559373 28,11.625 L 34.09375,14.4375 C 34.327337,14.577908 34.169309,14.812328 31.5,15.5625 C 30.006904,15.874081 28.416184,16.059358 26.75,16.125 C 23.780257,16.080819 23.358458,15.921647 23.40625,15.75 L 25.65625,11.9375 C 25.772656,11.738896 26.162774,11.624361 26.75,11.53125 z "
+       id="path6550" />
+    <path
+       style="opacity:0.29714286;fill:url(#linearGradient3005);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 32.75,28.125 C 36.665221,27.989041 39.663593,27.509264 42.25,26.875 L 44.6875,34.8125 C 41.143944,37.348492 36.537218,37.994406 31.5,37.875 L 32.75,28.125 z "
+       id="path2111"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:url(#linearGradient3017);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0;opacity:0.6"
+       d="M 41.100582,23.560622 C 42.545852,23.922695 43.601874,24.362619 44.459339,24.842253 C 45.66266,23.973241 47.054739,21.640304 44.724504,18.831845 C 44.97435,19.937288 45.182433,21.455139 41.100582,23.560622 z "
+       id="path3009"
+       sodipodi:nodetypes="cccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="troiai2"
+     style="display:none">
+    <path
+       style="opacity:1;color:black;fill:url(#linearGradient4796);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M -19.970667,8.274237 C -29.301506,7.13127 -38.90351,9.665589 -41.403702,13.931199 C -43.903895,18.196811 -38.360174,22.58638 -29.029333,23.729347 C -19.698494,24.872313 -10.096492,22.337996 -7.596298,18.072384 C -5.096106,13.806773 -10.639827,9.417203 -19.970667,8.274237 z M -23.486468,9.470468 C -22.505932,9.545776 -22.374285,9.665262 -22.406303,9.780261 L -24.646705,13.60264 C -24.758801,13.793888 -25.141492,13.914954 -25.692506,14.006974 C -26.250865,14.048898 -26.685476,14.0298 -26.984548,13.893078 L -33.104747,11.087592 C -33.338333,10.947181 -33.178398,10.721089 -30.509091,9.970918 C -29.015993,9.659336 -27.409034,9.466779 -25.742849,9.401135 C -24.762784,9.415717 -23.969457,9.433374 -23.486468,9.470468 z M -18.717209,10.054671 C -18.249808,10.106908 -17.420138,10.272316 -16.204332,10.569541 C -14.83317,11.00724 -13.652108,11.541311 -12.699833,12.152434 C -11.208627,13.412241 -11.317405,13.644599 -11.673268,13.712806 L -20.041956,14.743499 C -20.476643,14.796747 -20.889531,14.694266 -21.359849,14.508116 C -21.689304,14.317148 -21.854017,14.136893 -21.748928,13.957599 L -19.508526,10.135219 C -19.430086,10.049689 -19.25711,9.994334 -18.717209,10.054671 z M -35.375873,12.036959 C -35.327237,12.043871 -35.273405,12.05521 -35.233036,12.069245 L -29.104749,14.860932 C -28.801738,14.999453 -28.779973,15.205531 -28.876851,15.465656 C -29.077458,15.713075 -29.321699,15.886567 -29.73562,15.93727 L -38.096221,16.954164 C -38.475427,16.976231 -38.840093,16.796721 -38.933588,15.402178 C -38.859576,15.028537 -38.725523,14.660817 -38.505924,14.286158 C -38.286326,13.911499 -38.000234,13.562403 -37.655669,13.221903 C -36.262557,12.192965 -35.693812,11.991776 -35.375873,12.036959 z M -10.744765,15.054107 C -10.420003,15.08765 -10.147502,15.391887 -10.066412,16.601405 C -10.140424,16.975046 -10.274477,17.342766 -10.494076,17.717425 C -10.713674,18.092085 -10.999766,18.44118 -11.344331,18.78168 C -12.95055,19.968018 -13.462697,20.040124 -13.766964,19.934338 L -19.895251,17.142651 C -20.18236,17.011399 -20.223861,16.820013 -20.147413,16.579325 C -20.137249,16.565877 -20.133676,16.550911 -20.123149,16.537927 C -20.118065,16.524276 -20.104791,16.510499 -20.098884,16.496529 C -19.901841,16.270613 -19.656579,16.114355 -19.26438,16.066313 L -10.903779,15.049419 C -10.853467,15.046491 -10.794444,15.048976 -10.744765,15.054107 z M -28.352173,17.275139 C -28.147075,17.310076 -27.93338,17.374808 -27.71453,17.456776 C -27.337983,17.662416 -27.138976,17.854737 -27.251072,18.045984 L -29.491474,21.868364 C -29.637821,22.027939 -30.175474,22.074593 -32.795668,21.434042 C -34.166831,20.996346 -35.347891,20.462271 -36.300167,19.851149 C -37.79137,18.591342 -37.682594,18.358982 -37.326732,18.290777 L -28.958044,17.260084 C -28.753773,17.235062 -28.557271,17.240203 -28.352173,17.275139 z M -22.526433,17.988754 C -22.322238,18.006791 -22.159006,18.044879 -22.015452,18.110506 L -15.895253,20.915992 C -15.661665,21.0564 -15.8216,21.282493 -18.490909,22.032665 C -19.984006,22.344246 -21.590967,22.536806 -23.257151,22.602448 C -26.226894,22.558268 -26.641489,22.39497 -26.593697,22.223323 L -24.353295,18.400943 C -24.236888,18.202339 -23.826261,18.083315 -23.239035,17.990204 C -22.975787,17.972731 -22.730627,17.970717 -22.526433,17.988754 z "
+       id="path3888" />
+    <g
+       style="display:inline"
+       id="g2992">
+      <g
+         style="stroke:#2e3436"
+         id="g3891">
+        <path
+           style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M -23.486468,9.470468 C -22.505932,9.545776 -22.374285,9.665262 -22.406303,9.780261 L -24.646705,13.60264 C -24.758801,13.793888 -25.141492,13.914954 -25.692506,14.006974 C -26.250865,14.048898 -26.685476,14.0298 -26.984548,13.893078 L -33.104747,11.087592 C -33.338333,10.947181 -33.178398,10.721089 -30.509091,9.970918 C -29.015993,9.659336 -27.409034,9.466779 -25.742849,9.401135 C -24.762784,9.415717 -23.969457,9.433374 -23.486468,9.470468 z M -18.717209,10.054671 C -18.249808,10.106908 -17.420138,10.272316 -16.204332,10.569541 C -14.83317,11.00724 -13.652108,11.541311 -12.699833,12.152434 C -11.208627,13.412241 -11.317405,13.644599 -11.673268,13.712806 L -20.041956,14.743499 C -20.476643,14.796747 -20.889531,14.694266 -21.359849,14.508116 C -21.689304,14.317148 -21.854017,14.136893 -21.748928,13.957599 L -19.508526,10.135219 C -19.430086,10.049689 -19.25711,9.994334 -18.717209,10.054671 z M -35.375873,12.036959 C -35.327237,12.043871 -35.273405,12.05521 -35.233036,12.069245 L -29.104749,14.860932 C -28.801738,14.999453 -28.779973,15.205531 -28.876851,15.465656 C -29.077458,15.713075 -29.321699,15.886567 -29.73562,15.93727 L -38.096221,16.954164 C -38.475427,16.976231 -38.840093,16.796721 -38.933588,15.402178 C -38.859576,15.028537 -38.725523,14.660817 -38.505924,14.286158 C -38.286326,13.911499 -38.000234,13.562403 -37.655669,13.221903 C -36.262557,12.192965 -35.693812,11.991776 -35.375873,12.036959 z M -10.744765,15.054107 C -10.420003,15.08765 -10.147502,15.391887 -10.066412,16.601405 C -10.140424,16.975046 -10.274477,17.342766 -10.494076,17.717425 C -10.713674,18.092085 -10.999766,18.44118 -11.344331,18.78168 C -12.95055,19.968018 -13.462697,20.040124 -13.766964,19.934338 L -19.895251,17.142651 C -20.18236,17.011399 -20.223861,16.820013 -20.147413,16.579325 C -20.137249,16.565877 -20.133676,16.550911 -20.123149,16.537927 C -20.118065,16.524276 -20.104791,16.510499 -20.098884,16.496529 C -19.901841,16.270613 -19.656579,16.114355 -19.26438,16.066313 L -10.903779,15.049419 C -10.853467,15.046491 -10.794444,15.048976 -10.744765,15.054107 z M -28.352173,17.275139 C -28.147075,17.310076 -27.93338,17.374808 -27.71453,17.456776 C -27.337983,17.662416 -27.138976,17.854737 -27.251072,18.045984 L -29.491474,21.868364 C -29.637821,22.027939 -30.175474,22.074593 -32.795668,21.434042 C -34.166831,20.996346 -35.347891,20.462271 -36.300167,19.851149 C -37.79137,18.591342 -37.682594,18.358982 -37.326732,18.290777 L -28.958044,17.260084 C -28.753773,17.235062 -28.557271,17.240203 -28.352173,17.275139 z M -22.526433,17.988754 C -22.322238,18.006791 -22.159006,18.044879 -22.015452,18.110506 L -15.895253,20.915992 C -15.661665,21.0564 -15.8216,21.282493 -18.490909,22.032665 C -19.984006,22.344246 -21.590967,22.536806 -23.257151,22.602448 C -26.226894,22.558268 -26.641489,22.39497 -26.593697,22.223323 L -24.353295,18.400943 C -24.236888,18.202339 -23.826261,18.083315 -23.239035,17.990204 C -22.975787,17.972731 -22.730627,17.970717 -22.526433,17.988754 z "
+           id="path3884"
+           sodipodi:nodetypes="cccccccccccccccccccccccccsccccscccsssccccccccccccccccccccc" />
+        <path
+           sodipodi:type="arc"
+           style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.75173426;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path3886"
+           sodipodi:cx="85.3125"
+           sodipodi:cy="10.8125"
+           sodipodi:rx="14.875"
+           sodipodi:ry="5.8125"
+           d="M 100.1875 10.8125 A 14.875 5.8125 0 1 1  70.4375,10.8125 A 14.875 5.8125 0 1 1  100.1875 10.8125 z"
+           transform="matrix(1.210083,0,0,1.462367,-127.7352,0.188166)" />
+      </g>
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.90075187;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3903);stroke-width:0.82348335;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path3895"
+         sodipodi:cx="85.3125"
+         sodipodi:cy="10.8125"
+         sodipodi:rx="14.875"
+         sodipodi:ry="5.8125"
+         d="M 100.1875 10.8125 A 14.875 5.8125 0 1 1  70.4375,10.8125 A 14.875 5.8125 0 1 1  100.1875 10.8125 z"
+         transform="matrix(1.142857,0,0,1.290324,-122,2.04838)" />
+    </g>
+    <g
+       style="display:inline"
+       id="g3189"
+       transform="translate(50,0)">
+      <path
+         id="path3152"
+         d="M 25.96875,8.002653 C 19.762261,7.929462 13.664379,9.373241 10.34375,12.00219 C 5.513746,15.826114 8.384206,20.721752 16.75,22.929496 C 25.115794,25.137239 35.826245,23.825188 40.65625,20.001263 C 45.48625,16.177339 42.61579,11.281701 34.25,9.073958 C 31.635689,8.384038 28.789881,8.035922 25.96875,8.002653 z M 29.6875,10.388091 C 30.5522,10.360109 31.443298,10.446598 32.25,10.659488 C 34.401203,11.227194 35.148253,12.490153 33.90625,13.473448 C 32.664247,14.456743 29.901206,14.783926 27.75,14.216219 C 25.598795,13.648513 24.851747,12.399839 26.09375,11.416543 C 26.87,10.801984 28.246333,10.434729 29.6875,10.388091 z M 17.40625,11.887917 C 18.27095,11.859935 19.162048,11.946425 19.96875,12.159315 C 22.119954,12.727021 22.835753,13.989977 21.59375,14.973274 C 20.351748,15.956572 17.619956,16.298036 15.46875,15.730329 C 13.317545,15.162623 12.570497,13.899667 13.8125,12.91637 C 14.588751,12.301809 15.965083,11.934556 17.40625,11.887917 z M 32.96875,16.001727 C 33.83345,15.973744 34.724548,16.060234 35.53125,16.273124 C 37.682456,16.84083 38.429503,18.103786 37.1875,19.087083 C 35.9455,20.070381 33.182456,20.411845 31.03125,19.844139 C 28.880048,19.276432 28.164247,18.013476 29.40625,17.030179 C 30.182502,16.415618 31.527584,16.048365 32.96875,16.001727 z M 20.6875,17.515837 C 21.5522,17.487854 22.443298,17.574344 23.25,17.787234 C 25.401203,18.35494 26.148253,19.603614 24.90625,20.58691 C 23.664247,21.570205 20.901206,21.911671 18.75,21.343965 C 16.598795,20.776258 15.851747,19.5133 17.09375,18.530005 C 17.87,17.915446 19.246333,17.562474 20.6875,17.515837 z "
+         style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path2959"
+         d="M 25.96875,8.002653 C 19.762261,7.929462 13.664379,9.373241 10.34375,12.00219 C 5.513746,15.826114 8.384206,20.721752 16.75,22.929496 C 25.115794,25.137239 35.826245,23.825188 40.65625,20.001263 C 45.48625,16.177339 42.61579,11.281701 34.25,9.073958 C 31.635689,8.384038 28.789881,8.035922 25.96875,8.002653 z M 29.6875,10.388091 C 30.5522,10.360109 31.443298,10.446598 32.25,10.659488 C 34.401203,11.227194 35.148253,12.490153 33.90625,13.473448 C 32.664247,14.456743 29.901206,14.783926 27.75,14.216219 C 25.598795,13.648513 24.851747,12.399839 26.09375,11.416543 C 26.87,10.801984 28.246333,10.434729 29.6875,10.388091 z M 17.40625,11.887917 C 18.27095,11.859935 19.162048,11.946425 19.96875,12.159315 C 22.119954,12.727021 22.835753,13.989977 21.59375,14.973274 C 20.351748,15.956572 17.619956,16.298036 15.46875,15.730329 C 13.317545,15.162623 12.570497,13.899667 13.8125,12.91637 C 14.588751,12.301809 15.965083,11.934556 17.40625,11.887917 z M 32.96875,16.001727 C 33.83345,15.973744 34.724548,16.060234 35.53125,16.273124 C 37.682456,16.84083 38.429503,18.103786 37.1875,19.087083 C 35.9455,20.070381 33.182456,20.411845 31.03125,19.844139 C 28.880048,19.276432 28.164247,18.013476 29.40625,17.030179 C 30.182502,16.415618 31.527584,16.048365 32.96875,16.001727 z M 20.6875,17.515837 C 21.5522,17.487854 22.443298,17.574344 23.25,17.787234 C 25.401203,18.35494 26.148253,19.603614 24.90625,20.58691 C 23.664247,21.570205 20.901206,21.911671 18.75,21.343965 C 16.598795,20.776258 15.851747,19.5133 17.09375,18.530005 C 17.87,17.915446 19.246333,17.562474 20.6875,17.515837 z "
+         style="opacity:1;color:black;fill:url(#linearGradient3072);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         transform="matrix(1.142857,0,0,1.290323,-72.00001,2.048386)"
+         d="M 100.1875 10.8125 A 14.875 5.8125 0 1 1  70.4375,10.8125 A 14.875 5.8125 0 1 1  100.1875 10.8125 z"
+         sodipodi:ry="5.8125"
+         sodipodi:rx="14.875"
+         sodipodi:cy="10.8125"
+         sodipodi:cx="85.3125"
+         id="path2968"
+         style="opacity:0.6;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3215);stroke-width:0.82348335;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M -67.21875,4.0285714 C -66.228989,3.9852983 -66.03418,4.0851337 -66,4.2 L -66,7.7 C -66,7.8856183 -66.261153,8.0402377 -66.6875,8.1857143 C -66.734238,8.2040411 -66.791816,8.2143269 -66.84375,8.2285714 C -67.33252,8.3246217 -67.742113,8.349952 -68.09375,8.2571429 L -74.75,6.5 C -75.039409,6.3975771 -74.96304,6.16496 -73.125,5.2571429 C -73.114525,5.251968 -73.104347,5.2480777 -73.09375,5.2428571 C -71.886156,4.7872091 -70.474594,4.4285714 -68.96875,4.1857143 C -68.265233,4.1158903 -67.618098,4.0460297 -67.21875,4.0285714 z M -62.28125,4.0285714 C -61.862086,4.0243474 -61.083492,4.08128 -60.03125,4.1857143 C -58.525406,4.4285714 -57.113844,4.7872091 -55.90625,5.2428571 C -55.894767,5.2471909 -55.886451,5.2527909 -55.875,5.2571429 C -54.03696,6.16496 -53.960591,6.3975771 -54.25,6.5 L -60.90625,8.2571429 C -61.29598,8.3600091 -61.752818,8.3098697 -62.3125,8.1857143 C -62.738847,8.0402377 -63,7.8856137 -63,7.7 L -63,4.2 C -62.972656,4.1081051 -62.836914,4.0341714 -62.28125,4.0285714 z M -76.40625,7.6857143 C -76.356212,7.6866377 -76.29694,7.6912183 -76.25,7.7 L -69.59375,9.4428571 C -69.242114,9.5356617 -69.093676,9.715616 -69.03125,9.9571429 C -69.031344,9.9857006 -69.03125,10.014299 -69.03125,10.042857 C -69.093675,10.284384 -69.242113,10.464334 -69.59375,10.557143 L -76.25,12.3 C -76.583792,12.362437 -77.002186,12.230194 -77.78125,11.1 C -77.922377,10.742473 -78,10.376023 -78,10 C -78,9.6239771 -77.922377,9.2575269 -77.78125,8.9 C -77.111743,7.9287406 -76.71203,7.6800823 -76.40625,7.6857143 z M -52.59375,7.6857143 C -52.28797,7.6800823 -51.888257,7.9287406 -51.21875,8.9 C -51.077623,9.2575269 -51,9.6239771 -51,10 C -51,10.376023 -51.077623,10.742473 -51.21875,11.1 C -51.997814,12.230194 -52.416209,12.362437 -52.75,12.3 L -59.40625,10.557143 C -59.757886,10.464338 -59.906324,10.284384 -59.96875,10.042857 C -59.969649,10.014277 -59.96875,9.9857234 -59.96875,9.9571429 C -59.906325,9.715616 -59.757887,9.5356663 -59.40625,9.4428571 L -52.75,7.7 C -52.70306,7.6912183 -52.643788,7.6866377 -52.59375,7.6857143 z M -67.5,11.685714 C -67.282111,11.695195 -67.039049,11.732434 -66.78125,11.785714 C -66.301109,11.939794 -66,12.102011 -66,12.3 L -66,15.8 C -66.047971,15.961216 -66.521607,16.057161 -68.96875,15.814286 C -70.474594,15.571429 -71.886156,15.212791 -73.09375,14.757143 C -73.105233,14.752809 -73.113549,14.747209 -73.125,14.742857 C -74.96304,13.83504 -75.039409,13.602423 -74.75,13.5 L -68.09375,11.742857 C -67.910606,11.694519 -67.717889,11.676233 -67.5,11.685714 z M -61.46875,11.685714 C -61.261301,11.678976 -61.082069,11.696453 -60.90625,11.742857 L -54.25,13.5 C -53.960592,13.602423 -54.036961,13.83504 -55.875,14.742857 C -55.886451,14.747209 -55.894767,14.752809 -55.90625,14.757143 C -57.113845,15.212791 -58.525406,15.571429 -60.03125,15.814286 C -62.478393,16.057161 -62.952029,15.961216 -63,15.8 L -63,12.3 C -63,12.114382 -62.738847,11.959762 -62.3125,11.814286 C -62.266586,11.798619 -62.206271,11.786926 -62.15625,11.771429 C -61.911865,11.723406 -61.676199,11.692453 -61.46875,11.685714 z "
+       id="path5719"
+       sodipodi:nodetypes="cccssccssccccsscccccccccsscccsccccscccssccccccccssccccccsscccssc" />
+    <path
+       style="color:black;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M -64.5,2 C -74.159996,2 -82,5.584 -82,10 C -82,14.416 -74.159997,18.000005 -64.5,18 C -54.840004,18 -47.000001,14.416 -47,10 C -47,5.584 -54.840004,2 -64.5,2 z M -67.21875,4.0285714 C -66.228989,3.9852983 -66.03418,4.0851337 -66,4.2 L -66,7.7 C -66,7.8856183 -66.261153,8.0402377 -66.6875,8.1857143 C -66.734238,8.2040411 -66.791816,8.2143269 -66.84375,8.2285714 C -67.33252,8.3246217 -67.742113,8.349952 -68.09375,8.2571429 L -74.75,6.5 C -75.039409,6.3975771 -74.96304,6.16496 -73.125,5.2571429 C -73.114525,5.251968 -73.104347,5.2480777 -73.09375,5.2428571 C -71.886156,4.7872091 -70.474594,4.4285714 -68.96875,4.1857143 C -68.265233,4.1158903 -67.618098,4.0460297 -67.21875,4.0285714 z M -62.28125,4.0285714 C -61.862086,4.0243474 -61.083492,4.08128 -60.03125,4.1857143 C -58.525406,4.4285714 -57.113844,4.7872091 -55.90625,5.2428571 C -55.894767,5.2471909 -55.886451,5.2527909 -55.875,5.2571429 C -54.03696,6.16496 -53.960591,6.3975771 -54.25,6.5 L -60.90625,8.2571429 C -61.29598,8.3600091 -61.752818,8.3098697 -62.3125,8.1857143 C -62.738847,8.0402377 -63,7.8856137 -63,7.7 L -63,4.2 C -62.972656,4.1081051 -62.836914,4.0341714 -62.28125,4.0285714 z M -76.40625,7.6857143 C -76.356212,7.6866377 -76.29694,7.6912183 -76.25,7.7 L -69.59375,9.4428571 C -69.242114,9.5356617 -69.093676,9.715616 -69.03125,9.9571429 C -69.031344,9.9857006 -69.03125,10.014299 -69.03125,10.042857 C -69.093675,10.284384 -69.242113,10.464334 -69.59375,10.557143 L -76.25,12.3 C -76.583792,12.362437 -77.002186,12.230194 -77.78125,11.1 C -77.922377,10.742473 -78,10.376023 -78,10 C -78,9.6239771 -77.922377,9.2575269 -77.78125,8.9 C -77.111743,7.9287406 -76.71203,7.6800823 -76.40625,7.6857143 z M -52.59375,7.6857143 C -52.28797,7.6800823 -51.888257,7.9287406 -51.21875,8.9 C -51.077623,9.2575269 -51,9.6239771 -51,10 C -51,10.376023 -51.077623,10.742473 -51.21875,11.1 C -51.997814,12.230194 -52.416209,12.362437 -52.75,12.3 L -59.40625,10.557143 C -59.757886,10.464338 -59.906324,10.284384 -59.96875,10.042857 C -59.969649,10.014277 -59.96875,9.9857234 -59.96875,9.9571429 C -59.906325,9.715616 -59.757887,9.5356663 -59.40625,9.4428571 L -52.75,7.7 C -52.70306,7.6912183 -52.643788,7.6866377 -52.59375,7.6857143 z M -67.5,11.685714 C -67.282111,11.695195 -67.039049,11.732434 -66.78125,11.785714 C -66.301109,11.939794 -66,12.102011 -66,12.3 L -66,15.8 C -66.047971,15.961216 -66.521607,16.057161 -68.96875,15.814286 C -70.474594,15.571429 -71.886156,15.212791 -73.09375,14.757143 C -73.105233,14.752809 -73.113549,14.747209 -73.125,14.742857 C -74.96304,13.83504 -75.039409,13.602423 -74.75,13.5 L -68.09375,11.742857 C -67.910606,11.694519 -67.717889,11.676233 -67.5,11.685714 z M -61.46875,11.685714 C -61.261301,11.678976 -61.082069,11.696453 -60.90625,11.742857 L -54.25,13.5 C -53.960592,13.602423 -54.036961,13.83504 -55.875,14.742857 C -55.886451,14.747209 -55.894767,14.752809 -55.90625,14.757143 C -57.113845,15.212791 -58.525406,15.571429 -60.03125,15.814286 C -62.478393,16.057161 -62.952029,15.961216 -63,15.8 L -63,12.3 C -63,12.114382 -62.738847,11.959762 -62.3125,11.814286 C -62.266586,11.798619 -62.206271,11.786926 -62.15625,11.771429 C -61.911865,11.723406 -61.676199,11.692453 -61.46875,11.685714 z "
+       id="path5712"
+       sodipodi:nodetypes="csssccccssccssccccsscccccccccsscccsccccscccssccccccccssccccccsscccssc" />
+    <path
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M -23.745287,-14.087957 C -22.764752,-14.012649 -22.633104,-13.893164 -22.665122,-13.778165 L -24.646705,-10.39736 C -24.751796,-10.218063 -25.091591,-10.099609 -25.585775,-10.009532 C -25.641296,-9.997359 -25.702736,-9.9942358 -25.760965,-9.9866215 C -26.287461,-9.9516732 -26.697439,-9.9756686 -26.984548,-10.106922 L -32.419156,-12.591789 C -32.640716,-12.724967 -32.435249,-12.940626 -30.145863,-13.600051 C -30.132815,-13.60381 -30.120781,-13.606364 -30.107589,-13.610152 C -28.68317,-13.907401 -27.116658,-14.08681 -25.524626,-14.143226 C -24.805549,-14.127432 -24.140912,-14.118345 -23.745287,-14.087957 z M -18.976028,-13.503755 C -18.568755,-13.45824 -17.848925,-13.311123 -16.891664,-13.085744 C -15.574628,-12.672987 -14.414213,-12.159548 -13.505739,-11.576535 C -13.497101,-11.57099 -13.492239,-11.564597 -13.483642,-11.559038 C -12.222208,-10.464662 -12.280141,-10.230931 -12.617677,-10.166238 L -20.041956,-9.2565005 C -20.476646,-9.2032501 -20.889531,-9.3057348 -21.359849,-9.4918833 C -21.689305,-9.6828511 -21.854016,-9.8631088 -21.748928,-10.042401 L -19.767345,-13.423206 C -19.688905,-13.508737 -19.515929,-13.564091 -18.976028,-13.503755 z M -34.690283,-11.642422 C -34.642473,-11.635609 -34.587814,-11.624171 -34.547445,-11.610135 L -29.104749,-9.1390678 C -28.817638,-9.0078183 -28.776142,-8.8164294 -28.852587,-8.5757414 C -28.868846,-8.5481673 -28.884947,-8.5205319 -28.901116,-8.4929462 C -29.098158,-8.2670306 -29.34342,-8.1107727 -29.73562,-8.0627297 L -37.151812,-7.166791 C -37.50958,-7.145975 -37.838846,-7.323217 -37.951486,-8.5071006 C -37.885384,-8.8691505 -37.75289,-9.2323053 -37.539999,-9.5955223 C -37.327107,-9.9587393 -37.044657,-10.303526 -36.705919,-10.632179 C -35.50933,-11.491146 -34.982455,-11.684042 -34.690283,-11.642422 z M -11.689174,-8.8249375 C -11.390625,-8.7941981 -11.145314,-8.5067145 -11.048514,-7.489316 C -11.114616,-7.127266 -11.24711,-6.764111 -11.460001,-6.400894 C -11.672893,-6.037677 -11.955343,-5.692891 -12.294081,-5.364239 C -13.686477,-4.364712 -14.165487,-4.286478 -14.452555,-4.386282 L -19.895251,-6.857349 C -20.182362,-6.988598 -20.223858,-7.179988 -20.147413,-7.420675 C -20.1321,-7.448389 -20.115066,-7.475864 -20.098884,-7.503471 C -19.901842,-7.729386 -19.65658,-7.885644 -19.26438,-7.933687 L -11.848188,-8.829626 C -11.797876,-8.8325545 -11.73803,-8.8299661 -11.689174,-8.8249375 z M -28.352173,-6.724861 C -28.147076,-6.689922 -27.93338,-6.625193 -27.71453,-6.543224 C -27.337985,-6.337581 -27.138978,-6.145262 -27.251072,-5.954016 L -29.232655,-2.573211 C -29.370267,-2.42316 -29.882085,-2.386523 -32.108336,-2.910672 C -33.425372,-3.32343 -34.585787,-3.83687 -35.494261,-4.419882 C -35.502899,-4.425427 -35.507761,-4.43182 -35.516358,-4.437379 C -36.777792,-5.531755 -36.719859,-5.765486 -36.382323,-5.830178 L -28.958044,-6.739916 C -28.753773,-6.764939 -28.557269,-6.7598 -28.352173,-6.724861 z M -22.526433,-6.011246 C -22.322237,-5.99321 -22.159007,-5.955122 -22.015452,-5.889495 L -16.580844,-3.404627 C -16.359285,-3.271451 -16.564752,-3.055791 -18.854137,-2.396366 C -18.867662,-2.393517 -18.878865,-2.389092 -18.892411,-2.386264 C -20.316831,-2.089016 -21.883342,-1.909607 -23.475374,-1.853191 C -25.97664,-1.908132 -26.379817,-2.05685 -26.334878,-2.218252 L -24.353295,-5.599057 C -24.248204,-5.778354 -23.908409,-5.896808 -23.414225,-5.986885 C -23.361006,-5.996586 -23.296126,-6.000744 -23.239035,-6.009795 C -22.975788,-6.027268 -22.730628,-6.029283 -22.526433,-6.011246 z "
+       id="path5717"
+       sodipodi:nodetypes="cccssccssccccsscccccccccsscccsccccscccssccccccccssccccccsscccssc" />
+    <path
+       style="color:black;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M -19.970667,-15.725763 C -29.301506,-16.86873 -38.90351,-14.334411 -41.403702,-10.0688 C -43.903894,-5.80319 -38.360176,-1.413616 -29.029333,-0.270654 C -19.698494,0.872312 -10.096491,-1.662006 -7.596298,-5.927617 C -5.096106,-10.193227 -10.639827,-14.582797 -19.970667,-15.725763 z M -23.745287,-14.087957 C -22.764752,-14.012649 -22.633104,-13.893164 -22.665122,-13.778165 L -24.646705,-10.39736 C -24.751796,-10.218063 -25.091591,-10.099609 -25.585775,-10.009532 C -25.641296,-9.997359 -25.702736,-9.9942358 -25.760965,-9.9866215 C -26.287461,-9.9516732 -26.697439,-9.9756686 -26.984548,-10.106922 L -32.419156,-12.591789 C -32.640716,-12.724967 -32.435249,-12.940626 -30.145863,-13.600051 C -30.132815,-13.60381 -30.120781,-13.606364 -30.107589,-13.610152 C -28.68317,-13.907401 -27.116658,-14.08681 -25.524626,-14.143226 C -24.805549,-14.127432 -24.140912,-14.118345 -23.745287,-14.087957 z M -18.976028,-13.503755 C -18.568755,-13.45824 -17.848925,-13.311123 -16.891664,-13.085744 C -15.574628,-12.672987 -14.414213,-12.159548 -13.505739,-11.576535 C -13.497101,-11.57099 -13.492239,-11.564597 -13.483642,-11.559038 C -12.222208,-10.464662 -12.280141,-10.230931 -12.617677,-10.166238 L -20.041956,-9.2565005 C -20.476646,-9.2032501 -20.889531,-9.3057348 -21.359849,-9.4918833 C -21.689305,-9.6828511 -21.854016,-9.8631088 -21.748928,-10.042401 L -19.767345,-13.423206 C -19.688905,-13.508737 -19.515929,-13.564091 -18.976028,-13.503755 z M -34.690283,-11.642422 C -34.642473,-11.635609 -34.587814,-11.624171 -34.547445,-11.610135 L -29.104749,-9.1390678 C -28.817638,-9.0078183 -28.776142,-8.8164294 -28.852587,-8.5757414 C -28.868846,-8.5481673 -28.884947,-8.5205319 -28.901116,-8.4929462 C -29.098158,-8.2670306 -29.34342,-8.1107727 -29.73562,-8.0627297 L -37.151812,-7.166791 C -37.50958,-7.145975 -37.838846,-7.323217 -37.951486,-8.5071006 C -37.885384,-8.8691505 -37.75289,-9.2323053 -37.539999,-9.5955223 C -37.327107,-9.9587393 -37.044657,-10.303526 -36.705919,-10.632179 C -35.50933,-11.491146 -34.982455,-11.684042 -34.690283,-11.642422 z M -11.689174,-8.8249375 C -11.390625,-8.7941981 -11.145314,-8.5067145 -11.048514,-7.489316 C -11.114616,-7.127266 -11.24711,-6.764111 -11.460001,-6.400894 C -11.672893,-6.037677 -11.955343,-5.692891 -12.294081,-5.364239 C -13.686477,-4.364712 -14.165487,-4.286478 -14.452555,-4.386282 L -19.895251,-6.857349 C -20.182362,-6.988598 -20.223858,-7.179988 -20.147413,-7.420675 C -20.1321,-7.448389 -20.115066,-7.475864 -20.098884,-7.503471 C -19.901842,-7.729386 -19.65658,-7.885644 -19.26438,-7.933687 L -11.848188,-8.829626 C -11.797876,-8.8325545 -11.73803,-8.8299661 -11.689174,-8.8249375 z M -28.352173,-6.724861 C -28.147076,-6.689922 -27.93338,-6.625193 -27.71453,-6.543224 C -27.337985,-6.337581 -27.138978,-6.145262 -27.251072,-5.954016 L -29.232655,-2.573211 C -29.370267,-2.42316 -29.882085,-2.386523 -32.108336,-2.910672 C -33.425372,-3.32343 -34.585787,-3.83687 -35.494261,-4.419882 C -35.502899,-4.425427 -35.507761,-4.43182 -35.516358,-4.437379 C -36.777792,-5.531755 -36.719859,-5.765486 -36.382323,-5.830178 L -28.958044,-6.739916 C -28.753773,-6.764939 -28.557269,-6.7598 -28.352173,-6.724861 z M -22.526433,-6.011246 C -22.322237,-5.99321 -22.159007,-5.955122 -22.015452,-5.889495 L -16.580844,-3.404627 C -16.359285,-3.271451 -16.564752,-3.055791 -18.854137,-2.396366 C -18.867662,-2.393517 -18.878865,-2.389092 -18.892411,-2.386264 C -20.316831,-2.089016 -21.883342,-1.909607 -23.475374,-1.853191 C -25.97664,-1.908132 -26.379817,-2.05685 -26.334878,-2.218252 L -24.353295,-5.599057 C -24.248204,-5.778354 -23.908409,-5.896808 -23.414225,-5.986885 C -23.361006,-5.996586 -23.296126,-6.000744 -23.239035,-6.009795 C -22.975788,-6.027268 -22.730628,-6.029283 -22.526433,-6.011246 z "
+       id="path5715"
+       sodipodi:nodetypes="csssccccssccssccccsscccccccccsscccsccccscccssccccccccssccccccsscccssc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="troiai"
+     style="display:none">
+    <rect
+       style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2947"
+       width="48"
+       height="48"
+       x="-60"
+       y="-1.3322676e-15" />
+    <g
+       id="g1996"
+       transform="matrix(1,0,0,1.011094,-59.50013,-0.849162)">
+      <path
+         id="path6409"
+         d="M 23.343751,6.7920654 C 19.276738,6.9662854 14.839018,8.953048 11.250001,12.542065 C 4.8695268,18.922539 3.6038088,28.020873 8.4375008,32.854566 C 13.271193,37.688258 22.369527,36.42254 28.750001,30.042065 C 35.130475,23.661591 36.396191,14.563256 31.562501,9.7295651 C 29.447761,7.614825 26.506983,6.6565614 23.343751,6.7920654 z M 26.281251,9.385815 C 27.385834,9.370233 28.341176,9.7585781 28.906251,10.542065 C 30.036398,12.109038 29.144776,14.67757 26.906251,16.292065 C 24.667727,17.906561 21.94265,17.952788 20.812501,16.385815 C 19.682351,14.818841 20.573976,12.25031 22.812501,10.635815 C 23.931764,9.8285671 25.176668,9.401397 26.281251,9.385815 z M 15.406251,11.823315 C 16.065529,11.818813 16.669136,12.0208 17.093751,12.448315 C 18.226056,13.588354 17.760962,15.894505 16.062501,17.604565 C 14.364039,19.314625 12.069806,19.775854 10.937501,18.635815 C 9.8051958,17.495776 10.23904,15.189625 11.937501,13.479565 C 12.999039,12.410777 14.307454,11.830818 15.406251,11.823315 z M 24.312501,20.292065 C 25.592364,20.164078 26.840524,20.507588 27.718751,21.385815 C 29.475205,23.142268 29.146778,26.332788 27.000001,28.479565 C 24.853222,30.626343 21.693954,30.923518 19.937501,29.167065 C 18.181049,27.410612 18.478224,24.251342 20.625001,22.104565 C 21.69839,21.031176 23.032638,20.420052 24.312501,20.292065 z M 13.531251,21.792065 C 14.025806,21.816698 14.502003,21.963359 14.906251,22.229565 C 16.523244,23.294391 16.540338,25.982012 14.968751,28.229565 C 13.397165,30.477119 10.835744,31.450641 9.2187508,30.385815 C 7.6017568,29.32099 7.5534138,26.633368 9.1250008,24.385815 C 10.303691,22.70015 12.047586,21.718166 13.531251,21.792065 z "
+         style="opacity:1;fill:url(#linearGradient2001);fill-opacity:1;stroke:none;stroke-width:0.9863953;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(0.6512,0.648774,-0.68514,0.682587,21.74573,-2.442557)"
+         d="M 29.7995 18.629814 A 12.399623 15.884648 0 1 1  5.0002546,18.629814 A 12.399623 15.884648 0 1 1  29.7995 18.629814 z"
+         sodipodi:ry="15.884648"
+         sodipodi:rx="12.399623"
+         sodipodi:cy="18.629814"
+         sodipodi:cx="17.399878"
+         id="path7695"
+         style="opacity:0.45108696;fill:none;fill-opacity:1;stroke:white;stroke-width:1.05475736;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.702727,0.69577,-0.724088,0.716919,21.70497,-3.797766)"
+         d="M 29.7995 18.629814 A 12.399623 15.884648 0 1 1  5.0002546,18.629814 A 12.399623 15.884648 0 1 1  29.7995 18.629814 z"
+         sodipodi:ry="15.884648"
+         sodipodi:rx="12.399623"
+         sodipodi:cy="18.629814"
+         sodipodi:cx="17.399878"
+         id="path6407"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#898b86;stroke-width:0.99074221;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       inkscape:r_cy="true"
+       inkscape:r_cx="true"
+       id="path4573"
+       d="M -38.579058,5.017711 C -39.575192,5.064032 -40.580718,5.225306 -41.617649,5.503883 C -47.935436,7.217172 -53.715475,13.011644 -55.321693,19.329399 C -56.562537,24.219761 -55.043694,27.333998 -52.681382,30.13706 L -38.427129,30.490613 C -34.532892,28.552395 -31.870353,25.873704 -30.027515,21.939981 L -30.027515,8.395851 C -32.178959,6.020531 -34.729135,4.838685 -38.579058,5.017711 z M -35.437213,7.543185 C -33.465593,7.415932 -32.00023,8.569575 -32.094763,10.460217 C -32.201842,12.708909 -34.447333,14.954386 -37.01728,15.382708 C -39.480147,15.811031 -41.075991,14.317893 -40.754746,12.283362 C -40.540584,10.14175 -38.506335,8.200131 -36.257632,7.664728 C -35.981564,7.601986 -35.698932,7.560077 -35.437213,7.543185 z M -46.075736,10.006159 C -45.362166,9.944214 -44.732045,10.137628 -44.282968,10.492331 C -43.699059,10.970164 -43.388065,11.777421 -43.553706,12.771262 C -43.874952,14.805795 -45.92512,16.825568 -47.959662,17.146811 C -48.878218,17.299902 -49.631695,17.06712 -50.117062,16.569481 C -50.632857,16.021808 -50.854477,15.16285 -50.633622,14.169007 C -50.205296,12.348638 -48.489372,10.525639 -46.561911,10.097317 C -46.396269,10.060507 -46.232722,10.019788 -46.075736,10.006159 z M -37.424394,18.113969 C -34.962414,17.924937 -32.945088,19.622687 -33.048823,22.216045 L -33.170367,22.337588 C -33.277449,25.121683 -35.85572,27.669557 -38.63983,27.776638 C -41.316859,27.883716 -43.109481,25.865404 -42.681156,23.188389 C -42.359913,20.725537 -40.130348,18.465596 -37.667481,18.144355 C -37.58717,18.134316 -37.503812,18.120067 -37.424394,18.113969 z M -48.018706,19.852871 C -46.046468,19.725568 -44.795474,21.405744 -45.101659,23.65109 L -45.223203,23.742247 C -45.651525,26.312182 -47.882552,28.466501 -50.024176,28.573581 C -52.1658,28.680661 -53.355085,26.766507 -52.819679,24.410733 C -52.284273,22.162039 -50.357107,20.127802 -48.322565,19.913642 C -48.222177,19.898584 -48.115702,19.859132 -48.018706,19.852871 z "
+       style="fill:none;fill-rule:nonzero;stroke:#333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccccccccccsccsccscsccccccsccccscsc" />
+    <path
+       style="fill:url(#radialGradient4556);fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+       d="M -31.134002,18.15152 C -31.134002,23.988211 -36.75044,29.60465 -42.697258,29.60465 C -47.652939,29.60465 -50.075717,25.419852 -48.864328,20.79455 C -47.763065,16.719879 -44.128899,12.975586 -40.054228,11.98445 C -35.428926,10.773061 -31.134002,13.195838 -31.134002,18.15152 z "
+       id="path6440"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       style="fill:url(#radialGradient4553);fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+       d="M -32.785896,16.499626 C -32.785896,22.336317 -38.402334,27.952756 -44.349152,27.952756 C -49.304833,27.952756 -51.727611,23.767958 -50.516222,19.142656 C -49.414959,15.067985 -45.780793,11.323692 -41.706121,10.332556 C -37.08082,9.121167 -32.785896,11.543945 -32.785896,16.499626 z "
+       id="path6447"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       style="fill:#3b3b3b;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+       d="M -29.933771,7.80123 L -29.933771,7.89498 C -29.881074,7.947677 -29.797562,7.996739 -29.746271,8.05123 C -29.806239,7.964969 -29.870965,7.886406 -29.933771,7.80123 z M -29.621271,8.23873 C -29.599292,8.271684 -29.549097,8.299377 -29.527521,8.33248 C -29.555555,8.299773 -29.592772,8.270872 -29.621271,8.23873 z M -29.496271,8.39498 C -29.314768,8.677052 -29.18039,8.946614 -29.027521,9.23873 L -29.027521,9.01998 C -29.17723,8.802667 -29.329473,8.592905 -29.496271,8.39498 z M -29.027521,20.98873 C -30.905932,25.474179 -34.641465,29.540397 -39.183771,31.61373 L -37.715021,31.61373 C -35.635627,30.548069 -33.639287,29.044383 -31.902521,27.08248 C -30.71006,25.757523 -29.751545,24.332263 -29.027521,22.89498 L -29.027521,20.98873 z "
+       id="path6490" />
+    <path
+       style="fill:url(#linearGradient2925);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2917);stroke-width:0.99999952px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M -39.696441,31.175733 C -39.696441,31.175733 -33.791399,25.669679 -25.063258,29.047517 C -16.396087,32.401758 -14.428591,44.571406 -14.428591,44.571406 L -30.455755,44.571406 C -30.455755,44.571406 -28.618268,36.71605 -29.849221,32.492131 C -31.080173,28.268212 -39.696441,31.175733 -39.696441,31.175733 z "
+       id="path6728"
+       sodipodi:nodetypes="czcczc" />
+    <path
+       style="opacity:0.2;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M -35.812505,29.341692 C -35.812505,29.341692 -32.693178,26.844865 -25.326869,29.862872 C -18.012016,32.859795 -15.687497,43.50002 -15.687497,43.50002 L -29.02648,43.50002 C -29.02648,43.50002 -27.928705,35.945603 -28.967596,32.171645 C -30.006485,28.397688 -35.812505,29.341692 -35.812505,29.341692 z "
+       id="path7675"
+       sodipodi:nodetypes="czcczc" />
+    <path
+       style="opacity:1;fill:url(#linearGradient6380);fill-opacity:1;stroke:none;stroke-width:0.9863953;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -38.040516,4.4309723 C -42.107529,4.6051923 -46.545249,6.5919553 -50.134266,10.180972 C -56.51474,16.561446 -57.780458,25.65978 -52.946766,30.493473 C -48.113074,35.327165 -39.01474,34.061447 -32.634266,27.680972 C -26.253792,21.300498 -24.988076,12.202163 -29.821766,7.3684723 C -31.936506,5.2537323 -34.877284,4.2954683 -38.040516,4.4309723 z M -35.103016,7.0247223 C -33.998433,7.0091403 -33.043091,7.3974853 -32.478016,8.1809723 C -31.347869,9.7479453 -32.239491,12.316477 -34.478016,13.930972 C -36.71654,15.545468 -39.441617,15.591695 -40.571766,14.024722 C -41.701916,12.457748 -40.810291,9.8892173 -38.571766,8.2747223 C -37.452503,7.4674743 -36.207599,7.0403043 -35.103016,7.0247223 z M -45.978016,9.4622223 C -45.318738,9.4577203 -44.715131,9.6597073 -44.290516,10.087222 C -43.158211,11.227261 -43.623305,13.533412 -45.321766,15.243472 C -47.020228,16.953532 -49.314461,17.414761 -50.446766,16.274722 C -51.579071,15.134683 -51.145227,12.828532 -49.446766,11.118472 C -48.385228,10.049684 -47.076813,9.4697253 -45.978016,9.4622223 z M -37.071766,17.930972 C -35.791903,17.802985 -34.543743,18.146495 -33.665516,19.024722 C -31.909062,20.781175 -32.237489,23.971695 -34.384266,26.118472 C -36.531045,28.26525 -39.690313,28.562425 -41.446766,26.805972 C -43.203218,25.049519 -42.906043,21.890249 -40.759266,19.743472 C -39.685877,18.670083 -38.351629,18.058959 -37.071766,17.930972 z M -47.853016,19.430972 C -47.358461,19.455605 -46.882264,19.602266 -46.478016,19.868472 C -44.861023,20.933298 -44.843929,23.620919 -46.415516,25.868472 C -47.987102,28.116026 -50.548523,29.089548 -52.165516,28.024722 C -53.78251,26.959897 -53.830853,24.272275 -52.259266,22.024722 C -51.080576,20.339057 -49.336681,19.357073 -47.853016,19.430972 z "
+       id="path4541" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#898b86;stroke-width:0.9863953;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4539"
+       sodipodi:cx="17.399878"
+       sodipodi:cy="18.629814"
+       sodipodi:rx="12.399623"
+       sodipodi:ry="15.884648"
+       d="M 29.7995 18.629814 A 12.399623 15.884648 0 1 1  5.0002546,18.629814 A 12.399623 15.884648 0 1 1  29.7995 18.629814 z"
+       transform="matrix(0.706206,0.706206,-0.727673,0.727673,-40.48126,-6.884929)" />
+    <path
+       style="fill:#e6e6e6;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+       d="M -50.357005,16.385341 C -49.576197,17.166149 -47.568402,17.500781 -45.337521,15.492988 C -43.887448,14.15446 -42.54892,11.365859 -44.445169,9.9157851 C -42.102745,12.25821 -47.23377,18.281589 -50.468549,16.385341 L -50.357005,16.385341 z "
+       id="path6480"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       style="fill:#e6e6e6;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+       d="M -39.556216,14.843811 C -38.788515,15.611511 -35.827386,15.721184 -33.633957,13.747096 C -31.659871,11.882682 -31.0758,9.5438664 -32.720871,8.0084664 C -29.869413,11.737296 -36.046729,16.488883 -39.446544,14.953483 L -39.556216,14.843811 z "
+       id="path6488"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#e6e6e6;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+       d="M -41.088696,27.153796 C -35.597743,30.851783 -29.322372,22.111085 -33.916841,18.861339 C -29.658552,23.231688 -36.158046,29.955302 -41.088696,27.153796 L -41.088696,27.153796 z "
+       id="path6476"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       style="fill:#e6e6e6;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
+       d="M -52.387455,28.305461 C -51.547401,29.145515 -49.267256,29.38553 -46.987113,27.3454 C -44.466952,24.945248 -44.106928,21.225012 -46.147059,19.784919 C -43.266875,23.505157 -48.547212,30.105576 -52.387455,28.425469 L -52.387455,28.305461 z "
+       id="path6484"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.45108696;fill:none;fill-opacity:1;stroke:white;stroke-width:1.06059182;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path6401"
+       sodipodi:cx="17.399878"
+       sodipodi:cy="18.629814"
+       sodipodi:rx="12.399623"
+       sodipodi:ry="15.884648"
+       d="M 29.7995 18.629814 A 12.399623 15.884648 0 1 1  5.0002546,18.629814 A 12.399623 15.884648 0 1 1  29.7995 18.629814 z"
+       transform="matrix(0.6512,0.648774,-0.68514,0.682587,-40.31421,-5.005059)" />
+    <path
+       style="opacity:0.3;fill:url(#linearGradient2933);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M -28,44 L -27.41815,37 L -19.297991,37.050508 L -17,44 L -28,44 z "
+       id="path6738"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:0.3;fill:#ddd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M -27.642397,35.0625 L -28.182068,31.244481 L -23.056464,31.118212 L -20.784826,35.0625 L -27.642397,35.0625 z "
+       id="path7629"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:0.3;fill:#ddd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M -29.51056,30.094209 L -32.000539,29.067704 L -28.750304,29.088145 L -25.729598,30.129981 L -29.51056,30.094209 z "
+       id="path7631"
+       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g2872"
+       transform="translate(-110,-40)">
+      <path
+         transform="matrix(0.992983,0,0,2.142753,48.71484,-19.0262)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2862"
+         style="opacity:1;color:black;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.275528,0,0,0.59456,65.90022,-8.860351)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2864"
+         style="opacity:1;color:black;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.275528,0,0,0.594561,56.9002,0.139637)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2866"
+         style="opacity:1;color:black;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.275528,0,0,0.594561,74.9002,0.139637)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2868"
+         style="opacity:1;color:black;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.275528,0,0,0.59456,65.90022,9.13965)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2870"
+         style="opacity:1;color:black;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       transform="matrix(0.496284,0,0,0.535015,0.6124,75.37678)"
+       d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+       sodipodi:ry="8.3968925"
+       sodipodi:rx="18.119612"
+       sodipodi:cy="12.379497"
+       sodipodi:cx="23.953241"
+       id="path2005"
+       style="color:black;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1.96992087;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.496284,0,0,0.535015,0.6124,69.37678)"
+       d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+       sodipodi:ry="8.3968925"
+       sodipodi:rx="18.119612"
+       sodipodi:cy="12.379497"
+       sodipodi:cx="23.953241"
+       id="path2007"
+       style="color:black;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1.96992087;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <g
+       id="g2041"
+       transform="translate(-47,-50)">
+      <path
+         transform="matrix(0.965804,0,0,2.084105,49.36585,-18.30016)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2043"
+         style="opacity:1;color:black;fill:yellow;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535913,66.55122,-8.134333)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2045"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535914,57.55119,0.865653)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2047"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535914,75.55119,0.865653)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2049"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535913,66.55122,9.865668)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2051"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="opacity:1;color:black;fill:navy;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M -20.3125,-55.625 C -21.753667,-55.578358 -23.13,-55.208382 -23.90625,-54.59375 C -25.148253,-53.610338 -24.401205,-52.349026 -22.25,-51.78125 C -20.098794,-51.213474 -17.335753,-51.547838 -16.09375,-52.53125 C -14.851747,-53.514662 -15.598797,-54.775974 -17.75,-55.34375 C -18.556702,-55.556666 -19.4478,-55.652985 -20.3125,-55.625 z M -32.59375,-54.09375 C -34.034917,-54.047106 -35.411249,-53.708385 -36.1875,-53.09375 C -37.429503,-52.110333 -36.682455,-50.849026 -34.53125,-50.28125 C -32.380044,-49.713474 -29.648252,-50.047833 -28.40625,-51.03125 C -27.164247,-52.014667 -27.880046,-53.275974 -30.03125,-53.84375 C -30.837952,-54.056666 -31.72905,-54.121736 -32.59375,-54.09375 z M -17.03125,-50 C -18.472416,-49.953356 -19.817498,-49.583385 -20.59375,-48.96875 C -21.835753,-47.985333 -21.119952,-46.724026 -18.96875,-46.15625 C -16.817544,-45.588474 -14.0545,-45.922833 -12.8125,-46.90625 C -11.570497,-47.889667 -12.317544,-49.150974 -14.46875,-49.71875 C -15.275452,-49.931666 -16.16655,-50.027986 -17.03125,-50 z M -29.3125,-48.5 C -30.753667,-48.453358 -32.13,-48.083383 -32.90625,-47.46875 C -34.148253,-46.485338 -33.401205,-45.224026 -31.25,-44.65625 C -29.098794,-44.088474 -26.335753,-44.422838 -25.09375,-45.40625 C -23.851747,-46.389662 -24.598797,-47.650974 -26.75,-48.21875 C -27.556702,-48.431666 -28.4478,-48.527985 -29.3125,-48.5 z "
+       id="path3013" />
+    <g
+       id="g3055"
+       transform="translate(0,-20)">
+      <path
+         transform="matrix(0.965804,0,0,0.952734,2.36585,-1.79436)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2052"
+         style="color:black;fill:yellow;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.23396,0,0,0.200025,19.89589,2.690751)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2054"
+         style="color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.244989,10.55119,5.654657)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2056"
+         style="color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.244989,28.55119,5.654657)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2058"
+         style="color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.268112,0,0,0.237961,19.07786,10.41845)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2060"
+         style="color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       style="display:inline"
+       id="g2087"
+       transform="matrix(0.885715,0,0,0.885715,1.28563,-23.14286)">
+      <path
+         transform="matrix(0.965804,0,0,2.084105,49.36585,-18.30016)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2089"
+         style="opacity:1;color:black;fill:yellow;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535913,66.55122,-8.134333)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2091"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535914,57.55119,0.865653)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2093"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535914,75.55119,0.865653)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2095"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535913,66.55122,9.865668)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2097"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3041"
+       transform="translate(50,0)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="rect2067"
+         d="M 10.15625,2 L 5.84375,18 L 45.1875,17.96875 L 40.875,1.96875 L 10.15625,2 z "
+         style="opacity:0.8;color:black;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:2.034971;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <g
+         style="opacity:0.5"
+         id="g2149">
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:white;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 9.9878833,19.052816 L 13.5,1"
+           id="path2141" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:white;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 20.417708,19 L 21.4375,1"
+           id="path2143" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:white;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 30.670757,19.008622 L 29.43332,1"
+           id="path2145" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:white;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 41,19 L 37.375,1"
+           id="path2147" />
+      </g>
+    </g>
+    <g
+       id="g3070"
+       transform="translate(-50,0)">
+      <path
+         sodipodi:type="arc"
+         style="color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path3062"
+         sodipodi:cx="23.953241"
+         sodipodi:cy="12.379497"
+         sodipodi:rx="18.119612"
+         sodipodi:ry="8.3968925"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         transform="matrix(0.23396,0,0,0.200025,19.89589,2.69075)" />
+      <path
+         sodipodi:type="arc"
+         style="color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path3064"
+         sodipodi:cx="23.953241"
+         sodipodi:cy="12.379497"
+         sodipodi:rx="18.119612"
+         sodipodi:ry="8.3968925"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         transform="matrix(0.24835,0,0,0.244989,10.55119,5.65466)" />
+      <path
+         sodipodi:type="arc"
+         style="color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path3066"
+         sodipodi:cx="23.953241"
+         sodipodi:cy="12.379497"
+         sodipodi:rx="18.119612"
+         sodipodi:ry="8.3968925"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         transform="matrix(0.24835,0,0,0.244989,28.55119,5.65466)" />
+      <path
+         sodipodi:type="arc"
+         style="color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path3068"
+         sodipodi:cx="23.953241"
+         sodipodi:cy="12.379497"
+         sodipodi:rx="18.119612"
+         sodipodi:ry="8.3968925"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         transform="matrix(0.268112,0,0,0.237961,19.07786,10.10595)" />
+    </g>
+    <g
+       style="display:inline"
+       id="g2121"
+       transform="matrix(1.143947,0,0,1.143947,-57.43614,69.9204)">
+      <path
+         transform="matrix(0.965804,0,0,2.084105,49.36585,-18.30016)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2123"
+         style="opacity:1;color:black;fill:yellow;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535913,66.55122,-8.134333)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2125"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535914,57.55119,0.865653)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2127"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535914,75.55119,0.865653)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2129"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50792766;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.24835,0,0,0.535913,66.55122,9.865668)"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         sodipodi:ry="8.3968925"
+         sodipodi:rx="18.119612"
+         sodipodi:cy="12.379497"
+         sodipodi:cx="23.953241"
+         id="path2131"
+         style="opacity:1;color:black;fill:#333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.50793171;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="opacity:1;color:black;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 25.5,-110 C 15.840004,-110 8,-102.16 8,-92.5 C 8,-82.839997 15.840003,-75.000001 25.5,-75 C 35.159996,-75 42.999999,-82.839996 43,-92.5 C 43,-102.16 35.159996,-110 25.5,-110 z M 22.78125,-106.5625 C 23.771011,-106.65716 23.96582,-106.43877 24,-106.1875 L 24,-97.53125 C 24,-97.098147 23.698891,-96.743295 23.21875,-96.40625 C 22.703153,-96.173154 22.272538,-96.101023 21.90625,-96.3125 L 14.40625,-100.65625 C 14.101129,-100.89247 14.127611,-101.41158 16.28125,-103.6875 C 17.547068,-104.73229 18.990254,-105.55506 20.5625,-106.125 C 21.517426,-106.34785 22.293718,-106.51587 22.78125,-106.5625 z M 27.71875,-106.5625 C 28.199799,-106.5731 29.094846,-106.43834 30.4375,-106.125 C 32.009746,-105.55506 33.452932,-104.73229 34.71875,-103.6875 C 36.872391,-101.41158 36.898871,-100.89247 36.59375,-100.65625 L 29.09375,-96.3125 C 28.704021,-96.087487 28.247182,-96.197159 27.6875,-96.46875 C 27.261153,-96.786983 27,-97.125216 27,-97.53125 L 27,-106.1875 C 27.027344,-106.38852 27.163086,-106.55025 27.71875,-106.5625 z M 12.75,-98.0625 C 12.800892,-98.060484 12.85931,-98.050457 12.90625,-98.03125 L 20.40625,-93.71875 C 20.777361,-93.504491 20.915056,-93.074699 20.96875,-92.5 C 20.915056,-91.925303 20.777362,-91.495512 20.40625,-91.28125 L 12.90625,-86.96875 C 12.552459,-86.823979 12.098588,-87.108887 11.21875,-90.03125 C 11.078701,-90.83988 11,-91.651538 11,-92.5 C 11,-93.348462 11.078701,-94.160121 11.21875,-94.96875 C 11.981853,-97.50338 12.417314,-98.075679 12.75,-98.0625 z M 38.25,-98.0625 C 38.582686,-98.075681 39.018147,-97.503381 39.78125,-94.96875 C 39.921299,-94.160121 40,-93.348462 40,-92.5 C 40,-91.651537 39.921299,-90.83988 39.78125,-90.03125 C 38.901414,-87.108889 38.447541,-86.823983 38.09375,-86.96875 L 30.59375,-91.28125 C 30.242115,-91.484265 30.093674,-91.877907 30.03125,-92.40625 C 30.033454,-92.437295 30.028432,-92.469841 30.03125,-92.5 C 30.028432,-92.530159 30.033454,-92.562704 30.03125,-92.59375 C 30.093675,-93.122092 30.242114,-93.515732 30.59375,-93.71875 L 38.09375,-98.03125 C 38.14069,-98.050458 38.199108,-98.060484 38.25,-98.0625 z M 22.5,-88.8125 C 22.717889,-88.791765 22.960951,-88.710299 23.21875,-88.59375 C 23.698891,-88.256705 24,-87.901854 24,-87.46875 L 24,-78.8125 C 23.948984,-78.437453 23.456065,-78.199723 20.5625,-78.875 C 18.990254,-79.444936 17.547068,-80.267713 16.28125,-81.3125 C 14.127611,-83.588422 14.101129,-84.107533 14.40625,-84.34375 L 21.90625,-88.6875 C 22.089394,-88.793239 22.282111,-88.833235 22.5,-88.8125 z M 28.53125,-88.8125 C 28.738699,-88.827238 28.917932,-88.789009 29.09375,-88.6875 L 36.59375,-84.34375 C 36.898872,-84.107536 36.87239,-83.588424 34.71875,-81.3125 C 33.452932,-80.267713 32.009746,-79.444936 30.4375,-78.875 C 27.543935,-78.199723 27.051016,-78.437453 27,-78.8125 L 27,-87.46875 C 27,-87.918512 27.329248,-88.27628 27.84375,-88.625 C 28.088135,-88.730054 28.323801,-88.797762 28.53125,-88.8125 z "
+       id="path2064" />
+    <g
+       id="g2979"
+       transform="translate(0,-20)">
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;color:black;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path2971"
+         sodipodi:cx="23.953241"
+         sodipodi:cy="12.379497"
+         sodipodi:rx="18.119612"
+         sodipodi:ry="8.3968925"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         transform="matrix(0.965804,0,0,2.084105,2.36585,-148.3002)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;color:black;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path2973"
+         sodipodi:cx="23.953241"
+         sodipodi:cy="12.379497"
+         sodipodi:rx="18.119612"
+         sodipodi:ry="8.3968925"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         transform="matrix(0.800238,0,0,1.726831,6.331715,-143.8773)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;color:black;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path2975"
+         sodipodi:cx="23.953241"
+         sodipodi:cy="12.379497"
+         sodipodi:rx="18.119612"
+         sodipodi:ry="8.3968925"
+         d="M 42.072853 12.379497 A 18.119612 8.3968925 0 1 1  5.8336296,12.379497 A 18.119612 8.3968925 0 1 1  42.072853 12.379497 z"
+         transform="matrix(0.248349,0,0,0.535911,19.55124,-129.1343)" />
+      <path
+         sodipodi:nodetypes="ccccccccccccccccccccc"
+         id="path2977"
+         d="M 24,-137.15625 L 20,-136 C 23.5,-136.875 23.945312,-136.58954 24,-136.1875 L 24,-127.53125 C 24,-126.98987 23.563049,-126.57154 22.84375,-126.15625 L 22.84375,-118.84375 C 23.563049,-118.42846 24,-118.01013 24,-117.46875 L 24,-108.8125 C 23.945312,-108.41046 23.5,-108.125 20,-109 L 24,-107.84375 L 27,-107.84375 L 31,-109 C 27.5,-108.125 27.054688,-108.41046 27,-108.8125 L 27,-117.46875 C 27,-118.01013 27.436951,-118.42846 28.15625,-118.84375 L 28.15625,-126.15625 C 27.436951,-126.57154 27,-126.98987 27,-127.53125 L 27,-136.1875 C 27.054688,-136.58954 27.5,-136.875 31,-136 L 27,-137.15625 L 24,-137.15625 z "
+         style="opacity:0.49536671;color:black;fill:navy;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <path
+       style="color:black;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69588834;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 25.5,-200 C 15.840004,-200 8,-192.16 8,-182.5 C 8,-172.84 15.840003,-164.99999 25.5,-165 C 35.159996,-165 42.999999,-172.84 43,-182.5 C 43,-192.16 35.159996,-200 25.5,-200 z M 22.78125,-195.5625 C 23.771011,-195.65716 23.96582,-195.43877 24,-195.1875 L 24,-187.53125 C 24,-187.12521 23.738847,-186.78698 23.3125,-186.46875 C 23.265762,-186.42866 23.208184,-186.40616 23.15625,-186.375 C 22.66748,-186.16489 22.257887,-186.10948 21.90625,-186.3125 L 15.25,-190.15625 C 14.960591,-190.3803 15.03696,-190.88915 16.875,-192.875 C 16.885475,-192.88632 16.895653,-192.89483 16.90625,-192.90625 C 18.113844,-193.90298 19.525406,-194.6875 21.03125,-195.21875 C 21.734767,-195.37149 22.381902,-195.52431 22.78125,-195.5625 z M 27.71875,-195.5625 C 28.137914,-195.57174 28.916508,-195.4472 29.96875,-195.21875 C 31.474594,-194.6875 32.886156,-193.90298 34.09375,-192.90625 C 34.105233,-192.89677 34.113549,-192.88452 34.125,-192.875 C 35.96304,-190.88915 36.039409,-190.3803 35.75,-190.15625 L 29.09375,-186.3125 C 28.70402,-186.08748 28.247182,-186.19716 27.6875,-186.46875 C 27.261153,-186.78698 27,-187.12522 27,-187.53125 L 27,-195.1875 C 27.027344,-195.38852 27.163086,-195.55025 27.71875,-195.5625 z M 13.59375,-187.5625 C 13.643788,-187.56048 13.70306,-187.55046 13.75,-187.53125 L 20.40625,-183.71875 C 20.757886,-183.51574 20.906324,-183.12209 20.96875,-182.59375 C 20.968656,-182.53128 20.96875,-182.46872 20.96875,-182.40625 C 20.906325,-181.87791 20.757887,-181.48427 20.40625,-181.28125 L 13.75,-177.46875 C 13.416208,-177.33217 12.997814,-177.62145 12.21875,-180.09375 C 12.077623,-180.87584 12,-181.67745 12,-182.5 C 12,-183.32255 12.077623,-184.12416 12.21875,-184.90625 C 12.888257,-187.03088 13.28797,-187.57482 13.59375,-187.5625 z M 37.40625,-187.5625 C 37.71203,-187.57482 38.111743,-187.03088 38.78125,-184.90625 C 38.922377,-184.12416 39,-183.32255 39,-182.5 C 39,-181.67745 38.922377,-180.87584 38.78125,-180.09375 C 38.002186,-177.62145 37.583791,-177.33217 37.25,-177.46875 L 30.59375,-181.28125 C 30.242114,-181.48426 30.093676,-181.87791 30.03125,-182.40625 C 30.030351,-182.46877 30.03125,-182.53123 30.03125,-182.59375 C 30.093675,-183.12209 30.242113,-183.51573 30.59375,-183.71875 L 37.25,-187.53125 C 37.29694,-187.55046 37.356212,-187.56048 37.40625,-187.5625 z M 22.5,-178.8125 C 22.717889,-178.79176 22.960951,-178.7103 23.21875,-178.59375 C 23.698891,-178.2567 24,-177.90185 24,-177.46875 L 24,-169.8125 C 23.952029,-169.45984 23.478393,-169.24996 21.03125,-169.78125 C 19.525406,-170.3125 18.113844,-171.09702 16.90625,-172.09375 C 16.894767,-172.10323 16.886451,-172.11548 16.875,-172.125 C 15.03696,-174.11085 14.960591,-174.6197 15.25,-174.84375 L 21.90625,-178.6875 C 22.089394,-178.79324 22.282111,-178.83324 22.5,-178.8125 z M 28.53125,-178.8125 C 28.738699,-178.82724 28.917931,-178.78901 29.09375,-178.6875 L 35.75,-174.84375 C 36.039408,-174.6197 35.963039,-174.11085 34.125,-172.125 C 34.113549,-172.11548 34.105233,-172.10323 34.09375,-172.09375 C 32.886155,-171.09702 31.474594,-170.3125 29.96875,-169.78125 C 27.521607,-169.24996 27.047971,-169.45984 27,-169.8125 L 27,-177.46875 C 27,-177.87479 27.261153,-178.21302 27.6875,-178.53125 C 27.733414,-178.56552 27.793729,-178.5911 27.84375,-178.625 C 28.088135,-178.73005 28.323801,-178.79776 28.53125,-178.8125 z "
+       id="path5693"
+       sodipodi:nodetypes="csssccccssccssccccsscccccccccsscccsccccscccssccccccccssccccccsscccssc" />
+  </g>
+</svg>
diff --git a/rapid/media.py b/rapid/media.py
index def73e6..4ed5380 100755
--- a/rapid/media.py
+++ b/rapid/media.py
@@ -21,17 +21,27 @@ import os
 
 import config
 import common
+import metadata
+import videometadata
 
 import operator
 
-def getDefaultPhotoLocation():
-    for default in config.DEFAULT_PHOTO_LOCATIONS:
+def _getDefaultLocation(options, ignore_missing_dir=False):
+    if ignore_missing_dir:
+        return common.getFullPath(options[0])
+    for default in options:
         path = common.getFullPath(default)
         if os.path.isdir(path):
             return path
     return common.getFullPath('')
+
+def getDefaultPhotoLocation(ignore_missing_dir=False):
+    return _getDefaultLocation(config.DEFAULT_PHOTO_LOCATIONS, ignore_missing_dir)
+    
+def getDefaultVideoLocation(ignore_missing_dir=False):
+    return _getDefaultLocation(config.DEFAULT_VIDEO_LOCATIONS, ignore_missing_dir)
     
-def isImageMedia(path):
+def is_DCIM_Media(path):
     """ Returns true if directory specifies some media with photos on it   """
     
     if os.path.isdir(os.path.join(path, "DCIM")):
@@ -41,27 +51,60 @@ def isImageMedia(path):
         return False
 
     
-def isBackupMedia(path, identifier, writeable=True):
-    """  Test to see if path is used as a backup medium for storing images
+def isBackupMedia(path, identifiers, writeable=True):
+    """  Test to see if path is used as a backup medium for storing photos or videos
+    
+    Identifiers is expected to be a list of folder names to check to see
+    if the path is a backup path. Only one of them needs to be present
+    for the path to be considered a backup medium.
     
     If writeable is True, the directory must be writeable by the user """
     suitable = False
-    if os.path.isdir(os.path.join(path, identifier)):
-        if writeable:
-            suitable = os.access(os.path.join(path, identifier), os.W_OK)
-        else:
-            suitable = True
-    return suitable
+    
+    for identifier in identifiers:
+        if os.path.isdir(os.path.join(path, identifier)):
+            if writeable:
+                suitable = os.access(os.path.join(path, identifier), os.W_OK)
+            else:
+                suitable = True
+        if suitable:
+            return True
+    return False
     
 def isImage(fileName):
     ext = os.path.splitext(fileName)[1].lower()[1:]
-    return (ext in config.RAW_FILE_EXTENSIONS) or (ext in config.NON_RAW_IMAGE_FILE_EXTENSIONS)
+    return (ext in metadata.RAW_FILE_EXTENSIONS) or (ext in metadata.NON_RAW_IMAGE_FILE_EXTENSIONS)
+    
+def isVideo(fileName):
+    ext = os.path.splitext(fileName)[1].lower()[1:]
+    return (ext in videometadata.VIDEO_FILE_EXTENSIONS)
+    
+def getVideoThumbnailFile(fullFileName):
+    """
+    Checks to see if a thumbnail file is in the same directory as the 
+    file. Expects a full path to be part of the file name.
+    
+    Returns the filename, including path, if found, else returns None.
+    """
+    
+    f = None
+    name, ext = os.path.splitext(fullFileName)
+    for e in videometadata.VIDEO_THUMBNAIL_FILE_EXTENSIONS:
+        if os.path.exists(name + '.' + e):
+            f = name + '.' + e
+            break
+        if os.path.exists(name + '.' + e.upper()):
+            f = name + '.' + e.upper()
+            break
+        
+    return f
+    
 
 class Media:
-    """ Generic class for media holding images """
+    """ Generic class for media holding images and videos """
     def __init__(self, path, volume = None):
         """
-        volume is a gnomevfs or gio volume, see class Volume in rapid.py
+        volume is a gnomevfs or gio volume: see class Volume in rapid.py
         """
         
         self.path = path
@@ -94,87 +137,39 @@ class Media:
         
     
 class CardMedia(Media):
-    """Compact Flash cards, etc."""
+    """Compact Flash cards, hard drives, etc."""
     def __init__(self, path, volume = None,  doNotScan=True):
         """
         volume is a gnomevfs or gio volume, see class Volume in rapid.py
         """
         Media.__init__(self, path, volume)
-        if not doNotScan:
-            self.scanMedia()
 
-    def scanMedia(self):
-        """ creates a list of images on a path, recursively scanning
-        
-        images are sorted by modification time"""
-        
-        self.images = []
-        self.imageSizeSum = 0
-        for root, dirs, files in os.walk(self.path):
-            for name in files:
-                if isImage(name):
-                    image = os.path.join(root, name)
-                    size = os.path.getsize(image)
-                    modificationTime = os.path.getmtime(image)
-                    self.images.append((name, root, size,  modificationTime),)
-                    self.imageSizeSum += size
-        self.images.sort(key=operator.itemgetter(3))
-        self.noImages = len(self.images)
         
-    def setMedia(self,  images,  imageSizeSum,  noImages):
-        self.images = images
-        self.imageSizeSum = imageSizeSum
-        self.noImages = noImages
+    def setMedia(self, imagesAndVideos, fileSizeSum, noFiles):
+        self.imagesAndVideos = imagesAndVideos
+        self.fileSizeSum = fileSizeSum
+        self.noFiles = noFiles
         
-    def numberOfImages(self):
-        return self.noImages
+    def numberOfImagesAndVideos(self):
+        return self.noFiles
         
-    def sizeOfImages(self, humanReadable = True):
+    def sizeOfImagesAndVideos(self, humanReadable = True):
         if humanReadable:
-            return common.formatSizeForUser(self.imageSizeSum)
+            return common.formatSizeForUser(self.fileSizeSum)
         else:
-            return self.imageSizeSum
+            return self.fileSizeSum
     
-    def firstImage(self):
-        if self.images:
-            return self.images[0]
+    def _firstFile(self, isCorrectFile):
+        if self.imagesAndVideos:
+            for i in range(len(self.imagesAndVideos)):
+                if isCorrectFile(self.imagesAndVideos[i]):
+                    return self.imagesAndVideos[i]
         else:
             return None
-    
         
-def scanForImageMedia(path):
-    """ returns a list of paths that contain images on media produced by a digital camera """
-    
-    media = []
-    for i in os.listdir(path):
-        p = os.path.join(path, i)
-        if os.path.isdir(p):
-            if isImageMedia(p):
-                media.append(p)
-    return media
-    
-def scanForBackupMedia(path, identifier):
-    """ returns a list of paths that contains backed up images  """
-    
-    media = []
-    for i in os.listdir(path):
-        p = os.path.join(path, i)
-        if os.path.isdir(p):
-            if isBackupMedia(p, identifier):
-                media.append(os.path.join(p, identifier))
-    return media
-
+    def firstImage(self):
+        return self._firstFile(isImage)
     
-if __name__ == '__main__':
-    print "Card media:"
-    for m in scanForImageMedia('/media'):
-        media = CardMedia(m)
-        print media.prettyName()
-        print media.numberOfImages()
-        print media.sizeOfImages()
+    def firstVideo(self):
+        return self._firstFile(isVideo)
         
-    print "\nBackup media:"
-    for m in scanForBackupMedia('/media',  'photos'):
-        print m
-
-    print "\nDefault download folder: ",  getDefaultPhotoLocation()
diff --git a/rapid/metadata.py b/rapid/metadata.py
index 1d4b2df..f8886d7 100755
--- a/rapid/metadata.py
+++ b/rapid/metadata.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007-10 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -20,7 +20,9 @@
 import re
 import datetime
 import sys
+import subprocess
 import config
+import types
 
 try:
     import pyexiv2
@@ -28,18 +30,98 @@ except ImportError:
     sys.stderr.write("You need to install pyexiv2, the python binding for exiv2, to run this program.\n" )
     sys.exit(1)
     
-#only pyexiv2 0.1.2 and 0.1.3 use the "Rational" class 
-#is there a superior way to find which version of pyexiv2 is being used?
+#only pyexiv2 <= 0.1.1 does not use the "Rational" class 
 if 'Rational' in dir(pyexiv2):
     usesRational = True
 else:
     usesRational = False
 
+#get versions of pyexiv2 and exiv2 libraries
+if 'version_info' in dir(pyexiv2):
+    pyexiv2_version = pyexiv2.version_info
+    exiv2_version = pyexiv2.exiv2_version_info
+    baseclass = eval('pyexiv2.metadata.ImageMetadata')
+else:
+    pyexiv2_version = (0,1,'x')
+    # try to determine the version of exiv2 from it's standard output
+    try:
+        proc = subprocess.Popen(['exiv2', '-V'], stdout=subprocess.PIPE)
+        output = proc.communicate()[0]
+    except:
+        output = None
+        exiv2_version = None
+    if output:
+        # assume output contains the line 'exiv2 0.x' or possibly
+        # 'exiv2 0.x.x'
+        start = output.find('exiv2 ')
+        if start < 0:
+            exiv2_version = None            
+        else:
+            end = output.find('\n', start)
+            if end:
+                exiv2_v = output[6:end]
+            else:
+                exiv2_v = output[6:]
+            
+            exiv2_version = []
+            dot = exiv2_v.find('.')
+            while dot > 0:
+                exiv2_version += [int(exiv2_v[:dot])]
+                exiv2_v = exiv2_v[dot+1:]
+                dot = exiv2_v.find('.')
+            exiv2_version += [int(exiv2_v)]
+            exiv2_version = tuple(exiv2_version) 
+            
+        
+    baseclass = eval('pyexiv2.Image')
+
+def __version_info(version):
+    if not version:
+        return ''
+    else:
+        v = ''
+        for i in version:
+            v += '.%s' % i
+        return v[1:]    
+    
+def version_info():
+    return __version_info(pyexiv2_version)
+    
+def exiv2_version_info():
+    return __version_info(exiv2_version)    
+
+RAW_FILE_EXTENSIONS = ['arw', 'dcr', 'cr2', 'crw',  'dng', 'mos', 'mrw', 
+                        'nef', 'orf', 'pef', 'raf', 'raw', 'sr2']
 
-class MetaData(pyexiv2.Image):
+#exiv2 0.18.1 introduces support for Panasonic .RW2 files
+#pyexiv2 in combination with exiv2 0.18 segfaults when trying to read an
+#RW2 files, so we should not read those! exiv2 0.17 & pyexiv2 segfaults
+#with MEF files.
+
+if exiv2_version[0] > 0:
+    RAW_FILE_EXTENSIONS += ['rw2', 'mef']
+else:
+    if exiv2_version[1] > 17:
+        RAW_FILE_EXTENSIONS += ['mef']
+    if exiv2_version[1] > 18:
+        RAW_FILE_EXTENSIONS += ['rw2']
+    else:
+        if len(exiv2_version) > 2:
+            if exiv2_version[2] >= 1:
+                RAW_FILE_EXTENSIONS += ['rw2']
+                
+RAW_FILE_EXTENSIONS.sort()
+
+NON_RAW_IMAGE_FILE_EXTENSIONS = ['jpg', 'jpe', 'jpeg', 'tif', 'tiff']
+
+
+class MetaData(baseclass):
     """
     Class providing human readable access to image metadata
+
     """
+    
+    __version01__ = pyexiv2_version[0] == 0 and pyexiv2_version[1] == 1
 
     def aperture(self, missing=''):
         """ 
@@ -97,10 +179,16 @@ class MetaData(pyexiv2.Image):
 
         try:
             if usesRational:
+
                 e = str(self["Exif.Photo.ExposureTime"])
+
                 e0,  e1 = e.split('/')
                 e0 = int(e0)
                 e1 = int(e1)
+                # some values, e.g. Nikon, are in the format "10/1600"
+                if (e0 > 1) and (e0 < e1):
+                    e1 = e1 / e0
+                    e0 = 1
             else:
                 e0, e1 = self["Exif.Photo.ExposureTime"]
             
@@ -111,7 +199,7 @@ class MetaData(pyexiv2.Image):
                     else:
                         return  str(e0)
                 else:
-                    return e
+                    return "%s/%s" % (e0,e1)
             elif e0 > e1:
                 e = float(e0) / e1
                 if alternativeFormat:
@@ -171,7 +259,7 @@ class MetaData(pyexiv2.Image):
             
     def cameraSerial(self,  missing=''):
         try:
-            keys = self.exifKeys()
+            keys = self.rpd_keys()
             if 'Exif.Canon.SerialNumber' in keys:
                 v = self['Exif.Canon.SerialNumber']
             elif 'Exif.Nikon3.SerialNumber' in keys:
@@ -196,9 +284,11 @@ class MetaData(pyexiv2.Image):
             
     def shutterCount(self,  missing=''):
         try:
-            keys = self.exifKeys()
+            keys = self.rpd_keys()
             if 'Exif.Nikon3.ShutterCount' in keys:
                 v = self['Exif.Nikon3.ShutterCount']
+            elif 'Exif.Canon.FileNumber' in keys:
+                v = self['Exif.Canon.FileNumber']
             elif 'Exif.Canon.ImageNumber' in keys:
                 v = self['Exif.Canon.ImageNumber']
             else:
@@ -290,12 +380,13 @@ class MetaData(pyexiv2.Image):
         
         Returns missing either metadata value is not present.
         """
-        keys = self.exifKeys()
+        keys = self.rpd_keys()
         try:
             if "Exif.Photo.DateTimeOriginal" in keys:
-                return self["Exif.Photo.DateTimeOriginal"]
+                v = self["Exif.Photo.DateTimeOriginal"]
             else:
-                return self["Exif.Image.DateTime"]
+                v = self["Exif.Image.DateTime"]
+            return v
         except:
             return missing
             
@@ -309,11 +400,66 @@ class MetaData(pyexiv2.Image):
     def orientation(self, missing=''):
         """
         Returns the orientation of the image, as recorded by the camera
+        Return type int
         """
         try:
-            return self['Exif.Image.Orientation']
+            v = self['Exif.Image.Orientation']
+            if isinstance(v, types.StringType):
+                # pyexiv2 >= 0.2 returns a string, not an int
+                v = int(v)
+            return v
         except:
             return missing
+            
+    # following class methods are designed to cope with using both
+    # pyexiv2 0.1.x and pyexiv2 0.2.x
+            
+    def getThumbnailData(self, max_size_needed=0):
+        """
+        Returns a thumbnail of the image.
+        
+        If the image supports multiple thumbnails, and max_size_needed
+        is not 0, then it will search for the smallest thumbnail that 
+        matches the size required 
+        
+        The image will be in whatever format the thumbnail itself is, 
+        typically a jpeg or tiff.
+        """
+        if self.__version01__:
+            return pyexiv2.Image.getThumbnailData(self)[1]
+
+        else:
+            if not self.previews:
+                return None, None
+            else:
+                if max_size_needed:
+                    for thumbnail in self.previews:
+                        if thumbnail.dimensions[0] >= max_size_needed or thumbnail.dimensions[1] >= max_size_needed:
+                            break
+                else:
+                    thumbnail = self.previews[-1]
+                        
+                return thumbnail.data
+                
+    def read(self):
+        if self.__version01__:
+            self.readMetadata()
+        else:
+            pyexiv2.metadata.ImageMetadata.read(self)
+            
+    def rpd_keys(self):
+        if self.__version01__:
+            return pyexiv2.Image.exifKeys(self)
+        else:
+            return self.exif_keys
+            
+    def __getitem__(self, key):
+        if self.__version01__:
+            return pyexiv2.Image.__getitem__(self, key)
+        else:
+            return pyexiv2.metadata.ImageMetadata.__getitem__(self, key).raw_value
+        
+        
 
 class DummyMetaData(MetaData):
     """
@@ -376,16 +522,15 @@ class DummyMetaData(MetaData):
 if __name__ == '__main__':
     import sys
     
+    
     if (len(sys.argv) != 2):
         print 'Usage: ' + sys.argv[0] + ' path/to/photo/containing/metadata'
         m = DummyMetaData()
 
     else:
         m = MetaData(sys.argv[1])
-        m.readMetadata()
+        m.read()
         
-#    for i in m.exifKeys():
-#        print i
     print "f"+ m.aperture('missing ')
     print "ISO " + m.iso('missing ')
     print m.exposureTime(missing='missing ') + " sec"
diff --git a/rapid/prefs.py b/rapid/prefs.py
index 6912138..2f7d771 100644
--- a/rapid/prefs.py
+++ b/rapid/prefs.py
@@ -15,6 +15,7 @@
 ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ### Modified August 2007 by Damon Lynch to allow use of list value preferences
+### Modified May 2010 by Damon Lynch to allow preferences to be reset
   
 """Module to help implement 'instant-apply' preferences.
 
@@ -179,4 +180,13 @@ class Preferences(object):
         """
         for k,v in self._prefs.items():
             print k, v.type, v.current
+            
+    def reset(self):
+        """
+        reset all preferences to defaults
+        """
+        
+        for key in self._prefs:
+            self.__setattr__(key, self.get_default(key))
+            
 
diff --git a/rapid/rapid.py b/rapid/rapid.py
index 1c04763..f5f221e 100755
--- a/rapid/rapid.py
+++ b/rapid/rapid.py
@@ -27,6 +27,7 @@ import time
 import datetime
 import atexit
 import tempfile
+import types
 import webbrowser
 import operator
 
@@ -46,6 +47,7 @@ import pango
 try:
     import gio
     using_gio = True
+    import gobject
 except ImportError:
     import gnomevfs
     using_gio = False
@@ -68,12 +70,14 @@ import common
 import misc
 import higdefaults as hd
 
-from media import getDefaultPhotoLocation
+from media import getDefaultPhotoLocation, getDefaultVideoLocation
 from media import CardMedia
 
 import media
 
 import metadata
+import videometadata
+from videometadata import DOWNLOAD_VIDEO
 
 import renamesubfolderprefs as rn 
 
@@ -99,6 +103,8 @@ _ = Configi18n._
 #Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html 
 PROGRAM_NAME = _('Rapid Photo Downloader')
 
+MAX_THUMBNAIL_SIZE = 100
+
 def today():
     return datetime.date.today().strftime('%Y-%m-%d')
 
@@ -125,6 +131,7 @@ def updateDisplay(display_queue):
     except tube.EOInformation:
         for w in workers.getStartedWorkers():
             w.join()
+
         gtk.main_quit()
         
         return False
@@ -144,7 +151,7 @@ class Queue(tube.Tube):
 #   this is ugly but I don't know a better way :(
 
 display_queue = Queue()
-media_collection_treeview = image_hbox = log_dialog = None
+media_collection_treeview = thumbnail_hbox = log_dialog = None
 
 job_code = None
 need_job_code = False
@@ -344,12 +351,18 @@ workers = ThreadManager()
 class RapidPreferences(prefs.Preferences):
     defaults = {
         "program_version": prefs.Value(prefs.STRING, ""),
-        "download_folder":  prefs.Value(prefs.STRING, 
+        "download_folder": prefs.Value(prefs.STRING, 
                                         getDefaultPhotoLocation()),
+        "video_download_folder": prefs.Value(prefs.STRING, 
+                                        getDefaultVideoLocation()),                                        
         "subfolder": prefs.ListValue(prefs.STRING_LIST, rn.DEFAULT_SUBFOLDER_PREFS),
+        "video_subfolder": prefs.ListValue(prefs.STRING_LIST, rn.DEFAULT_VIDEO_SUBFOLDER_PREFS),
         "image_rename": prefs.ListValue(prefs.STRING_LIST, [rn.FILENAME, 
                                         rn.NAME_EXTENSION,
                                         rn.ORIGINAL_CASE]),
+        "video_rename": prefs.ListValue(prefs.STRING_LIST, [rn.FILENAME, 
+                                        rn.NAME_EXTENSION,
+                                        rn.ORIGINAL_CASE]),
         "device_autodetection": prefs.Value(prefs.BOOL, True),
         "device_location": prefs.Value(prefs.STRING, os.path.expanduser('~')), 
         "device_autodetection_psd": prefs.Value(prefs.BOOL,  False),
@@ -359,6 +372,8 @@ class RapidPreferences(prefs.Preferences):
         "backup_device_autodetection": prefs.Value(prefs.BOOL, True),
         "backup_identifier": prefs.Value(prefs.STRING, 
                                         config.DEFAULT_BACKUP_LOCATION),
+        "video_backup_identifier": prefs.Value(prefs.STRING, 
+                                        config.DEFAULT_VIDEO_BACKUP_LOCATION),                                        
         "backup_location": prefs.Value(prefs.STRING, os.path.expanduser('~')),
         "strip_characters": prefs.Value(prefs.BOOL, True),
         "auto_download_at_startup": prefs.Value(prefs.BOOL, False),
@@ -458,27 +473,46 @@ class RapidPreferences(prefs.Preferences):
         else:
             return ''
             
+    def reset(self):
+        """
+        resets all preferences to default values
+        """
+        
+        prefs.Preferences.reset(self)
+        self.program_version = __version__
+            
 class ImageRenameTable(tpm.TablePlusMinus):
 
-    def __init__(self, parentApp,  adjustScrollWindow):
+    def __init__(self, parentApp, adjustScrollWindow):
   
         tpm.TablePlusMinus.__init__(self, 1, 3)
         self.parentApp = parentApp
         self.adjustScrollWindow = adjustScrollWindow
+        if not hasattr(self, "errorTitle"):
+            self.errorTitle = _("Error in Photo Rename preferences")
+                    
+        self.table_type = self.errorTitle[len("Error in "):]
+        self.i = 0
+
         if adjustScrollWindow:
+            self.scrollBar = self.adjustScrollWindow.get_vscrollbar()
+            #this next line does not work on early versions of pygtk :(
+            self.scrollBar.connect('visibility-notify-event', self.scrollbar_visibility_change)
             self.connect("size-request", self.size_adjustment)
             self.connect("add",  self.size_adjustment)
-            self.tableWidth = self.allocation.width
+            self.connect("remove",  self.size_adjustment)
+
+            # get scrollbar thickness from parent app scrollbar - very hackish, but what to do??
+            self.bump = self.parentApp.parentApp.image_scrolledwindow.get_hscrollbar().allocation.height
+            self.haveVerticalScrollbar = False
+
             # vbar is '1' if there is not vertical scroll bar
             # if there is  a vertical scroll bar, then it will have a the width of the bar
-            self.vbar = self.adjustScrollWindow.get_vscrollbar().allocation.width
+            #self.vbar = self.adjustScrollWindow.get_vscrollbar().allocation.width
 
         self.getParentAppPrefs()
         self.getPrefsFactory()
         
-        if not hasattr(self, "errorTitle"):
-            self.errorTitle = _("Error in Image Rename preferences")
-        
         try:
             self.prefsFactory.checkPrefsForValidity()
             
@@ -497,7 +531,7 @@ class ImageRenameTable(tpm.TablePlusMinus):
             self.updateParentAppPrefs()
 
             msg = "%s.\n" % e
-            msg += _("Resetting to default values.")
+            msg += _("Resetting to default values." + "\n")
             sys.stderr.write(msg)
             
             
@@ -507,10 +541,7 @@ class ImageRenameTable(tpm.TablePlusMinus):
         
         for row in self.prefsFactory.getWidgetsBasedOnPreferences():
             self.append(row)
-            
-
-
-            
+                      
     def updatePreferences(self):
         prefList = []
         for row in self.pm_rows:                
@@ -535,25 +566,32 @@ class ImageRenameTable(tpm.TablePlusMinus):
         self.updateExample()
             
     
-    def size_adjustment(self,  arg1,  arg2):
-        """ Adjust scrolledwindow width in preferences dialog to reflect width of image rename table
+    def scrollbar_visibility_change(self, widget, event):
+        if event.state == gdk.VISIBILITY_UNOBSCURED:
+            self.haveVerticalScrollbar = True
+            self.adjustScrollWindow.set_size_request(self.adjustScrollWindow.allocation.width + self.bump, -1)
+
+            
+    def size_adjustment(self, widget, arg2):
+        """
+        Adjust scrolledwindow width in preferences dialog to reflect width of image rename table
         
-        The algorithm is complicated by the need to tak into account the presence of a vertical scrollbar"""
+        The algorithm is complicated by the need to take into account the presence of a vertical scrollbar,
+        which might be added as the user adds more rows
+        
+        The pygtk code behaves inconsistently depending on the pygtk version
+        """
         
         if self.adjustScrollWindow:
-            if self.adjustScrollWindow.get_vscrollbar().allocation.width > 1:
-                extra = self.adjustScrollWindow.get_vscrollbar().allocation.width + 10
+            self.haveVerticalScrollbar = self.scrollBar.allocation.width > 1 or self.haveVerticalScrollbar
+            if not self.haveVerticalScrollbar:
+                if self.allocation.width > self.adjustScrollWindow.allocation.width:
+                    self.adjustScrollWindow.set_size_request(self.allocation.width, -1)
             else:
-                extra = 0
-            if self.vbar <= 1:
-                if self.allocation.width > self.tableWidth:
-                    self.adjustScrollWindow.set_size_request(self.allocation.width + extra,  -1) 
-                    self.tableWidth = self.allocation.width + extra
-            elif self.allocation.width - extra > self.tableWidth:
-                self.adjustScrollWindow.set_size_request(self.allocation.width + extra,  -1) 
-                self.tableWidth = self.allocation.width + extra
-            self.vbar = self.adjustScrollWindow.get_vscrollbar().allocation.width
-            
+                if self.allocation.width > self.adjustScrollWindow.allocation.width - self.bump:
+                    self.adjustScrollWindow.set_size_request(self.allocation.width + self.bump, -1)
+                    self.bump = 0
+       
     def getParentAppPrefs(self):
         self.prefList = self.parentApp.prefs.image_rename
         
@@ -634,12 +672,30 @@ class ImageRenameTable(tpm.TablePlusMinus):
         """
         self.updatePreferences()        
 
-class SubfolderTable(ImageRenameTable):
-    def __init__(self, parentApp,  adjustScollWindow):    
-        self.errorTitle = _("Error in Download Subfolder preferences")
+class VideoRenameTable(ImageRenameTable):
+    def __init__(self, parentApp, adjustScollWindow):    
+        self.errorTitle = _("Error in Video Rename preferences")
         ImageRenameTable.__init__(self,  parentApp,  adjustScollWindow)
 
     def getParentAppPrefs(self):
+        self.prefList = self.parentApp.prefs.video_rename
+    
+    def getPrefsFactory(self):
+        self.prefsFactory = rn.VideoRenamePreferences(self.prefList, self,
+                                                    sequences = sequences)
+        
+    def updateParentAppPrefs(self):
+        self.parentApp.prefs.video_rename = self.prefList
+
+    def updateExample(self):
+        self.parentApp.updateVideoRenameExample()
+
+class SubfolderTable(ImageRenameTable):
+    def __init__(self, parentApp, adjustScollWindow):    
+        self.errorTitle = _("Error in Photo Download Subfolders preferences")
+        ImageRenameTable.__init__(self, parentApp, adjustScollWindow)
+
+    def getParentAppPrefs(self):
         self.prefList = self.parentApp.prefs.subfolder
     
     def getPrefsFactory(self):
@@ -649,8 +705,24 @@ class SubfolderTable(ImageRenameTable):
         self.parentApp.prefs.subfolder = self.prefList
 
     def updateExample(self):
-        self.parentApp.updateDownloadFolderExample()
+        self.parentApp.updatePhotoDownloadFolderExample()
+        
+class VideoSubfolderTable(ImageRenameTable):
+    def __init__(self, parentApp, adjustScollWindow): 
+        self.errorTitle = _("Error in Video Download Subfolders preferences")
+        ImageRenameTable.__init__(self, parentApp, adjustScollWindow)
+
+    def getParentAppPrefs(self):
+        self.prefList = self.parentApp.prefs.video_subfolder
+    
+    def getPrefsFactory(self):
+        self.prefsFactory = rn.VideoSubfolderPreferences(self.prefList, self)
         
+    def updateParentAppPrefs(self):
+        self.parentApp.prefs.video_subfolder = self.prefList
+
+    def updateExample(self):
+        self.parentApp.updateVideoDownloadFolderExample()        
 
 class PreferencesDialog(gnomeglade.Component):
     def __init__(self, parentApp):
@@ -668,9 +740,13 @@ class PreferencesDialog(gnomeglade.Component):
         self._setupTabSelector()
         
         self._setupControlSpacing()
-
-        # get example image data
         
+        if DOWNLOAD_VIDEO:
+            self.file_types = _("photos and videos")
+        else:
+            self.file_types = _("photos")
+
+        # get example photo and video data
         try:
             w = workers.firstWorkerReadyToDownload()
             root, self.sampleImageName = w.firstImage()
@@ -680,16 +756,31 @@ class PreferencesDialog(gnomeglade.Component):
         except:
             self.sampleImage = metadata.DummyMetaData()
             self.sampleImageName = 'IMG_0524.CR2'
+            
+
+        try:
+            root, self.sampleVideoName = w.firstVideo()
+            video = os.path.join(root, self.sampleVideoName)
+            self.sampleVideo = videometadata.MetaData(video)
+        except:
+            self.sampleVideo = videometadata.DummyMetaData()
+            self.sampleVideoName = 'MVI_1379.MOV'
+            
         
         # setup tabs
-        self._setupDownloadFolderTab()
+        self._setupPhotoDownloadFolderTab()
         self._setupImageRenameTab()
+        self._setupVideoDownloadFolderTab()
+        self._setupVideoRenameTab()                
         self._setupRenameOptionsTab()
         self._setupJobCodeTab()
         self._setupDeviceTab()
         self._setupBackupTab()
         self._setupAutomationTab()
         self._setupErrorTab()
+        
+        if not DOWNLOAD_VIDEO:
+            self.disableVideoControls()
 
         self.widget.realize()
         
@@ -698,7 +789,7 @@ class PreferencesDialog(gnomeglade.Component):
         width_of_widest_sel_row = self.treeview.get_background_area(1, self.treeview_column)[2]
         self.scrolled_window.set_size_request(width_of_widest_sel_row + 2, -1)
 
-        #set the minimum width of the scolled window holding the image rename table
+        #set the minimum width of the scolled window holding the photo rename table
         if self.rename_scrolledwindow.get_vscrollbar():
             extra = self.rename_scrolledwindow.get_vscrollbar().allocation.width + 10
         else:
@@ -732,7 +823,11 @@ class PreferencesDialog(gnomeglade.Component):
     
     def on_download_folder_filechooser_button_selection_changed(self, widget):
         self.prefs.download_folder = widget.get_current_folder()
-        self.updateDownloadFolderExample()
+        self.updatePhotoDownloadFolderExample()
+        
+    def on_video_download_folder_filechooser_button_selection_changed(self, widget):
+        self.prefs.video_download_folder = widget.get_current_folder()
+        self.updateVideoDownloadFolderExample()
     
     def on_backup_folder_filechooser_button_selection_changed(self, widget):
         self.prefs.backup_location = widget.get_current_folder()
@@ -744,15 +839,17 @@ class PreferencesDialog(gnomeglade.Component):
     def _setupControlSpacing(self):
         """
         set spacing of some but not all controls
-        
-        not currently used
         """
         
         self._setupTableSpacing(self.download_folder_table) 
+        self._setupTableSpacing(self.video_download_folder_table) 
         self.download_folder_table.set_row_spacing(2, 
                                 hd.VERTICAL_CONTROL_SPACE)
+        self.video_download_folder_table.set_row_spacing(2, 
+                                hd.VERTICAL_CONTROL_SPACE)
         self._setupTableSpacing(self.rename_example_table)
-        self.devices_table.set_col_spacing(0,   hd.NESTED_CONTROLS_SPACE)        
+        self._setupTableSpacing(self.video_rename_example_table)
+        self.devices_table.set_col_spacing(0, hd.NESTED_CONTROLS_SPACE)        
       
         self._setupTableSpacing(self.backup_table)
         self.backup_table.set_col_spacing(1, hd.NESTED_CONTROLS_SPACE)
@@ -769,11 +866,16 @@ class PreferencesDialog(gnomeglade.Component):
         table.set_col_spacing(1, hd.CONTROL_LABEL_SPACE)
 
     def _setupSubfolderTable(self):
-        self.subfolder_table = SubfolderTable(self,  None)
+        self.subfolder_table = SubfolderTable(self, None)
         self.subfolder_vbox.pack_start(self.subfolder_table)
         self.subfolder_table.show_all()
         
-    def _setupDownloadFolderTab(self):
+    def _setupVideoSubfolderTable(self):
+        self.video_subfolder_table = VideoSubfolderTable(self, None)
+        self.video_subfolder_vbox.pack_start(self.video_subfolder_table)
+        self.video_subfolder_table.show_all()
+
+    def _setupPhotoDownloadFolderTab(self):
         self.download_folder_filechooser_button = gtk.FileChooserButton(
                             _("Select a folder to download photos to"))
         self.download_folder_filechooser_button.set_current_folder(
@@ -789,16 +891,41 @@ class PreferencesDialog(gnomeglade.Component):
         self.download_folder_filechooser_button.show()        
 
         self._setupSubfolderTable()
-        self.updateDownloadFolderExample()
+        self.updatePhotoDownloadFolderExample()
+        
+    def _setupVideoDownloadFolderTab(self):
+        self.video_download_folder_filechooser_button = gtk.FileChooserButton(
+                            _("Select a folder to download videos to"))
+        self.video_download_folder_filechooser_button.set_current_folder(
+                            self.prefs.video_download_folder)
+        self.video_download_folder_filechooser_button.set_action(
+                            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
+        self.video_download_folder_filechooser_button.connect("selection-changed", 
+                    self.on_video_download_folder_filechooser_button_selection_changed)
+                            
+        self.video_download_folder_table.attach(
+                            self.video_download_folder_filechooser_button, 
+                            2, 3, 2, 3, yoptions = gtk.SHRINK)
+        self.video_download_folder_filechooser_button.show()        
+        self._setupVideoSubfolderTable()
+        self.updateVideoDownloadFolderExample()        
     
     def _setupImageRenameTab(self):
 
-        self.rename_table = ImageRenameTable(self,  self.rename_scrolledwindow)
+        self.rename_table = ImageRenameTable(self, self.rename_scrolledwindow)
         self.rename_table_vbox.pack_start(self.rename_table)
         self.rename_table.show_all()
         self.original_name_label.set_markup("<i>%s</i>" % self.sampleImageName)
         self.updateImageRenameExample()
         
+    def _setupVideoRenameTab(self):
+
+        self.video_rename_table = VideoRenameTable(self, self.video_rename_scrolledwindow)
+        self.video_rename_table_vbox.pack_start(self.video_rename_table)
+        self.video_rename_table.show_all()
+        self.video_original_name_label.set_markup("<i>%s</i>" % self.sampleVideoName)
+        self.updateVideoRenameExample()
+                
     def _setupRenameOptionsTab(self):
         
         # sequence numbers
@@ -848,8 +975,9 @@ class PreferencesDialog(gnomeglade.Component):
                                                 gtk.STOCK_CLEAR,
                                                 gtk.ICON_SIZE_BUTTON))  
     def _setupDeviceTab(self):
+
         self.device_location_filechooser_button = gtk.FileChooserButton(
-                            _("Select an image folder"))
+                            _("Select a folder containing %(file_types)s") % {'file_types':self.file_types})
         self.device_location_filechooser_button.set_current_folder(
                             self.prefs.device_location)
         self.device_location_filechooser_button.set_action(
@@ -871,7 +999,7 @@ class PreferencesDialog(gnomeglade.Component):
 
     def _setupBackupTab(self):
         self.backup_folder_filechooser_button = gtk.FileChooserButton(
-                            _("Select a folder in which to backup images"))
+                            _("Select a folder in which to backup %(file_types)s") % {'file_types':self.file_types})
         self.backup_folder_filechooser_button.set_current_folder(
                             self.prefs.backup_location)
         self.backup_folder_filechooser_button.set_action(
@@ -879,9 +1007,10 @@ class PreferencesDialog(gnomeglade.Component):
         self.backup_folder_filechooser_button.connect("selection-changed", 
                     self.on_backup_folder_filechooser_button_selection_changed)
         self.backup_table.attach(self.backup_folder_filechooser_button,
-                            3, 4, 7, 8, yoptions = gtk.SHRINK)
+                            3, 4, 8, 9, yoptions = gtk.SHRINK)
         self.backup_folder_filechooser_button.show()
         self.backup_identifier_entry.set_text(self.prefs.backup_identifier)
+        self.video_backup_identifier_entry.set_text(self.prefs.video_backup_identifier)
         
         #setup controls for manipulating sensitivity
         self._backupControls0 = [self.auto_detect_backup_checkbutton,
@@ -899,6 +1028,9 @@ class PreferencesDialog(gnomeglade.Component):
                                 self.backup_location_explanation_label]
         self._backupControls = self._backupControls0 + self._backupControls1 + \
                                 self._backupControls2
+                                
+        self._backupVideoControls = [self.video_backup_identifier_label,
+                                self.video_backup_identifier_entry]
         
         #assign values to checkbuttons only when other controls
         #have been setup, because their toggle signal is activated
@@ -944,15 +1076,12 @@ class PreferencesDialog(gnomeglade.Component):
         else:
             self.backup_duplicate_skip_radiobutton.set_active(True)
 
-    def updateImageRenameExample(self):
-        """ 
-        Displays example image name to the user 
-        """
-        
-        if hasattr(self, 'rename_table'):
-            self.rename_table.updateExampleJobCode()
-            name, problem = self.rename_table.prefsFactory.generateNameUsingPreferences(
-                    self.sampleImage, self.sampleImageName, 
+    
+    def updateExampleFileName(self, display_table, rename_table, sample, sampleName, example_label):
+        if hasattr(self, display_table):
+            rename_table.updateExampleJobCode()
+            name, problem = rename_table.prefsFactory.generateNameUsingPreferences(
+                    sample, sampleName,
                     self.prefs.strip_characters,  sequencesPreliminary=False)
         else:
             name = problem = ''
@@ -963,33 +1092,54 @@ class PreferencesDialog(gnomeglade.Component):
         if problem:
             text += "\n"
             # 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
-            text += _("<i><b>Warning:</b> There is insufficient image metadata to fully generate the name. Please use other renaming options.</i>")
+            text += _("<i><b>Warning:</b> There is insufficient metadata to fully generate the name. Please use other renaming options.</i>")
 
-        self.new_name_label.set_markup(text)
+        example_label.set_markup(text)        
+    
+    def updateImageRenameExample(self):
+        """ 
+        Displays example image name to the user 
+        """
+        self.updateExampleFileName('rename_table', self.rename_table, self.sampleImage,  self.sampleImageName, self.new_name_label)
+
+        
+    def updateVideoRenameExample(self):
+        """
+        Displays example video name to the user
+        """
+        self.updateExampleFileName('video_rename_table', self.video_rename_table, self.sampleVideo,  self.sampleVideoName, self.video_new_name_label)
             
-    def updateDownloadFolderExample(self):
+    def updateDownloadFolderExample(self, display_table, subfolder_table, download_folder, sample, sampleName, example_download_path_label, subfolder_warning_label):
         """ 
         Displays example subfolder name(s) to the user 
         """
         
-        if hasattr(self,  'subfolder_table'):
-            self.subfolder_table.updateExampleJobCode()
-            path, problem = self.subfolder_table.prefsFactory.generateNameUsingPreferences(
-                            self.sampleImage, self.sampleImageName,
+        if hasattr(self, display_table):
+            subfolder_table.updateExampleJobCode()
+            path, problem = subfolder_table.prefsFactory.generateNameUsingPreferences(
+                            sample, sampleName,
                             self.prefs.strip_characters)
         else:
             path = problem = ''
         
-        text = os.path.join(self.prefs.download_folder, path)
+        text = os.path.join(download_folder, path)
         # since this is markup, escape it
         path = common.escape(text)
         if problem:
-            warning = _("<i><b>Warning:</b> There is insufficient image metadata to fully generate subfolders. Please use other subfolder naming options.</i>" )
+            warning = _("<i><b>Warning:</b> There is insufficient metadata to fully generate subfolders. Please use other subfolder naming options.</i>" )
         else:
             warning = ""
         # Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-        self.example_download_path_label.set_markup(_("<i>Example: %s</i>") % text)
-        self.subfolder_warning_label.set_markup(warning)
+        example_download_path_label.set_markup(_("<i>Example: %s</i>") % text)
+        subfolder_warning_label.set_markup(warning)
+        
+    def updatePhotoDownloadFolderExample(self):
+        if hasattr(self, 'subfolder_table'):
+            self.updateDownloadFolderExample('subfolder_table', self.subfolder_table, self.prefs.download_folder, self.sampleImage, self.sampleImageName, self.example_photo_download_path_label, self.photo_subfolder_warning_label)
+        
+    def updateVideoDownloadFolderExample(self):
+        if hasattr(self, 'video_subfolder_table'):
+            self.updateDownloadFolderExample('video_subfolder_table', self.video_subfolder_table, self.prefs.video_download_folder, self.sampleVideo, self.sampleVideoName, self.example_video_download_path_label, self.video_subfolder_warning_label)
         
     def on_hour_spinbutton_value_changed(self, spinbutton):
         hour = spinbutton.get_value_as_int()
@@ -1037,25 +1187,42 @@ class PreferencesDialog(gnomeglade.Component):
             sequences.setStoredSequenceNo(v)
             self.updateImageRenameExample()
 
+    def _updateSubfolderPrefOnError(self, newPrefList):
+        self.prefs.subfolder = newPrefList
+
+    def _updateVideoSubfolderPrefOnError(self, newPrefList):
+        self.prefs.video_subfolder = newPrefList
+        
+    
+    def checkSubfolderValuesValidOnExit(self, usersPrefList, updatePrefFunction, filetype, defaultPrefList):
+        """
+        Checks that the user has not entered in any inappropriate values
+        
+        If they have, filters out bad values and warns the user 
+        """
+        filtered,  prefList = rn.filterSubfolderPreferences(usersPrefList)
+        if filtered:
+            cmd_line(_("The %(filetype)s subfolder preferences had some unnecessary values removed.") % {'filetype': filetype})
+            if prefList:
+                updatePrefFunction(prefList)
+            else:
+                #Preferences list is now empty
+                msg = _("The %(filetype)s subfolder preferences entered are invalid and cannot be used.\nThey will be reset to their default values.") % {'filetype': filetype}
+                sys.stderr.write(msg + "\n")
+                misc.run_dialog(PROGRAM_NAME, msg)
+                updatePrefFunction(self.prefs.get_default(defaultPrefList))
+    
     def on_response(self, dialog, arg):
         if arg == gtk.RESPONSE_HELP:
             webbrowser.open("http://www.damonlynch.net/rapid/documentation")
         else:
             # arg==gtk.RESPONSE_CLOSE, or the user hit the 'x' to close the window
             self.prefs.backup_identifier = self.backup_identifier_entry.get_property("text")
+            self.prefs.video_backup_identifier = self.video_backup_identifier_entry.get_property("text")
             
             #check subfolder preferences for bad values
-            filtered,  prefList = rn.filterSubfolderPreferences(self.prefs.subfolder)
-            if filtered:
-                cmd_line(_("The subfolder preferences had some unnecessary values removed."))
-                if prefList:
-                    self.prefs.subfolder = prefList
-                else:
-                    #Preferences list is now empty
-                    msg = _("The subfolder preferences entered are invalid and cannot be used.\nThey will be reset to their default values.")
-                    sys.stderr.write(msg + "\n")
-                    misc.run_dialog(PROGRAM_NAME, msg)
-                    self.prefs.subfolder = self.prefs.get_default("subfolder")
+            self.checkSubfolderValuesValidOnExit(self.prefs.subfolder, self._updateSubfolderPrefOnError, _("photo"), "subfolder")
+            self.checkSubfolderValuesValidOnExit(self.prefs.video_subfolder, self._updateVideoSubfolderPrefOnError, _("video"), "video_subfolder")
                     
             self.widget.destroy()
             self.parentApp.preferencesDialogDisplayed = False
@@ -1186,7 +1353,8 @@ class PreferencesDialog(gnomeglade.Component):
     def on_strip_characters_checkbutton_toggled(self, check_button):
         self.prefs.strip_characters = check_button.get_active()
         self.updateImageRenameExample()
-        self.updateDownloadFolderExample()
+        self.updatePhotoDownloadFolderExample()
+        self.updateVideoDownloadFolderExample()
         
     def on_indicate_download_error_checkbutton_toggled(self, check_button):
         self.prefs.indicate_download_error = check_button.get_active()
@@ -1223,13 +1391,12 @@ class PreferencesDialog(gnomeglade.Component):
         """
         
         if not self.backup_checkbutton.get_active():
-            for c in self._backupControls:
+            for c in self._backupControls + self._backupVideoControls:
                 c.set_sensitive(False)
 
         else:
             for c in self._backupControls0:
                 c.set_sensitive(True)
-                
             self.updateBackupControlsAuto()
 
     def updateBackupControlsAuto(self):
@@ -1242,12 +1409,43 @@ class PreferencesDialog(gnomeglade.Component):
                 c.set_sensitive(True)
             for c in self._backupControls2:
                 c.set_sensitive(False)
+            for c in self._backupVideoControls:
+                c.set_sensitive(False)
+            if DOWNLOAD_VIDEO:
+                for c in self._backupVideoControls:
+                    c.set_sensitive(True)
         else:
             for c in self._backupControls1:
                 c.set_sensitive(False)
             for c in self._backupControls2:
                 c.set_sensitive(True)
+            if DOWNLOAD_VIDEO:
+                for c in self._backupVideoControls:
+                    c.set_sensitive(False)                
+            
+    def disableVideoControls(self):
+        """
+        Disables video preferences if video downloading is disabled
+        (probably because the appropriate libraries to enable
+        video metadata extraction are not installed)
+        """        
+        controls = [self.example_video_filename_label, 
+                    self.original_video_filename_label,
+                    self.new_video_filename_label,
+                    self.video_new_name_label,
+                    self.video_original_name_label,
+                    self.video_rename_scrolledwindow,
+                    self.video_folders_hbox,
+                    self.video_backup_identifier_label,
+                    self.video_backup_identifier_entry
+                    ]
+        for c in controls:
+            c.set_sensitive(False)
             
+        self.videos_cannot_be_downloaded_label.show()
+        self.folder_videos_cannot_be_downloaded_label.show()
+        self.folder_videos_cannot_be_downloaded_hbox.show()
+    
     def on_auto_detect_backup_checkbutton_toggled(self, widget):
         self.prefs.backup_device_autodetection = widget.get_active()
         self.updateBackupControlsAuto()
@@ -1258,25 +1456,53 @@ class PreferencesDialog(gnomeglade.Component):
 
     def on_backup_identifier_entry_changed(self, widget):
         self.updateBackupExample()
+    
+    def on_video_backup_identifier_entry_changed(self, widget):
+        self.updateBackupExample()
 
     def on_backup_scan_folder_on_entry_changed(self, widget):
         self.updateBackupExample()        
 
     def updateBackupExample(self):
         # Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-        path = os.path.join(config.MEDIA_LOCATION, _("externaldrive1"))
+        drive1 = os.path.join(config.MEDIA_LOCATION, _("externaldrive1"))
         # Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-        path2 = os.path.join(config.MEDIA_LOCATION, _("externaldrive2"))
+        drive2 = os.path.join(config.MEDIA_LOCATION, _("externaldrive2"))
 
-        path = os.path.join(path, self.backup_identifier_entry.get_text())
-        path2 = os.path.join(path2, self.backup_identifier_entry.get_text())
+        path = os.path.join(drive1, self.backup_identifier_entry.get_text())
+        path2 = os.path.join(drive2, self.backup_identifier_entry.get_text())
+        path3 = os.path.join(drive2, self.video_backup_identifier_entry.get_text())
         path = common.escape(path)
         path2 = common.escape(path2)
-        self.example_backup_path_label.set_markup("<i>%s</i>\n<i>%s</i>" % (path,
-                            path2))
+        path3 = common.escape(path3)
+        if DOWNLOAD_VIDEO:
+            example = "<i>%s</i>\n<i>%s</i>\n<i>%s</i>" % (path, path2, path3)
+        else:
+            example = "<i>%s</i>\n<i>%s</i>" % (path, path2)
+        self.example_backup_path_label.set_markup(example)
 
         
-
+def file_types_by_number(noImages, noVideos):
+    """ 
+    returns a string to be displayed to the user that can be used
+    to show if a value refers to photos or videos or both, or just one
+    of each
+    """
+    if (noVideos > 0) and (noImages > 0):
+        v = _('photos and videos')
+    elif (noVideos == 0) and (noImages == 0):
+        v = _('photos or videos')
+    elif noVideos > 0:
+        if noVideos > 1:
+            v = _('videos')
+        else:
+            v = _('video')
+    else:
+        if noImages > 1:
+            v = _('photos')
+        else:
+            v = _('photo')
+    return v
 
 class CopyPhotos(Thread):
     """Copies photos from source to destination, backing up if needed"""
@@ -1324,8 +1550,8 @@ class CopyPhotos(Thread):
             media_collection_treeview.addCard(thread_id, self.cardMedia.prettyName(), 
                                                                 '',  0,  progress=0.0,  
                                                                 # This refers to when a device like a hard drive is having its contents scanned,
-                                                                # looking for images. It is visible initially in the progress bar for each device 
-                                                                # (which normally holds "x of y images copied").
+                                                                # looking for photos or videos. It is visible initially in the progress bar for each device 
+                                                                # (which normally holds "x of y photos").
                                                                 # It maybe displayed only briefly if the contents of the device being scanned is small.
                                                                 progressBarText=_('scanning...'))
 
@@ -1347,29 +1573,37 @@ class CopyPhotos(Thread):
         """
         Setup thread so that user preferences are handled
         """
+        
+        def checkPrefs(prefsFactory):
+            try:
+                prefsFactory.checkPrefsForValidity()
+            except (rn.PrefValueInvalidError, rn.PrefLengthError, 
+                    rn.PrefValueKeyComboError, rn.PrefKeyError), e:
+                if notifyOnError:
+                    self.handlePreferencesError(e, prefsFactory)
+                raise rn.PrefError
+                
         self.prefs = self.parentApp.prefs
+        
+        
+        #Image and Video filename preferences
 
         self.imageRenamePrefsFactory = rn.ImageRenamePreferences(self.prefs.image_rename, self, 
                                                                  self.fileSequenceLock, sequences)
-        try:
-            self.imageRenamePrefsFactory.checkPrefsForValidity()
-        except (rn.PrefValueInvalidError, rn.PrefLengthError, 
-                rn.PrefValueKeyComboError,  rn.PrefKeyError), e:
-            if notifyOnError:
-                self.handlePreferencesError(e, self.imageRenamePrefsFactory)
-            raise rn.PrefError
-            
+        checkPrefs(self.imageRenamePrefsFactory)
+           
+        self.videoRenamePrefsFactory = rn.VideoRenamePreferences(self.prefs.video_rename, self, 
+                                                                 self.fileSequenceLock, sequences)
+        checkPrefs(self.videoRenamePrefsFactory)
+        
+        #Image and Video subfolder preferences
 
-        self.subfolderPrefsFactory = rn.SubfolderPreferences(
-                                                self.prefs.subfolder, self)
-        try:            
-            self.subfolderPrefsFactory.checkPrefsForValidity()
-        except (rn.PrefValueInvalidError, rn.PrefLengthError, 
-                rn.PrefValueKeyComboError,  rn.PrefKeyError), e:
-            if notifyOnError:
-                self.handlePreferencesError(e, self.subfolderPrefsFactory)
-            raise rn.PrefError
-                                                
+        self.subfolderPrefsFactory = rn.SubfolderPreferences(self.prefs.subfolder, self)
+        checkPrefs(self.subfolderPrefsFactory)
+
+        self.videoSubfolderPrefsFactory = rn.VideoSubfolderPreferences(self.prefs.video_subfolder, self)
+        checkPrefs(self.videoSubfolderPrefsFactory)
+        
         # copy this variable, as it is used heavily in the loop
         # and it is perhaps relatively expensive to read
         self.stripCharacters = self.prefs.strip_characters
@@ -1409,6 +1643,32 @@ class CopyPhotos(Thread):
             3.b  if so, user preferences determine whether it should be overwritten or not
         """
 
+        def checkDownloadPath(path):
+            """
+            Checks to see if download folder exists.
+            
+            Creates it if it does not exist.
+            
+            Returns False if the path could not be created.
+            """
+            
+            try:
+                if not os.path.isdir(path):
+                    os.makedirs(path)
+                return True
+                    
+            except:
+                if notifyOnError:
+                    display_queue.put((media_collection_treeview.removeCard,  (self.thread_id, )))
+                    msg = _("The following download path could not be created:\n")
+                    msg += _("%(path)s: ") % {'path': path}
+                    logError(config.CRITICAL_ERROR, _("Download cannot proceed"), msg)
+                    cmd_line(_("Download cannot proceed"))
+                    cmd_line(msg)
+                    display_queue.put((self.parentApp.downloadFailed,  (self.thread_id, )))
+                    display_queue.close("rw")                     
+                return False                
+                
         def getPrefs(notifyOnError):
             try:
                 self.initializeFromPrefs(notifyOnError)
@@ -1424,12 +1684,23 @@ class CopyPhotos(Thread):
                     display_queue.put((self.parentApp.downloadFailed,  (self.thread_id, )))
                     display_queue.close("rw")                     
                 return False
+        
         def scanMedia():
             
-            images = []
-            imageSizeSum = 0
-            for root, dirs, files in os.walk(self.cardMedia.getPath()):
-                for name in files:
+            def downloadFile(name):
+                isImage = media.isImage(name)
+                isVideo = media.isVideo(name)
+                download = (DOWNLOAD_VIDEO and (isImage or isVideo) or 
+                        ((not DOWNLOAD_VIDEO) and isImage))
+                return (download, isImage, isVideo)
+            
+            def gio_scan(path, fileSizeSum):
+                """recursive function to scan a directory and its subdirectories
+                for photos and possibly videos"""
+                
+                children = path.enumerate_children('standard::name,standard::type,standard::size,time::modified')
+
+                for child in children:
                     if not self.running:
                         self.lock.acquire()
                         self.running = True
@@ -1438,44 +1709,105 @@ class CopyPhotos(Thread):
                         self.running = False
                         display_queue.put((media_collection_treeview.removeCard,  (self.thread_id, )))
                         display_queue.close("rw")
-                        return
-                    
-                    if media.isImage(name):
-                        image = os.path.join(root, name)
-                        size = os.path.getsize(image)
-                        modificationTime = os.path.getmtime(image)
-                        images.append((name, root, size,  modificationTime),)
-                        imageSizeSum += size
-            images.sort(key=operator.itemgetter(3))
-            noImages = len(images)
+                        return None
+                        
+                    if child.get_file_type() == gio.FILE_TYPE_DIRECTORY:
+                        fileSizeSum = gio_scan(path.get_child(child.get_name()), fileSizeSum)
+                        if fileSizeSum == None:
+                            # this value will be None only if the thread is exiting
+                            return None
+                    elif child.get_file_type() == gio.FILE_TYPE_REGULAR:
+                        name = child.get_name()
+                        download, isImage, isVideo = downloadFile(name)
+                        if download:
+                            size = child.get_size()
+                            imagesAndVideos.append((name, path.get_path(), size, child.get_modification_time()),)
+                            fileSizeSum += size
+                            if isVideo:
+                                self.noVideos += 1
+                            else:
+                                self.noImages += 1
+                return fileSizeSum
+            
+                        
+            imagesAndVideos = []
+            fileSizeSum = 0
+            self.noVideos = 0
+            self.noImages = 0
+            
+            if not using_gio or not self.cardMedia.volume:
+                for root, dirs, files in os.walk(self.cardMedia.getPath()):
+                    for name in files:
+                        if not self.running:
+                            self.lock.acquire()
+                            self.running = True
+                        
+                        if not self.ctrl:
+                            self.running = False
+                            display_queue.put((media_collection_treeview.removeCard,  (self.thread_id, )))
+                            display_queue.close("rw")
+                            return
+                        
+
+                        download, isImage, isVideo = downloadFile(name)
+                        if download:
+                            image = os.path.join(root, name)
+                            size = os.path.getsize(image)
+                            modificationTime = os.path.getmtime(image)
+                            imagesAndVideos.append((name, root, size, modificationTime),)
+                            fileSizeSum += size
+                            if isVideo:
+                                self.noVideos += 1
+                            else:
+                                self.noImages += 1
+                            
+            else:
+                # using gio and have a volume
+                # make call to recursive function to scan volume
+                fileSizeSum = gio_scan(self.cardMedia.volume.volume.get_root(), fileSizeSum)
+                if fileSizeSum == None:
+                    # thread exiting
+                    return
+                
+            imagesAndVideos.sort(key=operator.itemgetter(3))
+            noFiles = len(imagesAndVideos)
             
             self.scanComplete = True
             
-            if noImages:
-                self.cardMedia.setMedia(images,  imageSizeSum,  noImages)
+            self.display_file_types = file_types_by_number(self.noImages, self.noVideos)
+                    
+            if DOWNLOAD_VIDEO:
+                self.types_searched_for = _('photos or videos')
+            else:
+                self.types_searched_for = _('photos')
+
+            
+            if noFiles:
+                self.cardMedia.setMedia(imagesAndVideos, fileSizeSum, noFiles)
                 # Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-                # It refers to the actual number of images that can be copied. For example, the user might see the following:
-                # '0 of 512 images copied'.
+                # It refers to the actual number of photos that can be copied. For example, the user might see the following:
+                # '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
                 # This particular text is displayed to the user before the download has started.
-                display = _("0 of %s images copied") % noImages
-                display_queue.put((media_collection_treeview.updateCard,  (self.thread_id,  self.cardMedia.sizeOfImages(), noImages)))
+                display = _("0 of %(number)s %(filetypes)s") % {'number':noFiles, 'filetypes':self.display_file_types}
+                display_queue.put((media_collection_treeview.updateCard, (self.thread_id,  self.cardMedia.sizeOfImagesAndVideos(), noFiles)))
                 display_queue.put((media_collection_treeview.updateProgress, (self.thread_id, 0.0, display, 0)))
-                display_queue.put((self.parentApp.timeRemaining.add,  (self.thread_id,  imageSizeSum)))
+                display_queue.put((self.parentApp.timeRemaining.add, (self.thread_id, fileSizeSum)))
                 display_queue.put((self.parentApp.setDownloadButtonSensitivity, ()))
                 
                 # Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
                 # This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-                # to the user when they run the program, signifying the number of images found, and the device they were found on.
+                # to the user when they run the program, signifying the number of photos found, and the device they were found on.
                 # %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
                 # not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around 
                 # in a sentence, but you should never modify them or leave them out.
-                cmd_line(_("Device scan complete: found %(number)s images on %(device)s") % 
-                           {'number': noImages,  'device': self.cardMedia.prettyName(limit=0)})
+                cmd_line(_("Device scan complete: found %(number)s %(filetypes)s on %(device)s") % 
+                           {'number': noFiles, 'filetypes':self.display_file_types,
+                            'device': self.cardMedia.prettyName(limit=0)})
                 return True
             else:
                 # it might be better to display "0 of 0" here
                 display_queue.put((media_collection_treeview.removeCard,  (self.thread_id, )))
-                cmd_line(_("Device scan complete: no images found on %s") % self.cardMedia.prettyName(limit=0))
+                cmd_line(_("Device scan complete: no %(filetypes)s found on %(device)s") % {'device':self.cardMedia.prettyName(limit=0), 'filetypes':self.types_searched_for})
                 return False
 
         def cleanUp():
@@ -1484,13 +1816,16 @@ class CopyPhotos(Thread):
             early or when it has completed its run.
             """
 
-            # possibly delete any lingering files
-            tf = os.listdir(tempWorkingDir)
-            if tf:
-                for f in tf:
-                    os.remove(os.path.join(tempWorkingDir,  f))
-                
-            os.rmdir(tempWorkingDir)
+
+            for tempWorkingDir in (videoTempWorkingDir, photoTempWorkingDir):
+                if tempWorkingDir:
+                    # possibly delete any lingering files
+                    tf = os.listdir(tempWorkingDir)
+                    if tf:
+                        for f in tf:
+                            os.remove(os.path.join(tempWorkingDir, f))
+                        
+                    os.rmdir(tempWorkingDir)
             
             
         def logError(severity, problem, details, resolution=None):
@@ -1502,136 +1837,186 @@ class CopyPhotos(Thread):
                 self.noErrors += 1
 
 
-        def checkProblemWithImageNameGeneration(newName,  destination, image,  problem):
+        def checkProblemWithNameGeneration(newName, destination, source,  problem, filetype):
             if not newName:
                 # a serious problem - a filename should never be blank!
                 logError(config.SERIOUS_ERROR,
-                    _("Image filename could not be generated"),
+                    _("%(filetype)s filename could not be generated") % {'filetype': filetype},
                     # '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-                    _("Source: %(source)s\nProblem: %(problem)s") % {'source': image, 'problem': problem},
-                    IMAGE_SKIPPED)
+                    _("Source: %(source)s\nProblem: %(problem)s") % {'source': source, 'problem': problem},
+                    fileSkippedDisplay)
             elif problem:
                 logError(config.WARNING, 
-                    _("Image filename could not be properly generated. Check to ensure there is sufficient image metadata."),
+                    _("%(filetype)s filename could not be properly generated. Check to ensure there is sufficient metadata.") % {'filetype': filetype},
                     _("Source: %(source)s\nPartially generated filename: %(newname)s\nDestination: %(destination)s\nProblem: %(problem)s") % 
-                    {'source': image, 'destination': destination, 'newname': newName, 'problem': problem})
+                    {'source': source, 'destination': destination, 'newname': newName, 'problem': problem})
                     
-
-        def imageAlreadyExists(source, destination=None, identifier=None):
-            """ Notify the user that the image could not be downloaded because it already exists"""
+        def fileAlreadyExists(source, fileSkippedDisplay, fileAlreadyExistsDisplay, destination=None, identifier=None):
+            """ Notify the user that the photo or video could not be downloaded because it already exists"""
             if self.prefs.indicate_download_error:
                 if source and destination and identifier:
-                    logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
+                    logError(config.SERIOUS_ERROR, fileAlreadyExistsDisplay,
                         _("Source: %(source)s\nDestination: %(destination)s")
-                        % {'source': image, 'destination': newFile},
+                        % {'source': source, 'destination': newFile},
                         _("Unique identifier '%s' added") % identifier)                    
                 elif source and destination:
-                    logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
+                    logError(config.SERIOUS_ERROR, fileAlreadyExistsDisplay,
                         _("Source: %(source)s\nDestination: %(destination)s")
                         % {'source': source, 'destination': destination},
-                        IMAGE_SKIPPED)
+                        fileSkippedDisplay)
                 else:
-                    logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
+                    logError(config.SERIOUS_ERROR, fileAlreadyExistsDisplay,
                         _("Source: %(source)s")
                         % {'source': source},
-                        IMAGE_SKIPPED)
+                        fileSkippedDisplay)
 
                     
-        def downloadCopyingError(source, destination, errno, strerror):
-            """Notify the user that an error occurred when coyping an image"""
-            logError(config.SERIOUS_ERROR, _('Download copying error'), 
-                        _("Source: %(source)s\nDestination: %(destination)s\nError: %(errorno)s %(strerror)s") 
-                        % {'source': source, 'destination': destination, 'errorno': errno, 'strerror': strerror},
-                        _('The image was not copied.'))
+        def downloadCopyingError(source, destination, filetype, errno=None, strerror=None):
+            """Notify the user that an error occurred when coyping an photo or video"""
+            if errno != None and strerror != None:
+                logError(config.SERIOUS_ERROR, _('Download copying error'), 
+                            _("Source: %(source)s\nDestination: %(destination)s\nError: %(errorno)s %(strerror)s") 
+                            % {'source': source, 'destination': destination, 'errorno': errno, 'strerror': strerror},
+                            _('The %(filetype)s was not copied.') % {'filetype': filetype})
+            else:
+                logError(config.SERIOUS_ERROR, _('Download copying error'), 
+                            _("Source: %(source)s\nDestination: %(destination)s") 
+                            % {'source': source, 'destination': destination},
+                            _('The %(filetype)s was not copied.') % {'filetype': filetype})
+                
                         
         def sameFileNameDifferentExif(image1, image1_date_time, image1_subseconds, image2, image2_date_time, image2_subseconds):
-            logError(config.WARNING, _('Images detected with the same filenames, but taken at different times:'),
-                _("First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\nSecond image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s") % 
+            logError(config.WARNING, _('Photos detected with the same filenames, but taken at different times:'),
+                _("First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\nSecond photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s") % 
                 {'image1': image1, 'image1_date_time': image1_date_time, 'image1_subseconds': image1_subseconds,
                 'image2': image2, 'image2_date_time': image2_date_time, 'image2_subseconds': image2_subseconds})
 
 
 
-        def generateSubfolderAndFileName(image,  name,  needMetaDataToCreateUniqueImageName,  
-                       needMetaDataToCreateUniqueSubfolderName):
-            skipImage = alreadyDownloaded = False
+        def generateSubfolderAndFileName(fullFileName, name, needMetaDataToCreateUniqueImageName,  
+                       needMetaDataToCreateUniqueSubfolderName, fallback_date):
+            """
+            Generates subfolder and file names for photos and videos
+            """
+            
+            skipFile = alreadyDownloaded = False
             sequence_to_use = None
-            try:
-                imageMetadata = metadata.MetaData(image)
-            except IOError:
-                logError(config.CRITICAL_ERROR, _("Could not open image"), 
-                                _("Source: %s") % image, 
-                                IMAGE_SKIPPED)
-                skipImage = True
-                imageMetadata =  newName = newFile = path = subfolder = None
-            else:
+
+            if not self.isImage:
+                # file is a video file
+                fileRenameFactory = self.videoRenamePrefsFactory
+                subfolderFactory = self.videoSubfolderPrefsFactory
                 try:
-                    # this step can fail if the source image is corrupt
-                    imageMetadata.readMetadata()
+                    # this step immedidately reads the metadata from the video file
+                    # (which is different than pyexiv2)
+                    fileMetadata = videometadata.VideoMetaData(fullFileName)
                 except:
-                    skipImage = True
-
-                if not skipImage:
-                    if not imageMetadata.exifKeys() and (needMetaDataToCreateUniqueSubfolderName or 
-                                                         (needMetaDataToCreateUniqueImageName and 
-                                                         not addUniqueIdentifier)):
-                        skipImage = True
-                        
-                if skipImage:
-                    logError(config.SERIOUS_ERROR, _("Image has no metadata"), 
-                                        _("Metadata is essential for generating subfolders / image names.\nSource: %s") % image, 
-                                        IMAGE_SKIPPED)
-                    newName = newFile = path = subfolder = None
+                    logError(config.CRITICAL_ERROR, _("Could not open %(filetype)s") % {'filetype': fileBeingDownloadedDisplay}, 
+                                    _("Source: %s") % fullFileName, 
+                                    fileSkippedDisplay)                    
+                    skipFile = True
+                    fileMetadata =  newName = newFile = path = subfolder = sequence_to_use = None
+                    return (skipFile,  fileMetadata,  newName,  newFile,  path,  subfolder, sequence_to_use)
+            else:
+                # file is an photo
+                fileRenameFactory = self.imageRenamePrefsFactory                
+                subfolderFactory = self.subfolderPrefsFactory
+                try:
+                    fileMetadata = metadata.MetaData(fullFileName)
+                except IOError:
+                    logError(config.CRITICAL_ERROR, _("Could not open %(filetype)s") % {'filetype': fileBeingDownloadedDisplay}, 
+                                    _("Source: %s") % fullFileName, 
+                                    fileSkippedDisplay)
+                    skipFile = True
+                    fileMetadata =  newName = newFile = path = subfolder = sequence_to_use = None
+                    return (skipFile,  fileMetadata,  newName,  newFile,  path,  subfolder, sequence_to_use)
                 else:
-                    subfolder, problem = self.subfolderPrefsFactory.generateNameUsingPreferences(
-                                                            imageMetadata, name, 
-                                                            self.stripCharacters)
-        
-                    if problem:
-                        logError(config.WARNING, 
-                            _("Subfolder name could not be properly generated. Check to ensure there is sufficient image metadata."),
-                            _("Subfolder: %(subfolder)s\nImage: %(image)s\nProblem: %(problem)s") % 
-                            {'subfolder': subfolder, 'image': image, 'problem': problem})
-                    
-                    if self.prefs.synchronize_raw_jpg and usesSequenceElements:
-                        image_name, image_ext = os.path.splitext(name)
-                        with self.downloadedFilesLock:
-                            i, sequence_to_use = downloaded_files.matching_pair(image_name, image_ext, imageMetadata.dateTime(), imageMetadata.subSeconds())
-                            if i == -1:
-                                # this exact file has already been downloaded (same extension, same filename, and same exif date time subsecond info)
-                                if not addUniqueIdentifier:
-                                    # there is no point to download it, as there is no way a unique filename will be generated
-                                    alreadyDownloaded = skipImage = True
-                            elif i == -99:
-                                i1_ext, i1_date_time, i1_subseconds = downloaded_files.extExifDateTime(image_name)
-                                sameFileNameDifferentExif("%s%s" % (image_name, i1_ext), i1_date_time, i1_subseconds, name, imageMetadata.dateTime(), imageMetadata.subSeconds())
-                           
-                    
-                    # pass the subfolder the image will go into, as this is needed to determine subfolder sequence numbers 
-                    # indicate that sequences chosen should be queued
+                    try:
+                        # this step can fail if the source photo is corrupt
+                        fileMetadata.read()
+                    except:
+                        skipFile = True
+
                     
-                    if not skipImage or alreadyDownloaded:
-                        newName, problem = self.imageRenamePrefsFactory.generateNameUsingPreferences(
-                                                                imageMetadata, name, self.stripCharacters,  subfolder,  
+            if not skipFile:
+                if self.isImage and not fileMetadata.rpd_keys() and (needMetaDataToCreateUniqueSubfolderName or 
+                                                     (needMetaDataToCreateUniqueImageName and 
+                                                     not addUniqueIdentifier)):
+                    skipFile = True
+                
+                #TODO similar checking for video 
+                
+            if skipFile:
+                logError(config.SERIOUS_ERROR, _("%(filetype)s has no metadata") % {'filetype': fileBeingDownloadedDisplayCap}, 
+                                    _("Metadata is essential for generating subfolder and/or file names.\nSource: %s") % fullFileName, 
+                                    fileSkippedDisplay)                
+                newName = newFile = path = subfolder = None
+            else:
+                # attempt to generate a subfolder name
+                subfolder, problem = subfolderFactory.generateNameUsingPreferences(
+                                                        fileMetadata, name, 
+                                                        self.stripCharacters, fallback_date = fallback_date)
+    
+                if problem:
+                    logError(config.WARNING, 
+                        _("Subfolder name could not be properly generated. Check to ensure there is sufficient metadata."),
+                        _("Subfolder: %(subfolder)s\nFile: %(file)s\nProblem: %(problem)s") % 
+                        {'subfolder': subfolder, 'file': fullFileName, 'problem': problem})
+                
+                if self.prefs.synchronize_raw_jpg and usesImageSequenceElements and self.isImage:
+                    #synchronizing RAW and JPEG only applies to photos, not videos
+                    image_name, image_ext = os.path.splitext(name)
+                    with self.downloadedFilesLock:
+                        i, sequence_to_use = downloaded_files.matching_pair(image_name, image_ext, fileMetadata.dateTime(), fileMetadata.subSeconds())
+                        if i == -1:
+                            # this exact file has already been downloaded (same extension, same filename, and same exif date time subsecond info)
+                            if not addUniqueIdentifier:
+                                # there is no point to download it, as there is no way a unique filename will be generated
+                                alreadyDownloaded = skipFile = True
+                        elif i == -99:
+                            i1_ext, i1_date_time, i1_subseconds = downloaded_files.extExifDateTime(image_name)
+                            sameFileNameDifferentExif("%s%s" % (image_name, i1_ext), i1_date_time, i1_subseconds, name, fileMetadata.dateTime(), fileMetadata.subSeconds())
+                       
+                
+                # pass the subfolder the image will go into, as this is needed to determine subfolder sequence numbers 
+                # indicate that sequences chosen should be queued
+                
+                # TODO check 'or alreadyDownloaded' is meant to be here
+                if not (skipFile or alreadyDownloaded):
+                    newName, problem = fileRenameFactory.generateNameUsingPreferences(
+                                                                fileMetadata, name, self.stripCharacters,  subfolder,  
                                                                 sequencesPreliminary = True,
-                                                                sequence_to_use = sequence_to_use)
-                                                                
-                        path = os.path.join(baseDownloadDir, subfolder)
-                        newFile = os.path.join(path, newName)
-                    
-                    if not newName:
-                        skipImage = True
-                    if not alreadyDownloaded:
-                        checkProblemWithImageNameGeneration(newName, path, image,  problem)
-                    else:
-                        imageAlreadyExists(image, newFile)
-                        newName = newFile = path = subfolder = None
+                                                                sequence_to_use = sequence_to_use,
+                                                                fallback_date = fallback_date)
+
+                    path = os.path.join(baseDownloadDir, subfolder)
+                    newFile = os.path.join(path, newName)
+                
+                if not newName:
+                    skipFile = True
+                if not alreadyDownloaded:
+                    checkProblemWithNameGeneration(newName, path, fullFileName,  problem, fileBeingDownloadedDisplayCap)
+                else:
+                    fileAlreadyExists(fullFileName, fileSkippedDisplay, fileAlreadyExistsDisplay, newFile)
+                    newName = newFile = path = subfolder = None
                     
-            return (skipImage,  imageMetadata,  newName,  newFile,  path,  subfolder, sequence_to_use)
+            return (skipFile, fileMetadata, newName, newFile, path, subfolder, sequence_to_use)
         
-        def downloadImage(path,  newFile,  newName,  originalName,  image,  imageMetadata,  subfolder, sequence_to_use):
+        def downloadFile(path, newFile, newName, originalName, image, fileMetadata, subfolder, sequence_to_use, modificationTime):
+            """
+            Downloads the photo or video file to the specified subfolder 
+            """
+            
+            if not self.isImage:
+                renameFactory = self.videoRenamePrefsFactory
+            else:
+                renameFactory = self.imageRenamePrefsFactory
+                
+            def progress_callback(self, v):
+                pass
+                
             try:
-                imageDownloaded = False
+                fileDownloaded = False
                 if not os.path.isdir(path):
                     os.makedirs(path)
                 
@@ -1644,11 +2029,11 @@ class CopyPhotos(Thread):
                     nameUniqueBeforeCopy = False
                     if not addUniqueIdentifier:
                         downloadNonUniqueFile = False
-                        if usesSequenceElements and not self.prefs.synchronize_raw_jpg:
-                            # potentially, a unique image name could still be generated
+                        if (usesVideoSequenceElements and not self.isImage) or (usesImageSequenceElements and self.isImage and not self.prefs.synchronize_raw_jpg):
+                            # potentially, a unique file name could still be generated
                             # investigate this possibility
                             with self.fileSequenceLock:
-                                for possibleName,  problem in self.imageRenamePrefsFactory.generateNameSequencePossibilities(imageMetadata, 
+                                for possibleName, problem in renameFactory.generateNameSequencePossibilities(fileMetadata, 
                                                                                                                originalName, self.stripCharacters,  subfolder):
                                     if possibleName:
                                         # no need to check for any problems here, it's just a temporary name
@@ -1660,176 +2045,235 @@ class CopyPhotos(Thread):
 
                                         
                     if not downloadNonUniqueFile:
-                        imageAlreadyExists(image, newFile)
+                        fileAlreadyExists(fullFileName, fileSkippedDisplay, fileAlreadyExistsDisplay, newFile)
 
+                copy_succeeded = False
                 if nameUniqueBeforeCopy or downloadNonUniqueFile:
                     tempWorkingfile = os.path.join(tempWorkingDir, newName)
-                    shutil.copy2(image, tempWorkingfile)
+                    if using_gio:
+                        g_dest = gio.File(path=tempWorkingfile)
+                        g_src = gio.File(path=fullFileName)
+                        if not g_src.copy(g_dest, progress_callback, cancellable=gio.Cancellable()):
+                            downloadCopyingError(fullFileName, tempWorkingfile, fileBeingDownloadedDisplay)
+                        else:
+                            copy_succeeded = True
+                    else:
+                        shutil.copy2(fullFileName, tempWorkingfile)
+                        copy_succeeded = True
                     
-                    with self.fileRenameLock:
-                        doRename = True
-                        if usesSequenceElements:
-                            with self.fileSequenceLock:
-                                # get a filename and use this as the "real" filename
-                                if sequence_to_use is None and self.prefs.synchronize_raw_jpg:
-                                    # must check again, just in case the matching pair has been downloaded in the meantime
-                                    image_name, image_ext = os.path.splitext(originalName)
-                                    with self.downloadedFilesLock:
-                                        i, sequence_to_use = downloaded_files.matching_pair(image_name, image_ext, imageMetadata.dateTime(), imageMetadata.subSeconds())
-                                        if i == -99:
-                                            i1_ext, i1_date_time, i1_subseconds = downloaded_files.extExifDateTime(image_name)
-                                            sameFileNameDifferentExif("%s%s" % (image_name, i1_ext), i1_date_time, i1_subseconds, originalName, imageMetadata.dateTime(), imageMetadata.subSeconds())
-
-                                            
+                    if copy_succeeded:
+                        with self.fileRenameLock:
+                            doRename = True
+                            if usesSequenceElements:
+                                with self.fileSequenceLock:
+                                    # get a filename and use this as the "real" filename
+                                    if sequence_to_use is None and self.prefs.synchronize_raw_jpg and self.isImage:
+                                        # must check again, just in case the matching pair has been downloaded in the meantime
+                                        image_name, image_ext = os.path.splitext(originalName)
+                                        with self.downloadedFilesLock:
+                                            i, sequence_to_use = downloaded_files.matching_pair(image_name, image_ext, fileMetadata.dateTime(), fileMetadata.subSeconds())
+                                            if i == -99:
+                                                i1_ext, i1_date_time, i1_subseconds = downloaded_files.extExifDateTime(image_name)
+                                                sameFileNameDifferentExif("%s%s" % (image_name, i1_ext), i1_date_time, i1_subseconds, originalName, fileMetadata.dateTime(), fileMetadata.subSeconds())
 
-                                newName, problem = self.imageRenamePrefsFactory.generateNameUsingPreferences(
-                                                                imageMetadata, originalName, self.stripCharacters,  subfolder,  
-                                                                sequencesPreliminary = False,
-                                                                sequence_to_use = sequence_to_use)
-                            checkProblemWithImageNameGeneration(newName, path, image,  problem)
-                            if not newName:
-                                # there was a serious error generating the filename
-                                doRename = False                            
-                            else:
-                                newFile = os.path.join(path, newName)
-                        # check if the file exists again
-                        if os.path.exists(newFile):
-                            if not addUniqueIdentifier:
-                                doRename = False
-                                imageAlreadyExists(image, newFile)
-                            else:
-                                # add  basic suffix to make the filename unique
-                                name = os.path.splitext(newName)
-                                suffixAlreadyUsed = True
-                                while suffixAlreadyUsed:
-                                    if newFile in duplicate_files:
-                                        duplicate_files[newFile] +=  1
-                                    else:
-                                        duplicate_files[newFile] = 1
-                                    identifier = '_%s' % duplicate_files[newFile]
-                                    newName = name[0] + identifier + name[1]
-                                    possibleNewFile = os.path.join(path,  newName)
-                                    suffixAlreadyUsed = os.path.exists(possibleNewFile)
-
-                                imageAlreadyExists(image, newFile, identifier)
-                                newFile = possibleNewFile
-                                
+                                                
 
-                        if doRename:
-                            os.rename(tempWorkingfile, newFile)
+                                    newName, problem = renameFactory.generateNameUsingPreferences(
+                                                                    fileMetadata, originalName, self.stripCharacters,  subfolder,  
+                                                                    sequencesPreliminary = False,
+                                                                    sequence_to_use = sequence_to_use,
+                                                                    fallback_date = fallback_date)
+                                checkProblemWithNameGeneration(newName, path, fullFileName,  problem, fileBeingDownloadedDisplayCap)
+                                if not newName:
+                                    # there was a serious error generating the filename
+                                    doRename = False                            
+                                else:
+                                    newFile = os.path.join(path, newName)
+                            # check if the file exists again
+                            if os.path.exists(newFile):
+                                if not addUniqueIdentifier:
+                                    doRename = False
+                                    fileAlreadyExists(fullFileName, fileSkippedDisplay, fileAlreadyExistsDisplay, newFile)
+                                else:
+                                    # add  basic suffix to make the filename unique
+                                    name = os.path.splitext(newName)
+                                    suffixAlreadyUsed = True
+                                    while suffixAlreadyUsed:
+                                        if newFile in duplicate_files:
+                                            duplicate_files[newFile] +=  1
+                                        else:
+                                            duplicate_files[newFile] = 1
+                                        identifier = '_%s' % duplicate_files[newFile]
+                                        newName = name[0] + identifier + name[1]
+                                        possibleNewFile = os.path.join(path,  newName)
+                                        suffixAlreadyUsed = os.path.exists(possibleNewFile)
+
+                                    fileAlreadyExists(fullFileName, fileSkippedDisplay, fileAlreadyExistsDisplay, newFile, identifier=identifier)
+                                    newFile = possibleNewFile
                                     
-                            imageDownloaded = True
-                            if usesSequenceElements:
-                                if self.prefs.synchronize_raw_jpg:
-                                    name, ext = os.path.splitext(originalName)
-                                    if sequence_to_use is None:
-                                        with self.fileSequenceLock:
-                                            seq = self.imageRenamePrefsFactory.sequences.getFinalSequence()
-                                    else:
-                                        seq = sequence_to_use
-                                    with self.downloadedFilesLock:
-                                        downloaded_files.add_download(name, ext, imageMetadata.dateTime(), imageMetadata.subSeconds(), seq) 
 
-                                
+                            if doRename:
+                                if using_gio:
+                                    g_dest = gio.File(path=newFile)
+                                    g_src = gio.File(path=tempWorkingfile)
+                                    if not g_src.move(g_dest, progress_callback, cancellable=gio.Cancellable()):
+                                        downloadCopyingError(tempWorkingfile, newFile, fileBeingDownloadedDisplay)                                  
+                                else:
+                                    os.rename(tempWorkingfile, newFile)
+                                        
+                                fileDownloaded = True
+                                if usesImageSequenceElements:
+                                    if self.prefs.synchronize_raw_jpg and self.isImage:
+                                        name, ext = os.path.splitext(originalName)
+                                        if sequence_to_use is None:
+                                            with self.fileSequenceLock:
+                                                seq = self.imageRenamePrefsFactory.sequences.getFinalSequence()
+                                        else:
+                                            seq = sequence_to_use
+                                        with self.downloadedFilesLock:
+                                            downloaded_files.add_download(name, ext, fileMetadata.dateTime(), fileMetadata.subSeconds(), seq) 
+
+                                    
+                                    with self.fileSequenceLock:
+                                        if sequence_to_use is None:
+                                            renameFactory.sequences.imageCopySucceeded()
+                                            if usesStoredSequenceNo:
+                                                self.prefs.stored_sequence_no += 1
+                                            
                                 with self.fileSequenceLock:
                                     if sequence_to_use is None:
-                                        self.imageRenamePrefsFactory.sequences.imageCopySucceeded()
-                                        if usesStoredSequenceNo:
-                                            self.prefs.stored_sequence_no += 1
-                                        
-                            with self.fileSequenceLock:
-                                if sequence_to_use is None:
-                                    if self.prefs.incrementDownloadsToday():
-                                        # A new day, according the user's preferences of what time a day begins, has started
-                                        cmd_line(_("New day has started - resetting 'Downloads Today' sequence number"))
-                                        
-                                        sequences.setDownloadsToday(0)
+                                        if self.prefs.incrementDownloadsToday():
+                                            # A new day, according the user's preferences of what time a day begins, has started
+                                            cmd_line(_("New day has started - resetting 'Downloads Today' sequence number"))
+                                            
+                                            sequences.setDownloadsToday(0)
                     
             except IOError, (errno, strerror):
-                downloadCopyingError(image, newFile, errno, strerror)
+                downloadCopyingError(fullFileName, newFile, fileBeingDownloadedDisplay, errno, strerror)
 
             except OSError, (errno, strerror):
-                downloadCopyingError(image, newFile, errno, strerror)                
+                downloadCopyingError(fullFileName, newFile, fileBeingDownloadedDisplay, errno, strerror)                
             
-            if usesSequenceElements:
-                if not imageDownloaded and sequence_to_use is None:
+            if usesImageSequenceElements:
+                if not fileDownloaded and sequence_to_use is None:
                     self.imageRenamePrefsFactory.sequences.imageCopyFailed()
                     
 
-            return (imageDownloaded,  newName,  newFile)
+            return (fileDownloaded,  newName,  newFile)
             
 
-        def backupImage(subfolder,  newName,  imageDownloaded,  newFile,  image):
-            """ backup image to path(s) chosen by the user
+        def backupFile(subfolder, newName, fileDownloaded, newFile, originalFile):
+            """ 
+            Backup photo or video to path(s) chosen by the user
             
             there are two scenarios: 
-            (1) image has just been downloaded and should now be backed up
-            (2) image was already downloaded on some previous occassion and should still be backed up, because it hasn't been yet
-            (3) image has been backed up already (or at least, a file with the same name already exists)
+            (1) file has just been downloaded and should now be backed up
+            (2) file was already downloaded on some previous occassion and should still be backed up, because it hasn't been yet
+            (3) file has been backed up already (or at least, a file with the same name already exists)
+            
+            A backup medium can be used to backup photos or videos, or both. 
             """
             
+            #TODO convert to using GIO
             backed_up = False
+            fileNotBackedUpMessageDisplayed = False
             try:
-                for backupDir in self.parentApp.backupVolumes:
-                    backupPath = os.path.join(backupDir, subfolder)
-                    newBackupFile = os.path.join(backupPath,  newName)
-                    copyBackup = True
-                    if os.path.exists(newBackupFile):
-                        # not thread safe -- it doesn't need to be, because the file names are at this stage going to be unique
-                        copyBackup = self.prefs.backup_duplicate_overwrite                                     
-                        if self.prefs.indicate_download_error:
-                            severity = config.SERIOUS_ERROR
-                            problem = _("Backup image already exists")
-                            details = _("Source: %(source)s\nDestination: %(destination)s") \
-                                % {'source': image, 'destination': newBackupFile}
-                            if copyBackup :
-                                resolution = IMAGE_OVERWRITTEN
-                            else:
-                                resolution = IMAGE_SKIPPED
-                            logError(severity, problem, details, resolution)
-
-                    if copyBackup:
-                        if imageDownloaded:
-                            fileToCopy = newFile
-                        else:
-                            fileToCopy = image
-                        if os.path.isdir(backupPath):
-                            pathExists = True
+                for rootBackupDir in self.parentApp.backupVolumes:
+                    if self.prefs.backup_device_autodetection:
+                        if self.isImage:
+                            backupDir = os.path.join(rootBackupDir, self.prefs.backup_identifier)
                         else:
-                            # recreate folder structure in backup location
-                            # cannot do os.makedirs(backupPath) - it can give bad results when using external drives
-                            # we know backupDir exists 
-                            # all the components of subfolder may not
-                            folders = subfolder.split(os.path.sep)
-                            folderToMake = backupDir 
-                            for f in folders:
-                                if f:
-                                    folderToMake = os.path.join(folderToMake,  f)
-                                    if not os.path.isdir(folderToMake):
-                                        try:
-                                            os.mkdir(folderToMake)
-                                            pathExists = True
-                                        except (IOError, OSError), (errno, strerror):
-                                            logError(config.SERIOUS_ERROR, _('Backing up error'), 
-                                                     _("Destination directory could not be created: %(directory)s\n") %
-                                                     {'directory': folderToMake,  } +
-                                                     _("Source: %(source)s\nDestination: %(destination)s\n") % 
-                                                     {'source': image, 'destination': newBackupFile} + 
-                                                     _("Error: %(errno)s %(strerror)s") % {'errno': errno,  'strerror': strerror}, 
-                                                     _('The image was not copied.')
-                                                     )
-                                            pathExists = False
-                                    
-                        if pathExists:
-                            shutil.copy2(fileToCopy,  newBackupFile)
-                            backed_up = True
+                            backupDir = os.path.join(rootBackupDir, self.prefs.video_backup_identifier)
+                    else:
+                        # photos and videos will be backed up into the same root folder, which the user has manually specified
+                        backupDir = rootBackupDir
+                    # if user has chosen auto detection, then:
+                    # photos should only be backed up to photo backup locations
+                    # videos should only be backed up to video backup locations
+                    # if user did not choose autodetection, and the backup path doesn't exist, then
+                    # will try to create it
+                    if os.path.exists(backupDir) or not self.prefs.backup_device_autodetection:
+
+                        backupPath = os.path.join(backupDir, subfolder)
+                        newBackupFile = os.path.join(backupPath, newName)
+                        copyBackup = True
+                        if os.path.exists(newBackupFile):
+                            # this check is of course not thread safe -- it doesn't need to be, because at this stage the file names are going to be unique
+                            # (the folder structure is the same as the actual download folders, and the file names are unique in them)
+                            copyBackup = self.prefs.backup_duplicate_overwrite                                     
+                            if self.prefs.indicate_download_error:
+                                severity = config.SERIOUS_ERROR
+                                problem = _("Backup of %(file_type)s already exists") % {'file_type': fileBeingDownloadedDisplay}
+                                details = _("Source: %(source)s\nDestination: %(destination)s") \
+                                    % {'source': originalFile, 'destination': newBackupFile}
+                                if copyBackup :
+                                    resolution = _("Backup %(file_type)s overwritten") % {'file_type': fileBeingDownloadedDisplay}
+                                else:
+                                    fileNotBackedUpMessageDisplayed = True
+                                    if self.prefs.backup_device_autodetection:
+                                        volume = self.parentApp.backupVolumes[rootBackupDir].get_name()
+                                        resolution = _("%(file_type)s not backed up to %(volume)s") % {'file_type': fileBeingDownloadedDisplayCap, 'volume': volume}
+                                    else:
+                                        resolution = _("%(file_type)s not backed up") % {'file_type': fileBeingDownloadedDisplayCap}
+                                logError(severity, problem, details, resolution)
+
+                        if copyBackup:
+                            if fileDownloaded:
+                                fileToCopy = newFile
+                            else:
+                                fileToCopy = originalFile
+                            if os.path.isdir(backupPath):
+                                pathExists = True
+                            else:
+                                # recreate folder structure in backup location
+                                # cannot do os.makedirs(backupPath) - it can give bad results when using external drives
+                                # we know backupDir exists 
+                                # all the components of subfolder may not
+                                folders = subfolder.split(os.path.sep)
+                                folderToMake = backupDir 
+                                for f in folders:
+                                    if f:
+                                        folderToMake = os.path.join(folderToMake,  f)
+                                        if not os.path.isdir(folderToMake):
+                                            try:
+                                                os.mkdir(folderToMake)
+                                                pathExists = True
+                                            except (IOError, OSError), (errno, strerror):
+                                                fileNotBackedUpMessageDisplayed = True
+                                                logError(config.SERIOUS_ERROR, _('Backing up error'), 
+                                                         _("Destination directory could not be created: %(directory)s\n") %
+                                                         {'directory': folderToMake,  } +
+                                                         _("Source: %(source)s\nDestination: %(destination)s\n") % 
+                                                         {'source': originalFile, 'destination': newBackupFile} + 
+                                                         _("Error: %(errno)s %(strerror)s") % {'errno': errno,  'strerror': strerror}, 
+                                                         _('The %(file_type)s was not backed up.') % {'file_type': fileBeingDownloadedDisplay}
+                                                         )
+                                                pathExists = False
+                                                break
+                                        
+                            if pathExists:
+                                shutil.copy2(fileToCopy, newBackupFile)
+                                backed_up = True
                         
             except (IOError, OSError), (errno, strerror):
+                fileNotBackedUpMessageDisplayed = True
                 logError(config.SERIOUS_ERROR, _('Backing up error'), 
                             _("Source: %(source)s\nDestination: %(destination)s\nError: %(errno)s %(strerror)s")
-                            % {'source': image, 'destination': newBackupFile,  'errno': errno,  'strerror': strerror},
-                            _('The image was not copied.'))
-
+                            % {'source': originalFile, 'destination': newBackupFile,  'errno': errno,  'strerror': strerror},
+                            _('The %(file_type)s was not backed up.')  % {'file_type': fileBeingDownloadedDisplay}
+                        )
+
+            if not backed_up and not fileNotBackedUpMessageDisplayed:
+                # The file has not been backed up to any medium
+                severity = config.SERIOUS_ERROR
+                problem = _("%(file_type)s could not be backed up") % {'file_type': fileBeingDownloadedDisplayCap}
+                details = _("Source: %(source)s") % {'source': originalFile}
+                if self.prefs.backup_device_autodetection:
+                    resolution = _("No suitable backup volume was found")
+                else:
+                    resolution = _("A backup location was not found")
+                logError(severity, problem, details, resolution)    
+                
             return backed_up
 
         def notifyAndUnmount():
@@ -1845,9 +2289,12 @@ class CopyPhotos(Thread):
                 else:
                     unmountMessage = ""
             
-            message = _("%s images downloaded") % noImagesDownloaded
-            if noImagesSkipped:
-                message += "\n" + _("%s images skipped") % noImagesSkipped
+            file_types = file_types_by_number(noImagesDownloaded, noVideosDownloaded)
+            file_types_skipped = file_types_by_number(noImagesSkipped, noVideosSkipped)
+            message = _("%(noFiles)s %(filetypes)s downloaded") % {'noFiles':noFilesDownloaded, 'filetypes': file_types}
+            noFilesSkipped = noImagesSkipped + noVideosSkipped
+            if noFilesSkipped:
+                message += "\n" + _("%(noFiles)s %(filetypes)s skipped") % {'noFiles':noFilesSkipped, 'filetypes':file_types_skipped}
             
             if unmountMessage:
                 message = "%s\n%s" % (message,  unmountMessage)
@@ -1870,26 +2317,70 @@ class CopyPhotos(Thread):
 
         
 
+        def getThumbnail(fileMetadata):
+            thumbnail = orientation = None
+            if self.isImage:
+                try:
+                    thumbnail = fileMetadata.getThumbnailData(MAX_THUMBNAIL_SIZE)
+                    if not isinstance(thumbnail, types.StringType):
+                        thumbnail = None
+                except:
+                    thumbnail = None
+                    
+                if thumbnail is None:
+                    logError(config.WARNING, _("Photo thumbnail could not be extracted"), fullFileName)
+                    orientation = None
+                else:
+                    orientation = fileMetadata.orientation(missing=None)
+            else:
+                # get thumbnail of video
+                # it may need to be generated
+                thumbnail = fileMetadata.getThumbnailData(MAX_THUMBNAIL_SIZE, tempWorkingDir)
+                if thumbnail:
+                    orientation = 1
+            return thumbnail, orientation
+                            
+        def createTempDir(baseDir):
+            """
+            Create a temporary directory in which to download the photos to.
+            
+            Returns the directory if it was created, else returns None.
+            
+            Don't want to put it in system temp folder, as that is likely
+            to be on another partition and hence copying files from it
+            to the actual download folder will be slow!"""
+            try:
+                t = tempfile.mkdtemp(prefix='rapid-tmp-', 
+                                                dir=baseDir)
+                return t
+            except OSError, (errno, strerror):
+                if not self.cardMedia.volume:
+                    image_device = _("Source: %s\n") % self.cardMedia.getPath()
+                else:
+                    _("Device: %s\n") % self.cardMedia.volume.get_name()
+                destination = _("Destination: %s") % baseDir
+                logError(config.CRITICAL_ERROR, _('Could not create temporary download directory'), 
+                             image_device + destination,
+                            _("Download cannot proceed"))
+                cmd_line(_("Error:") + " " + _('Could not create temporary download directory'))
+                cmd_line(image_device + destination)
+                cmd_line(_("Download cannot proceed"))
+                display_queue.put((media_collection_treeview.removeCard,  (self.thread_id, )))
+                display_queue.put((self.parentApp.downloadFailed,  (self.thread_id, )))
+                display_queue.close("rw")
+                self.running = False
+                self.lock.release()
+                return None      
+            
         self.hasStarted = True
         display_queue.open('w')
 
         #Do not try to handle any preference errors here
         getPrefs(False)
         
-        #check for presence of backup meditum
-        if self.prefs.backup_images:
-            if self.prefs.backup_missing <> config.IGNORE:
-                if not len(self.parentApp.backupVolumes):
-                    if self.prefs.backup_missing == config.REPORT_ERROR:
-                        e = config.SERIOUS_ERROR
-                    else:
-                        e = config.WARNING
-                    logError(e,  _("Backup device missing"),  _("No backup device was detected."))
-                
-        
         if not scanMedia():
-            cmd_line(_("This device has no images to download from."))
-            display_queue.put((self.parentApp.downloadFailed,  (self.thread_id, )))
+            cmd_line(_("This device has no %(types_searched_for)s to download from.") % {'types_searched_for': self.types_searched_for})
+            display_queue.put((self.parentApp.downloadFailed, (self.thread_id, )))
             display_queue.close("rw")
             self.running = False
             return 
@@ -1925,17 +2416,47 @@ class CopyPhotos(Thread):
         self.downloadStarted = True
         cmd_line(_("Download has started from %s") % self.cardMedia.prettyName(limit=0))
         
+        #check for presence of backup path or volumes
+        if self.prefs.backup_images:
+            can_backup = True
+            if self.prefs.backup_missing == config.REPORT_ERROR:
+                e = config.SERIOUS_ERROR
+            elif self.prefs.backup_missing == config.REPORT_WARNING:
+                e = config.WARNING            
+            if not self.prefs.backup_device_autodetection:
+                if not os.path.isdir(self.prefs.backup_location):
+                    # the user has manually specified a path, but it
+                    # does not exist. This is a problem.
+                    try:
+                        os.makedirs(self.prefs.backup_location)
+                    except:
+                        if self.prefs.backup_missing <> config.IGNORE:
+                            logError(e, _("Backup path does not exist"),
+                                        _("The path %s could not be created") % path, 
+                                        _("No backups can occur")
+                                    )
+                        can_backup = False
+                        
+            elif self.prefs.backup_missing <> config.IGNORE:
+                if not len(self.parentApp.backupVolumes):
+                    logError(e, _("Backup device missing"), 
+                                _("No backup device was automatically detected"), 
+                                _("No backups can occur"))
+                    can_backup = False        
+        
         if need_job_code and job_code == None:
             sys.stderr.write(str(self.thread_id ) + ": job code should never be None\n")
             self.imageRenamePrefsFactory.setJobCode('unknown-job-code')
             self.subfolderPrefsFactory.setJobCode('unknown-job-code')
         else:
             self.imageRenamePrefsFactory.setJobCode(job_code)
+            self.videoRenamePrefsFactory.setJobCode(job_code)
             self.subfolderPrefsFactory.setJobCode(job_code)
+            self.videoSubfolderPrefsFactory.setJobCode(job_code)
             
-        # Some images may not have metadata (this
-        # is unlikely for images straight out of a 
-        # camera, but it is possible for images that have been edited).  If
+        # Some photos may not have metadata (this
+        # is unlikely for photos straight out of a 
+        # camera, but it is possible for photos that have been edited).  If
         # only non-dynamic components make up the rest of an image name 
         # (e.g. text specified by the user), then relying on metadata will 
         # likely produce duplicate names. 
@@ -1943,65 +2464,56 @@ class CopyPhotos(Thread):
         needMetaDataToCreateUniqueImageName = self.imageRenamePrefsFactory.needImageMetaDataToCreateUniqueName()
         
         # subfolder generation also need to be examined, but here the need is
-        # not so exacting, since subfolders contain images, and naturally the
+        # not so exacting, since subfolders contain photos, and naturally the
         # requirement to be unique is far more relaxed.  However if subfolder 
         # generation relies entirely on metadata, that is a problem worth
         # looking for
         needMetaDataToCreateUniqueSubfolderName = self.subfolderPrefsFactory.needMetaDataToCreateUniqueName()
         
         i = 0
-        sizeDownloaded = noImagesDownloaded =  noImagesSkipped = 0
-        imagesDownloadedSuccessfully = []
+        sizeDownloaded = noFilesDownloaded = noImagesDownloaded = noVideosDownloaded = noImagesSkipped = noVideosSkipped = 0
+        filesDownloadedSuccessfully = []
         
-        sizeImages = self.cardMedia.sizeOfImages(humanReadable = False)
-        display_queue.put((self.parentApp.addToTotalDownloadSize,  (sizeImages, )))
+        sizeFiles = self.cardMedia.sizeOfImagesAndVideos(humanReadable = False)
+        display_queue.put((self.parentApp.addToTotalDownloadSize, (sizeFiles, )))
         display_queue.put((self.parentApp.setOverallDownloadMark, ()))
         display_queue.put((self.parentApp.postStartDownloadTasks,  ()))
         
-        sizeImages = float(sizeImages)
-        noImages = self.cardMedia.numberOfImages()
+        sizeFiles = float(sizeFiles)
+        noFiles = self.cardMedia.numberOfImagesAndVideos()
         
-        baseDownloadDir = self.prefs.download_folder
-        #create a temporary directory in which to download the photos to
-        #don't want to put it in system temp folder, as that is likely
-        #to be on another partition and hence copying files from it
-        #to the download folder will be slow!
-        try:
-            tempWorkingDir = tempfile.mkdtemp(prefix='rapid-tmp-', 
-                                            dir=baseDownloadDir)
-        except OSError, (errno, strerror):
-            if not self.cardMedia.volume:
-                image_device = _("Source: %s\n") % self.cardMedia.getPath()
-            else:
-                _("Image device: %s\n") % self.cardMedia.volume.get_name()
-            destination = _("Destination: %s") % baseDownloadDir
-            logError(config.CRITICAL_ERROR, _('Could not create temporary download directory'), 
-                         image_device + destination,
-                        _("Download cannot proceed"))
-            cmd_line(_("Error:") + " " + _('Could not create temporary download directory'))
-            cmd_line(image_device + destination)
-            cmd_line(_("Download cannot proceed"))
-            display_queue.put((media_collection_treeview.removeCard,  (self.thread_id, )))
-            display_queue.put((self.parentApp.downloadFailed,  (self.thread_id, )))
-            display_queue.close("rw")
-            self.running = False
-            self.lock.release()
-            return 
-            
-                                  
-        IMAGE_SKIPPED = _("Image skipped")
-        IMAGE_OVERWRITTEN = _("Image overwritten")
-        IMAGE_ALREADY_EXISTS = _("Image already exists")
+        if self.noImages > 0:
+            photoBaseDownloadDir = self.prefs.download_folder
+            if not checkDownloadPath(photoBaseDownloadDir):
+                return
+            photoTempWorkingDir = createTempDir(photoBaseDownloadDir)
+            if not photoTempWorkingDir:
+                return
+        else:
+            photoBaseDownloadDir = photoTempWorkingDir = None
+        if DOWNLOAD_VIDEO and self.noVideos > 0:
+            videoBaseDownloadDir = self.prefs.video_download_folder
+            if not checkDownloadPath(videoBaseDownloadDir):
+                return
+            videoTempWorkingDir = createTempDir(videoBaseDownloadDir)
+            if not videoTempWorkingDir:
+                return            
+        else:
+            videoBaseDownloadDir = videoTempWorkingDir = None
         
         addUniqueIdentifier = self.prefs.download_conflict_resolution == config.ADD_UNIQUE_IDENTIFIER
-        usesSequenceElements = self.imageRenamePrefsFactory.usesSequenceElements()
-        usesStoredSequenceNo = self.imageRenamePrefsFactory.usesTheSequenceElement(rn.STORED_SEQ_NUMBER)
-        sequences. setUseOfSequenceElements(
+        usesImageSequenceElements = self.imageRenamePrefsFactory.usesSequenceElements()
+        usesVideoSequenceElements = self.videoRenamePrefsFactory.usesSequenceElements()
+        usesSequenceElements = usesVideoSequenceElements or usesImageSequenceElements
+        
+        usesStoredSequenceNo = (self.imageRenamePrefsFactory.usesTheSequenceElement(rn.STORED_SEQ_NUMBER) or
+                                self.videoRenamePrefsFactory.usesTheSequenceElement(rn.STORED_SEQ_NUMBER))
+        sequences.setUseOfSequenceElements(
             self.imageRenamePrefsFactory.usesTheSequenceElement(rn.SESSION_SEQ_NUMBER), 
             self.imageRenamePrefsFactory.usesTheSequenceElement(rn.SEQUENCE_LETTER))
         
 
-        while i < noImages:
+        while i < noFiles:
             if not self.running:
                 self.lock.acquire()
                 self.running = True
@@ -2013,71 +2525,98 @@ class CopyPhotos(Thread):
                 return
             
             # get information about the image to deduce image name and path
-            name, root, size,  modificationTime = self.cardMedia.images[i]
-            image = os.path.join(root, name)
+            name, root, size,  modificationTime = self.cardMedia.imagesAndVideos[i]
+            fullFileName = os.path.join(root, name)
             
-            skipImage,  imageMetadata,  newName,  newFile,  path,  subfolder, sequence_to_use = generateSubfolderAndFileName(
-                       image,  name,  needMetaDataToCreateUniqueImageName,  
-                       needMetaDataToCreateUniqueSubfolderName)
+            self.isImage = media.isImage(name)
+            if self.isImage:
+                fileBeingDownloadedDisplay = _('photo')
+                fileBeingDownloadedDisplayCap = _('Photo')
+                fileSkippedDisplay = _("Photo skipped")
+                fileAlreadyExistsDisplay = _("Photo already exists")
+                fallback_date = None
+                tempWorkingDir = photoTempWorkingDir
+                baseDownloadDir = photoBaseDownloadDir
+            else:
+                fileBeingDownloadedDisplay = _('video')
+                fileBeingDownloadedDisplayCap = _('Video')
+                fileSkippedDisplay = _("Video skipped")
+                fileAlreadyExistsDisplay = _("Video already exists")
+                fallback_date = modificationTime
+                tempWorkingDir = videoTempWorkingDir
+                baseDownloadDir = videoBaseDownloadDir
+                
+            skipFile, fileMetadata, newName, newFile, path, subfolder, sequence_to_use = generateSubfolderAndFileName(
+                       fullFileName, name, needMetaDataToCreateUniqueImageName,  
+                       needMetaDataToCreateUniqueSubfolderName, fallback_date)
 
-            if skipImage:
-                noImagesSkipped += 1
+            if skipFile:
+                if self.isImage:
+                    noImagesSkipped += 1
+                else:
+                    noVideosSkipped += 1
             else:
-                imageDownloaded, newName, newFile  = downloadImage(path,  newFile,  newName,  name,  image,  
-                                                                   imageMetadata,  subfolder, sequence_to_use)
+                fileDownloaded, newName, newFile  = downloadFile(path, newFile, newName, name, fullFileName,  
+                                                                   fileMetadata, subfolder, sequence_to_use, fallback_date)
 
                 if self.prefs.backup_images:
-                    backed_up = backupImage(subfolder,  newName,  imageDownloaded,  newFile,  image)
+                    if can_backup:
+                        backed_up = backupFile(subfolder, newName, fileDownloaded, newFile, fullFileName)
+                    else:
+                        backed_up = False
 
-                if imageDownloaded:
-                    noImagesDownloaded += 1
+                if fileDownloaded:
+                    noFilesDownloaded += 1
+                    if self.isImage:
+                        noImagesDownloaded += 1
+                    else:
+                        noVideosDownloaded += 1
                     if self.prefs.backup_images and backed_up:
-                        imagesDownloadedSuccessfully.append(image)
+                        filesDownloadedSuccessfully.append(fullFileName)
                     elif not self.prefs.backup_images:
-                        imagesDownloadedSuccessfully.append(image)
+                        filesDownloadedSuccessfully.append(fullFileName)
                 else:
-                    noImagesSkipped += 1
-                try:
-                    thumbnailType, thumbnail = imageMetadata.getThumbnailData()
-                except:
-                    logError(config.WARNING, _("Image has no thumbnail"), image)
-                    thumbnail = orientation = None
-                else:
-                    orientation = imageMetadata.orientation(missing=None)
-                display_queue.put((image_hbox.addImage, (self.thread_id, thumbnail, orientation, image,  imageDownloaded)))
+                    if self.isImage:
+                        noImagesSkipped += 1
+                    else:
+                        noVideosSkipped += 1
+                
+                thumbnail, orientation = getThumbnail(fileMetadata)
+
+                display_queue.put((thumbnail_hbox.addImage, (self.thread_id, thumbnail, orientation, fullFileName, fileDownloaded, self.isImage)))
             
             sizeDownloaded += size
-            percentComplete = (sizeDownloaded / sizeImages) * 100
-            if sizeDownloaded == sizeImages:
+            percentComplete = (sizeDownloaded / sizeFiles) * 100
+            if sizeDownloaded == sizeFiles:
                 self.downloadComplete = True
-            progressBarText = _("%(number)s of %(total)s images copied") % {'number':  i + 1, 'total': noImages}
+            progressBarText = _("%(number)s of %(total)s %(filetypes)s") % {'number':  i + 1, 'total': noFiles, 'filetypes':self.display_file_types}
             display_queue.put((media_collection_treeview.updateProgress, (self.thread_id, percentComplete, progressBarText, size)))
             
             i += 1
 
         with self.statsLock:
-            self.downloadStats.adjust(sizeDownloaded,  noImagesDownloaded,  noImagesSkipped,  self.noWarnings,  self.noErrors)
+            self.downloadStats.adjust(sizeDownloaded, noImagesDownloaded, noVideosDownloaded, noImagesSkipped, noVideosSkipped, self.noWarnings, self.noErrors)
             
         if self.prefs.auto_delete:
             j = 0
-            for image in imagesDownloadedSuccessfully:
+            for imageOrVideo in filesDownloadedSuccessfully:
                 try:
-                    os.unlink(image)
+                    os.unlink(imageOrVideo)
                     j += 1
                 except OSError, (errno, strerror):
-                    logError(config.SERIOUS_ERROR,  _("Could not delete image from image device"),  
-                            _("Image: %(source)s\nError: %(errno)s %(strerror)s")
+                    logError(config.SERIOUS_ERROR,  _("Could not delete photo or video from device"),  
+                            _("Photo: %(source)s\nError: %(errno)s %(strerror)s")
                             % {'source': image, 'errno': errno,  'strerror': strerror})
                 except:
-                    logError(config.SERIOUS_ERROR,  _("Could not delete image from image device"),  
-                            _("Image: %(source)s"))
+                    logError(config.SERIOUS_ERROR,  _("Could not delete photo or video from device"),  
+                            _("Photo: %(source)s"))
                     
-            cmd_line(_("Deleted %i images from image device") % j)
+            cmd_line(_("Deleted %(number)i %(filetypes)s from device") % {'number':j, 'filetypes':self.display_file_types})
 
-        # must manually delete these variables, or else the media cannot be unmounted (bug in pyexiv or exiv2)
-        del self.subfolderPrefsFactory,  self.imageRenamePrefsFactory
+        # must manually delete these variables, or else the media cannot be unmounted (bug in some versions of pyexiv2 / exiv2)
+        del self.subfolderPrefsFactory, self.imageRenamePrefsFactory
         try:
-            del imageMetadata
+            del fileMetadata
         except:
             pass
                 
@@ -2091,7 +2630,7 @@ class CopyPhotos(Thread):
         display_queue.close("rw")
         
         self.running = False
-        if noImages:
+        if noFiles:
             self.lock.release()
         
     def startStop(self):
@@ -2171,13 +2710,11 @@ class MediaTreeView(gtk.TreeView):
         self.append_column(column2)
         self.show_all()
         
-    def addCard(self, thread_id, cardName, sizeImages, noImages, progress = 0.0,
+    def addCard(self, thread_id, cardName, sizeFiles, noFiles, progress = 0.0,
                 progressBarText = ''):
-        if not progressBarText:
-            progressBarText = _("0 of %s images copied") % (noImages)
         
         # add the row, and get a temporary pointer to the row
-        iter = self.liststore.append((cardName, sizeImages, noImages, 
+        iter = self.liststore.append((cardName, sizeFiles, noFiles, 
                                                 progress, progressBarText))
         
         self._setThreadMap(thread_id, iter)
@@ -2191,11 +2728,11 @@ class MediaTreeView(gtk.TreeView):
             self.parentApp.media_collection_scrolledwindow.set_size_request(-1,  height)
 
         
-    def updateCard(self,  thread_id,  sizeImages, noImages):
+    def updateCard(self,  thread_id,  sizeFiles, noFiles):
         if thread_id in self.mapThreadToRow:
             iter = self._getThreadMap(thread_id)
-            self.liststore.set_value(iter, 1, sizeImages)
-            self.liststore.set_value(iter, 2, noImages)
+            self.liststore.set_value(iter, 1, sizeFiles)
+            self.liststore.set_value(iter, 2, noFiles)
         else:
             sys.stderr.write("FIXME: this card is unknown")
     
@@ -2245,7 +2782,7 @@ class MediaTreeView(gtk.TreeView):
             col = self.get_column(0)
             return self.get_background_area(path, col)[3]
 
-class ImageHBox(gtk.HBox):
+class ThumbnailHBox(gtk.HBox):
     """
     Displays thumbnails of the images being downloaded
     """
@@ -2256,49 +2793,63 @@ class ImageHBox(gtk.HBox):
         self.padding = hd.CONTROL_IN_TABLE_SPACE / 2
 
         #create image used to lighten thumbnails
-        self.white = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB,  False,  8,  width=100, height=100)
+        self.white = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB,  False,  8,  width=MAX_THUMBNAIL_SIZE, height=MAX_THUMBNAIL_SIZE)
         #fill with white
         self.white.fill(0xffffffff)
         
         #load missing image 
-        self.missingThumbnail = gtk.gdk.pixbuf_new_from_file_at_size(paths.share_dir('glade3/image-missing.svg'),  100,  100)
+        self.missingThumbnail = gtk.gdk.pixbuf_new_from_file_at_size(paths.share_dir('glade3/image-missing.svg'), MAX_THUMBNAIL_SIZE, MAX_THUMBNAIL_SIZE)
+        self.videoThumbnail = gtk.gdk.pixbuf_new_from_file_at_size(paths.share_dir('glade3/video.svg'), MAX_THUMBNAIL_SIZE,  MAX_THUMBNAIL_SIZE)
         
-    def addImage(self, thread_id, thumbnail, orientation, filename,  imageDownloaded):
+    def addImage(self, thread_id, thumbnail, orientation, filename, fileDownloaded, isImage):
         """ 
         Add thumbnail
         
         Orientation indicates if the thumbnail needs to be rotated or not.
         """
         
-        if not thumbnail:
-            pixbuf = self.missingThumbnail
-        else:
-            try:
-                pbloader = gdk.PixbufLoader()
-                pbloader.write(thumbnail)
-                # Get the resulting pixbuf and build an image to be displayed
-                pixbuf = pbloader.get_pixbuf()
-                pbloader.close()
-                
-            except:
-                log_dialog.addMessage(thread_id, config.WARNING, 
-                                _('Thumbnail cannot be displayed'), filename, 
-                                _('It may be corrupted'))
+        if isImage:
+            if not thumbnail:
                 pixbuf = self.missingThumbnail
+            else:
+                try:
+                    pbloader = gdk.PixbufLoader()
+                    pbloader.write(thumbnail)
+                    pbloader.close()
+                    # Get the resulting pixbuf and build an image to be displayed
+                    pixbuf = pbloader.get_pixbuf()  
+                except:
+                    log_dialog.addMessage(thread_id, config.WARNING, 
+                                    _("Photo thumbnail could not be extracted"), filename, 
+                                    _('It may be corrupted'))
+                    pbloader = None
+                    pixbuf = self.missingThumbnail
+        else:
+            # the file downloaded is a video, not a photo or image
+            # if thumbnail is passed in, it is already in pixbuf format
+            if thumbnail:
+                pixbuf = thumbnail
+            else:
+                pixbuf = self.videoThumbnail
 
         if not pixbuf:
+            # get_pixbuf() can return None if not could not render the image
             log_dialog.addMessage(thread_id, config.WARNING, 
-                            _('Thumbnail cannot be displayed'), filename, 
+                            _("Photo thumbnail could not be extracted"), filename, 
                             _('It may be corrupted'))
             pixbuf = self.missingThumbnail
         else:
             # rotate if necessary
             if orientation == 8:
                 pixbuf = pixbuf.rotate_simple(gdk.PIXBUF_ROTATE_COUNTERCLOCKWISE)
+            elif orientation == 6:
+                pixbuf = pixbuf.rotate_simple(gdk.PIXBUF_ROTATE_CLOCKWISE)
+            elif orientation == 3:
+                pixbuf = pixbuf.rotate_simple(gdk.PIXBUF_ROTATE_UPSIDEDOWN)
     
         # scale to size
-        pixbuf = common.scale2pixbuf(100, 100, pixbuf)
-        if not imageDownloaded:
+        pixbuf = common.scale2pixbuf(MAX_THUMBNAIL_SIZE, MAX_THUMBNAIL_SIZE, pixbuf)
+        if not fileDownloaded:
             # lighten it
             self.white.composite(pixbuf, 0, 0, pixbuf.props.width, pixbuf.props.height, 0, 0, 1.0, 1.0, gtk.gdk.INTERP_HYPER, 180)
 
@@ -2324,7 +2875,7 @@ class UseDeviceDialog(gtk.Dialog):
         
         self.set_icon_from_file(paths.share_dir('glade3/rapid-photo-downloader-about.png'))
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-        prompt_label = gtk.Label(_('Should this device or partition be used to download images from?'))
+        prompt_label = gtk.Label(_('Should this device or partition be used to download photos or videos from?'))
         prompt_label.set_line_wrap(True)
         prompt_hbox = gtk.HBox()
         prompt_hbox.pack_start(prompt_label, False, False, padding=6)
@@ -2541,7 +3092,8 @@ class LogDialog(gnomeglade.Component):
         self.log_textview.set_cursor_visible(False)
         self.textbuffer = self.log_textview.get_buffer()
         
-        self.problemTag = self.textbuffer.create_tag(weight=pango.WEIGHT_BOLD)
+        self.errorTag = self.textbuffer.create_tag(weight=pango.WEIGHT_BOLD, foreground="red")
+        self.warningTag = self.textbuffer.create_tag(weight=pango.WEIGHT_BOLD)
         self.resolutionTag = self.textbuffer.create_tag(style=pango.STYLE_ITALIC)
         
     def addMessage(self, thread_id, severity, problem, details, resolution):
@@ -2552,7 +3104,10 @@ class LogDialog(gnomeglade.Component):
         self.parentApp.warning_vseparator.show()
         
         iter = self.textbuffer.get_end_iter()
-        self.textbuffer.insert_with_tags(iter, problem +"\n", self.problemTag)
+        if severity in [config.CRITICAL_ERROR, config.SERIOUS_ERROR]:
+            self.textbuffer.insert_with_tags(iter, problem +"\n", self.errorTag)
+        else:
+            self.textbuffer.insert_with_tags(iter, problem +"\n", self.warningTag)
         if details:
             iter = self.textbuffer.get_end_iter()
             self.textbuffer.insert(iter, details + "\n")
@@ -2609,6 +3164,8 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
 #        sys.exit(0)
 
         self.widget.show()
+        
+        self.checkIfFirstTimeProgramEverRun()
 
         displayPreferences = self.checkForUpgrade(__version__)
         self.prefs.program_version = __version__
@@ -2626,7 +3183,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
             displayPreferences = not self.checkPreferencesOnStartup()
         
         # display download information using threads
-        global media_collection_treeview, image_hbox, log_dialog
+        global media_collection_treeview, thumbnail_hbox, log_dialog
         global download_queue, image_queue, log_queue
         global workers
 
@@ -2683,8 +3240,8 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         self.media_collection_vbox.pack_start(media_collection_treeview)
         
         #thumbnail display
-        image_hbox = ImageHBox(self)
-        self.image_viewport.add(image_hbox)
+        thumbnail_hbox = ThumbnailHBox(self)
+        self.image_viewport.add(thumbnail_hbox)
         self.image_viewport.modify_bg(gtk.STATE_NORMAL, gdk.color_parse("white"))
         self.set_display_thumbnails(self.prefs.display_thumbnails)
         
@@ -2748,23 +3305,33 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
             self.rapidapp.present()
         else:
             self.running = True
+#            if not using_gio:
             self.main()
+#            else:
+#                mainloop = gobject.MainLoop()
+#                mainloop.run()
             self.running = False
             
     def setTestingEnv(self):
-        self.prefs.program_version = '0.0.8~b7'
-        r = ['Date time', 'Image date', 'YYYYMMDD', 'Text', '-', '', 'Date time', 'Image date', 'HHMM', 'Text', '-', '', 'Session number', '1', 'Three digits', 'Text', '-iso', '', 'Metadata', 'ISO', '', 'Text', '-f', '', 'Metadata', 'Aperture', '', 'Text', '-', '', 'Metadata', 'Focal length', '', 'Text', 'mm-', '', 'Metadata', 'Exposure time', '', 'Filename', 'Extension', 'lowercase']
-        self.prefs.image_rename = r
+        #self.prefs.program_version = '0.0.8~b7'
+        p = ['Date time', 'Image date', 'YYYYMMDD', 'Text', '-', '', 'Date time', 'Image date', 'HHMM', 'Text', '-', '', rn.SEQUENCES, rn.DOWNLOAD_SEQ_NUMBER, rn.SEQUENCE_NUMBER_3, 'Text', '-iso', '', 'Metadata', 'ISO', '', 'Text', '-f', '', 'Metadata', 'Aperture', '', 'Text', '-', '', 'Metadata', 'Focal length', '', 'Text', 'mm-', '', 'Metadata', 'Exposure time', '', 'Filename', 'Extension', 'lowercase']
+        v = ['Date time', 'Video date', 'YYYYMMDD', 'Text', '-', '', 'Date time', 'Video date', 'HHMM', 'Text', '-', '', 'Sequences', 'Downloads today', 'One digit', 'Text', '-', '', 'Metadata', 'Width', '', 'Text', 'x', '', 'Metadata', 'Height', '', 'Filename', 'Extension', 'lowercase']
+        f = '/home/damon/store/rapid-dump'
+        self.prefs.image_rename = p
+        self.prefs.video_rename = v
+        self.prefs.download_folder = f
+        self.prefs.video_download_folder = f
+        
         
         
     def checkImageDevicePathOnStartup(self):
         msg = None
         if not os.path.isdir(self.prefs.device_location):
-            msg = _("Sorry, this image location does not exist:\n%(path)s\n\nPlease resolve the problem, or modify your preferences." % {"path": self.prefs.device_location})
+            msg = _("Sorry, this device location does not exist:\n%(path)s\n\nPlease resolve the problem, or modify your preferences." % {"path": self.prefs.device_location})
             
         if msg:
             sys.stderr.write(msg +'\n')
-            misc.run_dialog(_("Problem with Image Location Folder"), msg, 
+            misc.run_dialog(_("Problem with Device Location Folder"), msg, 
                 self,
                 gtk.MESSAGE_ERROR)
             return False
@@ -2772,22 +3339,36 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
             return True
         
     def checkDownloadPathOnStartup(self):
-        msg = None
-        if not os.path.isdir(self.prefs.download_folder):
-            msg = _("Sorry, the Download Folder does not exist. Please create the folder, or modify your preferences")
+        if DOWNLOAD_VIDEO:
+            paths = ((self.prefs.download_folder, _('Photo')), (self.prefs.video_download_folder, _('Video')))
         else:
-            #unfortunately 'os.access(self.prefs.download_folder, os.W_OK)' is not reliable
-            try:
-                tempWorkingDir = tempfile.mkdtemp(prefix='rapid-tmp-', 
-                                            dir=self.prefs.download_folder)
-            except:
-                msg = _("Sorry, the Download Folder exists but cannot be written to. Please check the folder's permissions, or modify your preferences")
+            paths = ((self.prefs.download_folder, _('Photo')),)
+        msg = ''
+        noProblems = 0
+        for path, file_type in paths:
+            if not os.path.isdir(path):
+                msg += _("The %(file_type)s Download Folder does not exist.\n") % {'file_type': file_type}
+                noProblems += 1
             else:
-                os.rmdir(tempWorkingDir)
+                #unfortunately 'os.access(self.prefs.download_folder, os.W_OK)' is not reliable
+                try:
+                    tempWorkingDir = tempfile.mkdtemp(prefix='rapid-tmp-', 
+                                                dir=path)
+                except:
+                    noProblems += 1
+                    msg += _("The %(file_type)s Download Folder exists but cannot be written to.\n") % {'file_type': file_type}
+                else:
+                    os.rmdir(tempWorkingDir)
             
         if msg:
-            sys.stderr.write(msg +'\n')
-            misc.run_dialog(_("Problem with Download Folder"), msg, 
+            msg = _("Sorry, problems were encountered with your download folders. Please fix the problems or modify the preferences.\n\n") + msg
+            sys.stderr.write(msg)
+            if noProblems == 1:
+                title = _("Problem with Download Folder")
+            else:
+                title = _("Problem with Download Folders")
+            
+            misc.run_dialog(title, msg, 
                 self,
                 gtk.MESSAGE_ERROR)
             return False
@@ -2795,7 +3376,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
             return True
     
     def checkPreferencesOnStartup(self):
-        prefsOk = rn.checkPreferencesForValidity(self.prefs.image_rename,  self.prefs.subfolder)
+        prefsOk = rn.checkPreferencesForValidity(self.prefs.image_rename,  self.prefs.subfolder, self.prefs.video_rename, self.prefs.video_subfolder)
         if not prefsOk:
             msg = _("There is an error in the program preferences.")
             msg += " " + _("Some preferences will be reset.") 
@@ -2890,7 +3471,31 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         # FIXME: what happens to these workers that are waiting? How will the user start their download?
         # check if need to add code to start button
                 
-    def checkForUpgrade(self,  runningVersion):
+    def checkIfFirstTimeProgramEverRun(self):
+        """
+        if this is the first time the program has been run, then
+        might need to create default directories
+        """
+        if len(self.prefs.program_version) == 0:
+            path = getDefaultPhotoLocation(ignore_missing_dir=True)
+            if not os.path.isdir(path):
+                cmd_line(_("Creating photo download folder %(folder)s") % {'folder':path})
+                try:
+                    os.makedirs(path)
+                    self.prefs.download_folder = path
+                except:
+                    cmd_line(_("Failed to create default photo download folder %(folder)s") % {'folder':path})
+            if DOWNLOAD_VIDEO:
+                path = getDefaultVideoLocation(ignore_missing_dir=True)
+                if not os.path.isdir(path):
+                    cmd_line(_("Creating video download folder %(folder)s") % {'folder':path})
+                    try:
+                        os.makedirs(path)
+                        self.prefs.video_download_folder = path
+                    except:
+                        cmd_line(_("Failed to create default video download folder %(folder)s") % {'folder':path})
+    
+    def checkForUpgrade(self, runningVersion):
         """ Checks if the running version of the program is different from the version recorded in the preferences.
         
         If the version is different, then the preferences are checked to see whether they should be upgraded or not.
@@ -2900,7 +3505,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         displayPrefs = upgraded = False
         
         previousVersion = self.prefs.program_version
-        if previousVersion:
+        if len(previousVersion) > 0:
             # the program has been run previously for this user
         
             pv = common.pythonifyVersion(previousVersion)
@@ -2911,7 +3516,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
             
             if pv != rv:
                 if pv > rv:
-                    prefsOk = rn.checkPreferencesForValidity(self.prefs.image_rename,  self.prefs.subfolder)
+                    prefsOk = rn.checkPreferencesForValidity(self.prefs.image_rename, self.prefs.subfolder, self.prefs.video_rename, self.prefs.video_subfolder)
                         
                     msg = _("A newer version of this program was previously run on this computer.\n\n")
                     if prefsOk:
@@ -2925,8 +3530,8 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
                 else:
                     cmd_line(_("This version of the program is newer than the previously run version. Checking preferences."))
 
-                    if rn.checkPreferencesForValidity(self.prefs.image_rename,  self.prefs.subfolder,  previousVersion):
-                        upgraded,  imageRename,  subfolder = rn.upgradePreferencesToCurrent(self.prefs.image_rename,  self.prefs.subfolder,  previousVersion)
+                    if rn.checkPreferencesForValidity(self.prefs.image_rename, self.prefs.subfolder, self.prefs.video_rename, self.prefs.video_subfolder, previousVersion):
+                        upgraded,  imageRename,  subfolder = rn.upgradePreferencesToCurrent(self.prefs.image_rename, self.prefs.subfolder, previousVersion)
                         if upgraded:
                             self.prefs.image_rename = imageRename
                             self.prefs.subfolder = subfolder
@@ -2942,6 +3547,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
                         misc.run_dialog(title,  msg)
                         displayPrefs = True
 
+
         return displayPrefs
 
     def initPyNotify(self):
@@ -2974,10 +3580,13 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
             cmd_line(_("Warning: desktop environment notification server is incorrectly configured."))
             self.notification_icon_size = 48
         else:
-            if info['name'] == 'Notification Daemon':
+            try:
+                if info['name'] == 'Notification Daemon':
+                    self.notification_icon_size = 128
+                else:
+                    self.notification_icon_size = 48                    
+            except:
                 self.notification_icon_size = 48
-            else:
-                self.notification_icon_size = 128
             
         self.application_icon = gtk.gdk.pixbuf_new_from_file_at_size(
                 paths.share_dir('glade3/rapid-photo-downloader-about.png'),
@@ -3071,12 +3680,11 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
                     isBackupVolume = self.checkIfBackupVolume(path)
                                 
                     if isBackupVolume:
-                        backupPath = os.path.join(path,  self.prefs.backup_identifier)
                         if path not in self.backupVolumes:
-                            self.backupVolumes[backupPath] = volume
+                            self.backupVolumes[path] = volume
                             self.rapid_statusbar.push(self.statusbar_context_id, self.displayBackupVolumes())
 
-                    elif media.isImageMedia(path) or self.searchForPsd():
+                    elif media.is_DCIM_Media(path) or self.searchForPsd():
                         if self.searchForPsd() and path not in self.prefs.device_whitelist:
                             # prompt user if device should be used or not
                             self.getUseDevice(path,  volume, self.prefs.auto_download_upon_device_insertion)
@@ -3132,9 +3740,8 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
             # fourth scenario - nothing to do
                     
             # remove backup volumes
-            backupPath = os.path.join(path,  self.prefs.backup_identifier)
-            if backupPath in self.backupVolumes:
-                del self.backupVolumes[backupPath]
+            if path in self.backupVolumes:
+                del self.backupVolumes[path]
                 self.rapid_statusbar.push(self.statusbar_context_id, self.displayBackupVolumes())
                 
             # may need to disable download button
@@ -3167,9 +3774,12 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         
         Checks against user preferences.
         """
+        identifiers = [self.prefs.backup_identifier]
+        if DOWNLOAD_VIDEO:
+            identifiers.append(self.prefs.video_backup_identifier)
         if self.prefs.backup_images:
             if self.prefs.backup_device_autodetection:
-                if media.isBackupMedia(path, self.prefs.backup_identifier):
+                if media.isBackupMedia(path, identifiers):
                     return True
             elif path == self.prefs.backup_location:
                 # user manually specified the path
@@ -3226,14 +3836,14 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
                             self._printDetectedDevice(volume.get_name(limit=0), path)
                             isBackupVolume = self.checkIfBackupVolume(path)
                             if isBackupVolume:
-                                backupPath = os.path.join(path,  self.prefs.backup_identifier)
-                                self.backupVolumes[backupPath] = volume
-                            elif self.prefs.device_autodetection and (media.isImageMedia(path) or self.searchForPsd()):
+                                #backupPath = os.path.join(path,  self.prefs.backup_identifier)
+                                self.backupVolumes[path] = volume
+                            elif self.prefs.device_autodetection and (media.is_DCIM_Media(path) or self.searchForPsd()):
                                 volumeList.append((path, volume))
                         
         
         if not self.prefs.device_autodetection:
-            # user manually specified the path from which to download images
+            # user manually specified the path from which to download 
             path = self.prefs.device_location
             if path:
                 cmd_line(_("Using manually specified path") + " %s" %  path)
@@ -3242,8 +3852,9 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         if self.prefs.backup_images:
             if not self.prefs.backup_device_autodetection:
                 # user manually specified backup location
+                # will backup to this path, but don't need any volume info associated with it
                 self.backupVolumes[self.prefs.backup_location] = None
-                self.rapid_statusbar.push(self.statusbar_context_id, '')
+                self.rapid_statusbar.push(self.statusbar_context_id, _('Backing up to %(path)s') % {'path':self.prefs.backup_location})
             else:
                 self.rapid_statusbar.push(self.statusbar_context_id, self.displayBackupVolumes())
                 
@@ -3404,9 +4015,14 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         if self.downloadComplete():
             if self.displayDownloadSummaryNotification:
                 message = _("All downloads complete")
-                message += "\n%s " % self.downloadStats.noImagesDownloaded + _("images downloaded")
+                if self.downloadStats.noImagesDownloaded:
+                    message += "\n%s " % self.downloadStats.noImagesDownloaded + _("photos downloaded")
                 if self.downloadStats.noImagesSkipped:
-                    message = "%s\n%s " % (message,  self.downloadStats.noImagesSkipped) + _("images skipped")
+                    message = "%s\n%s " % (message,  self.downloadStats.noImagesSkipped) + _("photos skipped")
+                if self.downloadStats.noVideosDownloaded:
+                    message += "\n%s " % self.downloadStats.noVideosDownloaded + _("videos downloaded")
+                if self.downloadStats.noVideosSkipped:
+                    message = "%s\n%s " % (message,  self.downloadStats.noVideosSkipped) + _("videos skipped")                    
                 if self.downloadStats.noWarnings:
                     message = "%s\n%s " % (message,  self.downloadStats.noWarnings) + _("warnings")
                 if self.downloadStats.noErrors:
@@ -3629,6 +4245,7 @@ class Volume:
     """ Transistion to gvfs from gnomevfs"""
     def __init__(self,  volume):
         self.volume = volume
+        self.using_gio = using_gio
         
     def get_name(self, limit=config.MAX_LENGTH_DEVICE_NAME):
         if using_gio:
@@ -3686,15 +4303,17 @@ class DownloadStats:
     def __init__(self):
         self.clear()
         
-    def adjust(self, size,  noImagesDownloaded,  noImagesSkipped,  noWarnings,  noErrors):
+    def adjust(self, size,  noImagesDownloaded, noVideosDownloaded, noImagesSkipped, noVideosSkipped, noWarnings,  noErrors):
         self.downloadSize += size
         self.noImagesDownloaded += noImagesDownloaded
+        self.noVideosDownloaded += noVideosDownloaded
         self.noImagesSkipped += noImagesSkipped
+        self.noVideosSkipped += noVideosSkipped
         self.noWarnings += noWarnings
         self.noErrors += noErrors
         
     def clear(self):
-        self.noImagesDownloaded = self.noImagesSkipped = 0
+        self.noImagesDownloaded = self.noVideosDownloaded = self.noImagesSkipped = self.noVideosSkipped = 0
         self.downloadSize = 0
         self.noWarnings = self.noErrors = 0
         
@@ -3799,7 +4418,8 @@ def start ():
     parser.add_option("-v",  "--verbose",  action="store_true", dest="verbose",  help=_("display program information on the command line as the program runs (default: %default)"))
     parser.add_option("-q", "--quiet",  action="store_false", dest="verbose",  help=_("only output errors to the command line"))
     # image file extensions are recognized RAW files plus TIFF and JPG
-    parser.add_option("-e",  "--extensions",  action="store_true", dest="extensions", help=_("list image file extensions the program recognizes and exit"))
+    parser.add_option("-e",  "--extensions", action="store_true", dest="extensions", help=_("list photo and video file extensions the program recognizes and exit"))
+    parser.add_option("--reset-settings", action="store_true", dest="reset", help=_("reset all program settings and preferences and exit"))
     (options, args) = parser.parse_args()
     global verbose
     verbose = options.verbose
@@ -3808,23 +4428,43 @@ def start ():
         atexit.register(programStatus)
         
     if options.extensions:
-        exts = config.RAW_FILE_EXTENSIONS + config.NON_RAW_IMAGE_FILE_EXTENSIONS
-        v = ''
-        for e in exts[:-1]:
-            v += '%s, ' % e.upper()
-        v = v[:-1] + ' '+ (_('and %s') % exts[-1].upper())
-        print v
+        extensions = ((metadata.RAW_FILE_EXTENSIONS + metadata.NON_RAW_IMAGE_FILE_EXTENSIONS, _("Photos:")), (videometadata.VIDEO_FILE_EXTENSIONS, _("Videos:")))
+        for exts, file_type in extensions:
+            v = ''
+            for e in exts[:-1]:
+                v += '%s, ' % e.upper()
+            v = file_type + " " + v[:-1] + ' '+ (_('and %s') % exts[-1].upper())
+            print v
+            
+        sys.exit(0)
+        
+    if options.reset:
+        prefs = RapidPreferences()
+        prefs.reset()
+        print _("All settings and preferences have been reset")
         sys.exit(0)
 
+    cmd_line(_("Rapid Photo Downloader") + " %s" % config.version)
+    cmd_line(_("Using") + " pyexiv2 " + metadata.version_info())
+    cmd_line(_("Using") + " exiv2 " + metadata.exiv2_version_info())
+    if DOWNLOAD_VIDEO:
+        cmd_line(_("Using") + " kaa " + videometadata.version_info())
+    else:
+        cmd_line(_("\n" + "Video downloading functionality disabled.\nTo download videos, please install the kaa metadata package for python.") + "\n")
+        
     if using_gio:
         cmd_line(_("Using") + " GIO")
+        gobject.threads_init()
     else:
         # Which volume management code is being used (GIO or GnomeVFS)
         cmd_line(_("Using") + " GnomeVFS")
+        gdk.threads_init()
         
-    gdk.threads_init()
+    
+
     display_queue.open("rw")
     tube.tube_add_watch(display_queue, updateDisplay)
+
     gdk.threads_enter()
 
     # run only a single instance of the application 
@@ -3839,6 +4479,7 @@ def start ():
         app = dbus.Interface (object, config.DBUS_NAME)
     
     app.start()
+
     gdk.threads_leave()    
 
 if __name__ == "__main__":
diff --git a/rapid/renamesubfolderprefs.py b/rapid/renamesubfolderprefs.py
index a449fd7..feb7366 100644
--- a/rapid/renamesubfolderprefs.py
+++ b/rapid/renamesubfolderprefs.py
@@ -77,7 +77,7 @@ ORDER_KEY = "__order__"
 
 # PLEASE NOTE: these values are duplicated in a dummy class whose function
 # is to have them put into the translation template. If you change the values below
-# then change the value in class i18TranslateMeThanks as well!! Thanks!! 
+# then you MUST change the value in class i18TranslateMeThanks as well!! 
 
 # *** Level 0
 DATE_TIME = 'Date time'
@@ -95,12 +95,14 @@ SEPARATOR = os.sep
 IMAGE_DATE = 'Image date'
 TODAY = 'Today'
 YESTERDAY = 'Yesterday'
+VIDEO_DATE = 'Video date'
 
 # File name 
 NAME_EXTENSION = 'Name + extension'
 NAME =   'Name'
 EXTENSION = 'Extension'
 IMAGE_NUMBER = 'Image number'
+VIDEO_NUMBER = 'Video number'
 
 # Metadata
 APERTURE = 'Aperture'
@@ -115,6 +117,13 @@ SERIAL_NUMBER = 'Serial number'
 SHUTTER_COUNT = 'Shutter count'
 OWNER_NAME = 'Owner name'
 
+# Video metadata
+CODEC = 'Codec'
+WIDTH = 'Width'
+HEIGHT = 'Height'
+FPS = 'Frames Per Second'
+LENGTH = 'Length'
+
 #Image sequences
 DOWNLOAD_SEQ_NUMBER = 'Downloads today'
 SESSION_SEQ_NUMBER = 'Session number'
@@ -158,7 +167,8 @@ SEQUENCE_NUMBER_7 = "Seven digits"
 
 SUBSECONDS = 'Subseconds'
 
-# ****** note if changing LIST_DATE_TIME_L2, update the default subfolder preference below :D *****
+# ****** NOTE 1: if changing LIST_DATE_TIME_L2, you MUST update the default subfolder preference below *****
+# ****** NOTE 2: if changing LIST_DATE_TIME_L2, you MUST update DATE_TIME_CONVERT below *****
 LIST_DATE_TIME_L2 = ['YYYYMMDD', 'YYYY-MM-DD','YYMMDD', 'YY-MM-DD', 
                     'MMDDYYYY', 'MMDDYY', 'MMDD', 
                     'DDMMYYYY', 'DDMMYY', 'YYYY', 'YY', 
@@ -168,7 +178,8 @@ LIST_DATE_TIME_L2 = ['YYYYMMDD', 'YYYY-MM-DD','YYMMDD', 'YY-MM-DD',
 
 LIST_IMAGE_DATE_TIME_L2 = LIST_DATE_TIME_L2 + [SUBSECONDS]
 
-DEFAULT_SUBFOLDER_PREFS = [DATE_TIME, IMAGE_DATE, LIST_DATE_TIME_L2[9],  '/',  '', '', DATE_TIME, IMAGE_DATE, LIST_DATE_TIME_L2[0]]
+DEFAULT_SUBFOLDER_PREFS = [DATE_TIME, IMAGE_DATE, LIST_DATE_TIME_L2[9], '/',  '', '', DATE_TIME, IMAGE_DATE, LIST_DATE_TIME_L2[0]]
+DEFAULT_VIDEO_SUBFOLDER_PREFS = [DATE_TIME, VIDEO_DATE, LIST_DATE_TIME_L2[9], '/',  '', '', DATE_TIME, VIDEO_DATE, LIST_DATE_TIME_L2[0]]
 
 class i18TranslateMeThanks:
     """ this class is never used in actual running code
@@ -184,6 +195,7 @@ class i18TranslateMeThanks:
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
         _('Job code')
         _('Image date')
+        _('Video date')
         _('Today')
         _('Yesterday')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
@@ -194,6 +206,7 @@ class i18TranslateMeThanks:
         _('Extension')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
         _('Image number')
+        _('Video number')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata        
         _('Aperture')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata        
@@ -216,6 +229,11 @@ class i18TranslateMeThanks:
         _('Shutter count')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
         _('Owner name')
+        _('Codec')
+        _('Width')
+        _('Height')
+        _('Length')
+        _('Frames Per Second')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
         _('Downloads today')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
@@ -338,6 +356,7 @@ LIST_SHUTTER_COUNT_L2 = [
 
 # Level 1
 LIST_DATE_TIME_L1 = [IMAGE_DATE, TODAY, YESTERDAY]
+LIST_VIDEO_DATE_TIME_L1 = [VIDEO_DATE, TODAY, YESTERDAY]
 
 DICT_DATE_TIME_L1 = {
                     IMAGE_DATE: LIST_IMAGE_DATE_TIME_L2,
@@ -345,6 +364,13 @@ DICT_DATE_TIME_L1 = {
                     YESTERDAY: LIST_DATE_TIME_L2,
                     ORDER_KEY: LIST_DATE_TIME_L1
                   }
+                  
+VIDEO_DICT_DATE_TIME_L1 = {
+                    VIDEO_DATE: LIST_IMAGE_DATE_TIME_L2,
+                    TODAY: LIST_DATE_TIME_L2,
+                    YESTERDAY: LIST_DATE_TIME_L2,
+                    ORDER_KEY: LIST_VIDEO_DATE_TIME_L1
+                  }
 
 
 LIST_FILENAME_L1 = [NAME_EXTENSION, NAME, EXTENSION, IMAGE_NUMBER]
@@ -357,6 +383,15 @@ DICT_FILENAME_L1 = {
                     ORDER_KEY: LIST_FILENAME_L1
                   }
 
+LIST_VIDEO_FILENAME_L1 = [NAME_EXTENSION, NAME, EXTENSION, VIDEO_NUMBER]
+
+DICT_VIDEO_FILENAME_L1 = {
+                    NAME_EXTENSION: LIST_CASE_L2,
+                    NAME: LIST_CASE_L2,
+                    EXTENSION: LIST_CASE_L2,
+                    VIDEO_NUMBER: LIST_IMAGE_NUMBER_L2,
+                    ORDER_KEY: LIST_VIDEO_FILENAME_L1
+                  }
 
 
 LIST_SUBFOLDER_FILENAME_L1 = [EXTENSION]
@@ -372,7 +407,9 @@ LIST_METADATA_L1 = [APERTURE, ISO, EXPOSURE_TIME, FOCAL_LENGTH,
                     SHORT_CAMERA_MODEL_HYPHEN, 
                     SERIAL_NUMBER, 
                     SHUTTER_COUNT, 
-                    OWNER_NAME]                  
+                    OWNER_NAME]
+                    
+LIST_VIDEO_METADATA_L1 = [CODEC, WIDTH, HEIGHT, LENGTH, FPS]
 
 DICT_METADATA_L1 = {
                     APERTURE: None,
@@ -388,7 +425,15 @@ DICT_METADATA_L1 = {
                     OWNER_NAME: LIST_CASE_L2, 
                     ORDER_KEY: LIST_METADATA_L1
                 }
-                     
+
+DICT_VIDEO_METADATA_L1 = {
+                    CODEC: LIST_CASE_L2,
+                    WIDTH: None,
+                    HEIGHT: None,
+                    LENGTH: None,
+                    FPS: None,
+                    ORDER_KEY: LIST_VIDEO_METADATA_L1
+                    }
 
 LIST_SEQUENCE_L1 = [
                     DOWNLOAD_SEQ_NUMBER,  
@@ -412,6 +457,8 @@ DICT_SEQUENCE_L1 = {
 LIST_IMAGE_RENAME_L0 = [DATE_TIME, TEXT, FILENAME, METADATA, 
                         SEQUENCES,  JOB_CODE]
                         
+LIST_VIDEO_RENAME_L0 = LIST_IMAGE_RENAME_L0
+                        
 
 DICT_IMAGE_RENAME_L0 = {
                     DATE_TIME: DICT_DATE_TIME_L1,
@@ -422,6 +469,16 @@ DICT_IMAGE_RENAME_L0 = {
                     JOB_CODE: None, 
                     ORDER_KEY: LIST_IMAGE_RENAME_L0
                     }
+                    
+DICT_VIDEO_RENAME_L0 = {
+                    DATE_TIME: VIDEO_DICT_DATE_TIME_L1,
+                    TEXT: None,
+                    FILENAME: DICT_VIDEO_FILENAME_L1,
+                    METADATA: DICT_VIDEO_METADATA_L1,
+                    SEQUENCES: DICT_SEQUENCE_L1,
+                    JOB_CODE: None,
+                    ORDER_KEY: LIST_VIDEO_RENAME_L0
+                    }
 
 LIST_SUBFOLDER_L0 = [DATE_TIME, TEXT, FILENAME, METADATA, JOB_CODE,  SEPARATOR]
 
@@ -434,6 +491,18 @@ DICT_SUBFOLDER_L0 = {
                     SEPARATOR: None,
                     ORDER_KEY: LIST_SUBFOLDER_L0
                    }
+                                      
+LIST_VIDEO_SUBFOLDER_L0 = [DATE_TIME, TEXT, FILENAME, METADATA, JOB_CODE,  SEPARATOR]
+                   
+DICT_VIDEO_SUBFOLDER_L0 = {
+                    DATE_TIME: VIDEO_DICT_DATE_TIME_L1,
+                    TEXT: None,
+                    FILENAME: DICT_SUBFOLDER_FILENAME_L1,
+                    METADATA: DICT_VIDEO_METADATA_L1,
+                    JOB_CODE: None, 
+                    SEPARATOR: None,
+                    ORDER_KEY: LIST_VIDEO_SUBFOLDER_L0
+                   }                   
 
 # preference elements that require metadata
 # note there is no need to specify lower level elements if a higher level 
@@ -568,7 +637,7 @@ def _upgradePreferencesToCurrent(prefs,  previousVersion):
     return (upgraded,  p)
     
     
-def upgradePreferencesToCurrent(imageRenamePrefs,  subfolderPrefs,  previousVersion):
+def upgradePreferencesToCurrent(imageRenamePrefs, subfolderPrefs, previousVersion):
     """Upgrades user preferences to current version
     
     returns True if the preferences were upgraded"""
@@ -585,13 +654,22 @@ def usesJobCode(prefs):
             return True
     return False
     
-def checkPreferencesForValidity(imageRenamePrefs,  subfolderPrefs,  version=config.version):
-    """Returns true if the passed in preferences are valid"""
+def checkPreferencesForValidity(imageRenamePrefs,  subfolderPrefs, videoRenamePrefs, videoSubfolderPrefs, version=config.version):
+    """
+    Checks preferences for validity (called at program startup)
+    
+    Returns true if the passed in preferences are valid, else returns False
+    """
     
     if version == config.version:
         try:
-           checkPreferenceValid(DICT_SUBFOLDER_L0, subfolderPrefs)
-           checkPreferenceValid(DICT_IMAGE_RENAME_L0,  imageRenamePrefs)
+            tests = ((imageRenamePrefs, ImageRenamePreferences), 
+                     (subfolderPrefs, SubfolderPreferences),
+                     (videoRenamePrefs, VideoRenamePreferences),
+                     (videoSubfolderPrefs, VideoSubfolderPreferences))
+            for i, Prefs in tests:
+                p = Prefs(i, None)
+                p.checkPrefsForValidity()
         except:
             return False
         return True
@@ -600,6 +678,8 @@ def checkPreferencesForValidity(imageRenamePrefs,  subfolderPrefs,  version=conf
         try:
             checkPreferenceValid(defn, imageRenamePrefs)
             checkPreferenceValid(DICT_SUBFOLDER_L0, subfolderPrefs)
+            checkPreferenceValid(DICT_VIDEO_SUBFOLDER_L0, videoSubfolderPrefs)
+            checkPreferenceValid(DICT_VIDEO_RENAME_L0, videoRenamePrefs)            
         except:
             return False
         return True
@@ -694,6 +774,10 @@ def filterSubfolderPreferences(prefList):
 class PrefError(Exception):
     """ base class """
     def unpackList(self, l):
+        """
+        Make the preferences presentable to the user
+        """
+        
         s = ''
         for i in l:
             if i <> ORDER_KEY:
@@ -718,7 +802,7 @@ class PrefValueInvalidError(PrefKeyError):
         
 class PrefLengthError(PrefError):
     def __init__(self, error):
-        self.msg = _("These preferences are not well formed:") % self.unpackList(error) + "\n %s"
+        self.msg = _("These preferences are not well formed:") + "\n %s" % self.unpackList(error)
         
 class PrefValueKeyComboError(PrefError):
     def __init__(self, error):    
@@ -785,6 +869,7 @@ class ImageRenamePreferences:
             self.defaultPrefs = [FILENAME, NAME_EXTENSION, ORIGINAL_CASE]
             self.defaultRow = self.defaultPrefs
             self.stripForwardSlash = True
+            self.L1DateCheck = IMAGE_DATE #used in _getDateComponent()
             
 
 
@@ -819,19 +904,42 @@ class ImageRenamePreferences:
     def setJobCode(self,  job_code):
         self.job_code = job_code
         
+    
+    def _fixMangledDateTime(self, d):
+        """ Some EXIF dates are badly formed. Try to fix them """
+        
+        _datetime = d.strip()
+        # remove any weird characters at the end of the string
+        while _datetime and not _datetime[-1].isdigit():
+            _datetime = _datetime[:-1]
+        _date,  _time = _datetime.split(' ')
+        _datetime = "%s %s" % (_date.replace(":",  "-") ,  _time.replace("-",  ":"))
+        try:
+            d = datetime.datetime.strptime(_datetime, '%Y-%m-%d %H:%M:%S')
+        except:
+            d = None
+        return d
+            
     def _getDateComponent(self):
         """
-        Returns portion of new image / subfolder name based on date time
+        Returns portion of new image / subfolder name based on date time.
+        If the date is missing, will attempt to use the fallback date.
         """
         
         problem = None
-        if self.L1 == IMAGE_DATE:
+
+        if self.L1 == self.L1DateCheck:
             if self.L2 == SUBSECONDS:
                 d = self.photo.subSeconds()
-                problem = _("Subsecond metadata not present in image")
+                problem = _("Subsecond metadata not present in photo")
+                if d == '00':
+                    return ('', problem)
+                else:
+                    return (d, None)
             else:
                 d = self.photo.dateTime(missing=None)
-                problem = _("%s metadata is not present in image") % self.L1.lower()
+                problem = _("%s metadata is not present") % self.L1.lower()
+                
         elif self.L1 == TODAY:
             d = datetime.datetime.now()
         elif self.L1 == YESTERDAY:
@@ -841,34 +949,33 @@ class ImageRenamePreferences:
             raise("Date options invalid")
 
         if d:
-            if self.L2 <> SUBSECONDS:
-                
-                if type(d) == type('string'):
-                    # will be a string only if the date time could not be converted in the datetime type
-                    # try to massage badly formed date / times into a valid value
-                    _datetime = d.strip()
-                    # remove any weird characters at the end of the string
-                    while _datetime and not _datetime[-1].isdigit():
-                        _datetime = _datetime[:-1]
-                    _date,  _time = _datetime.split(' ')
-                    _datetime = "%s %s" % (_date.replace(":",  "-") ,  _time.replace("-",  ":"))
-                    try:
-                        d = datetime.datetime.strptime(_datetime, '%Y-%m-%d %H:%M:%S')
-                    except:
-                        v = ''
-                        problem = _('Error in date time component. Value %s appears invalid') % ''
-                        return (v,  problem)
-
+            # if format is not the standard floating point representation
+            # of a date time, there is a problem
+            if type(d) == type('string'):
+                # will be a string only if the date time could not be converted in the datetime type
+                # try to massage badly formed date / times into a valid value
+                d = self._fixMangledDateTime(d)
+                if d is None:
+                    v = ''
+                    problem = _('Error in date time component. Value %s appears invalid') % ''
+                    return (v,  problem)
+        else:
+            if self.fallback_date:
                 try:
-                    return (d.strftime(convertDateForStrftime(self.L2)), None)
+                    d = datetime.datetime.fromtimestamp(self.fallback_date)
                 except:
                     v = ''
-                    problem = _('Error in date time component. Value %s appears invalid') % d
-                    return (v,  problem)
+                    problem = _('Error in date time component. Value %s appears invalid') % ''
+                    return (v,  problem)                    
             else:
-                return (d,  None)
-        else:
-            return ('', problem)
+                return ('', problem)
+        
+        try:
+            return (d.strftime(convertDateForStrftime(self.L2)), None)
+        except:
+            v = ''
+            problem = _('Error in date time component. Value %s appears invalid') % d
+            return (v,  problem)
 
     def _getFilenameComponent(self):
         """
@@ -894,11 +1001,11 @@ class ImageRenamePreferences:
                     filename = extension[1:]
             else:
                 filename = ""
-                problem = _("extension was specified but image name has no extension")
-        elif self.L1 == IMAGE_NUMBER:
+                problem = _("extension was specified but filename does not have an extension")
+        elif self.L1 == IMAGE_NUMBER or self.L1 == VIDEO_NUMBER:
             n = re.search("(?P<image_number>[0-9]+$)", name)
             if not n:
-                problem = _("image number was specified but image filename has no number")
+                problem = _("image or video number was specified but filename has no number")
             else:
                 image_number = n.group("image_number")
     
@@ -971,7 +1078,7 @@ class ImageRenamePreferences:
                 md = self.L1.lower()
             else:
                 md = ISO
-            problem = _("%s metadata is not present in image") % md
+            problem = _("%s metadata is not present in photo") % md
         return (v, problem)
 
 
@@ -1037,7 +1144,6 @@ class ImageRenamePreferences:
 
     def _getDownloadsTodaySequenceNo(self):
         problem = None
-            
         v = self._formatSequenceNo(self.sequences.getDownloadsTodayUsingCounter(self.sequenceCounter),  self.L2)
         
         return (v, problem)
@@ -1085,7 +1191,7 @@ class ImageRenamePreferences:
                 return (os.sep, None)
         except:
             v = ""
-            problem = _("error generating name with component %s") % self.L2
+            problem = _("error generating name with component %s") % self.L0
             return (v,  problem)
 
     def _getValuesFromList(self):
@@ -1093,10 +1199,11 @@ class ImageRenamePreferences:
             yield (self.prefList[i], self.prefList[i+1], self.prefList[i+2])
 
 
-    def _generateName(self,  photo,  existingFilename,  stripCharacters,  subfolder,  stripInitialPeriodFromExtension,  sequence):
+    def _generateName(self,  photo,  existingFilename,  stripCharacters,  subfolder,  stripInitialPeriodFromExtension,  sequence, fallback_date):
         self.photo = photo
         self.existingFilename = existingFilename
         self.stripInitialPeriodFromExtension = stripInitialPeriodFromExtension
+        self.fallback_date = fallback_date
             
         name = ''
         problem = ''
@@ -1130,7 +1237,8 @@ class ImageRenamePreferences:
                                     stripCharacters = False,  subfolder=None,  
                                     stripInitialPeriodFromExtension=False, 
                                     sequencesPreliminary = True,
-                                    sequence_to_use = None):
+                                    sequence_to_use = None,
+                                    fallback_date = None):
         """
         Generate a filename for the photo in string format based on user prefs.
         
@@ -1150,7 +1258,7 @@ class ImageRenamePreferences:
             sequence = 0
 
         return self._generateName(photo,  existingFilename,  stripCharacters,  subfolder,  
-                                    stripInitialPeriodFromExtension,  sequence)
+                                    stripInitialPeriodFromExtension,  sequence, fallback_date)
 
     def generateNameSequencePossibilities(self, photo, existingFilename, 
                                     stripCharacters=False,  subfolder=None,  
@@ -1312,16 +1420,65 @@ class ImageRenamePreferences:
         self._getPreferenceWidgets(self.prefsDefnL0, selection, widgets)
         return widgets
 
+def getVideoMetadataComponent(video):
+    """
+    Returns portion of video / subfolder name based on the metadata
+
+    This is outside of a class definition because of the inheritence
+    hierarchy.
+    """
+    
+    problem = None
+    if video.L1 == CODEC:
+        v = video.photo.codec()
+    elif video.L1 == WIDTH:
+        v = video.photo.width()
+    elif video.L1 == HEIGHT:
+        v = video.photo.height()
+    elif video.L1 == FPS:
+        v = video.photo.fps()
+    elif video.L1 == LENGTH:
+        v = video.photo.length()
+    else:
+        raise TypeError("Invalid metadata option specified")
+    if video.L1 in [CODEC]:
+        if video.L2 == UPPERCASE:
+            v = v.upper()
+        elif video.L2 == LOWERCASE:
+            v = v.lower()
+    if not v:
+        problem = _("%s metadata is not present in video") % video.L1
+    return (v, problem)      
+
+class VideoRenamePreferences(ImageRenamePreferences):
+    def __init__(self, prefList, parent, fileSequenceLock=None, sequences=None):    
+        self.prefsDefnL0 = DICT_VIDEO_RENAME_L0
+        self.defaultPrefs = [FILENAME, NAME_EXTENSION, ORIGINAL_CASE]
+        self.defaultRow = self.defaultPrefs
+        self.stripForwardSlash = True
+        self.L1DateCheck = VIDEO_DATE
+        ImageRenamePreferences.__init__(self, prefList, parent, fileSequenceLock, sequences)
+        
+    def _getMetadataComponent(self):
+        """
+        Returns portion of video / subfolder name based on the metadata
+        
+        Note: date time metadata found in _getDateComponent()
+        """
+        return getVideoMetadataComponent(self)
+      
+           
 class SubfolderPreferences(ImageRenamePreferences):
     def __init__(self, prefList, parent):
         self.prefsDefnL0 = DICT_SUBFOLDER_L0
         self.defaultPrefs = DEFAULT_SUBFOLDER_PREFS
         self.defaultRow = [DATE_TIME, IMAGE_DATE, LIST_DATE_TIME_L2[0]]
         self.stripForwardSlash = False
+        self.L1DateCheck = IMAGE_DATE
         ImageRenamePreferences.__init__(self, prefList, parent)
         
     def generateNameUsingPreferences(self, photo, existingFilename=None, 
-                                    stripCharacters = False):
+                                    stripCharacters = False, fallback_date = None):
         """
         Generate a filename for the photo in string format based on user prefs.
         
@@ -1332,7 +1489,9 @@ class SubfolderPreferences(ImageRenamePreferences):
 
         subfolders, problem = ImageRenamePreferences.generateNameUsingPreferences(
                                         self, photo, 
-                                        existingFilename, stripCharacters,  stripInitialPeriodFromExtension=True)
+                                        existingFilename, stripCharacters,  
+                                        stripInitialPeriodFromExtension=True, 
+                                        fallback_date=fallback_date)
         # subfolder value must never start with a separator, or else any 
         # os.path.join function call will fail to join a subfolder to its 
         # parent folder
@@ -1394,11 +1553,29 @@ class SubfolderPreferences(ImageRenamePreferences):
         return v
 
 
-class Sequences:
-    """ Holds sequence numbers and letters used in generating filenames"""
-    def __init__(self,  downloadsToday,  storedSequenceNo):
 
+class VideoSubfolderPreferences(SubfolderPreferences):
+    def __init__(self, prefList, parent):
+        SubfolderPreferences.__init__(self, prefList, parent)
+        self.prefsDefnL0 = DICT_VIDEO_SUBFOLDER_L0
+        self.defaultPrefs = DEFAULT_VIDEO_SUBFOLDER_PREFS
+        self.defaultRow = [DATE_TIME, VIDEO_DATE, LIST_DATE_TIME_L2[0]]
+        self.L1DateCheck = VIDEO_DATE
         
+    def _getMetadataComponent(self):
+        """
+        Returns portion of video / subfolder name based on the metadata
+        
+        Note: date time metadata found in _getDateComponent()
+        """
+        return getVideoMetadataComponent(self)        
+            
+class Sequences:
+    """ 
+    Holds sequence numbers and letters used in generating filenames.
+    The same instance of this class is shared among all threads.
+    """
+    def __init__(self,  downloadsToday,  storedSequenceNo):
         self.subfolderSequenceNo = {}
         self.sessionSequenceNo = 1
         self.sequenceLetter = 0
diff --git a/rapid/renamesubfolderprefstest.py b/rapid/renamesubfolderprefstest.py
index a689c5c..26afd97 100644
--- a/rapid/renamesubfolderprefstest.py
+++ b/rapid/renamesubfolderprefstest.py
@@ -35,6 +35,31 @@ class PreferenceTest (unittest.TestCase):
                                 [FILENAME, EXTENSION, LOWERCASE]
                             )
                             
+    video_name_test= (
+        [DATE_TIME, VIDEO_DATE, 'HHMMSS'],
+        [METADATA, CODEC, LOWERCASE],
+        [METADATA, FPS, ''],
+    )
+    
+    video_name_test2= (
+        [DATE_TIME, VIDEO_DATE, 'HHMMSS',
+        METADATA, CODEC, LOWERCASE,
+        METADATA, FPS, ''],
+    )
+    
+    video_name_test3= (
+        [FILENAME, VIDEO_NUMBER, IMAGE_NUMBER_4,
+        FILENAME, NAME_EXTENSION, LOWERCASE,
+        METADATA, FPS, ''],
+    )
+    
+    video_subfolder_test= (
+        [DATE_TIME, TODAY, 'HHMMSS',
+        SEPARATOR, '', '',
+        METADATA, WIDTH, ''],
+    )
+
+                            
     trueMetadataTest = ([FILENAME,  EXTENSION, LOWERCASE,  TEXT,  '', '',  METADATA,  APERTURE,  ''],  [METADATA,  APERTURE,  '',  TEXT,  '', '',  FILENAME,  EXTENSION, LOWERCASE],  )
     
     falseMetadataTest = ([FILENAME,  EXTENSION, LOWERCASE,  METADATA,  APERTURE,  '',  FILENAME,  NAME, LOWERCASE], 
@@ -52,6 +77,17 @@ class PreferenceTest (unittest.TestCase):
         for pref in self.image_test:
             result = checkPreferenceValid(DICT_IMAGE_RENAME_L0, pref)
             self.assertEqual(result, True)
+            
+    def testPrefVideoList(self):
+        for pref in self.video_name_test:
+            result = checkPreferenceValid(DICT_VIDEO_RENAME_L0, pref)
+            self.assertEqual(result, True)
+        for pref in self.video_name_test2:
+            result = checkPreferenceValid(DICT_VIDEO_RENAME_L0, pref)
+            self.assertEqual(result, True)
+        for pref in self.video_name_test3:
+            result = checkPreferenceValid(DICT_VIDEO_RENAME_L0, pref)
+            self.assertEqual(result, True)            
 
     def testSequencesList(self):
         for pref in self.sequences_test:
@@ -68,8 +104,6 @@ class PreferenceTest (unittest.TestCase):
             p = ImageRenamePreferences(i,  None)
             result = p.needImageMetaDataToCreateUniqueName()
             self.assertEqual(result, False)
-            
-        
 
     def testLargePrefList(self):
         prefList = []
@@ -84,6 +118,11 @@ class PreferenceTest (unittest.TestCase):
         for pref in self.subfolder_test:
             result = checkPreferenceValid(DICT_SUBFOLDER_L0, pref)
             self.assertEqual(result, True)
+            
+    def testPrefVideoSubfolderList(self):
+        for pref in self.video_subfolder_test:
+            result = checkPreferenceValid(DICT_VIDEO_SUBFOLDER_L0, pref)
+            self.assertEqual(result, True)            
     
     def testDateTimeL2Length(self):
         self.assertEqual(len(LIST_DATE_TIME_L2), len(DATE_TIME_CONVERT))
@@ -107,6 +146,12 @@ class BadPreferences(unittest.TestCase):
                         [DATE_TIME, None, None],
                         [DATE_TIME, '', ''],
                         )
+
+    bad_image_key2 = (
+        [FILENAME, VIDEO_NUMBER, IMAGE_NUMBER_4,
+        FILENAME, NAME_EXTENSION, LOWERCASE,
+        METADATA, APERTURE, ''],
+    )
                             
     bad_subfolder_key = ([FILENAME, NAME_EXTENSION, UPPERCASE],)
     
@@ -145,12 +190,18 @@ class BadPreferences(unittest.TestCase):
             self.assertRaises(PrefKeyError, checkPreferenceValid,
                                         DICT_IMAGE_RENAME_L0,
                                         pref)
+        for pref in self.bad_image_key2:
+            self.assertRaises(PrefKeyError, checkPreferenceValid, 
+                                        DICT_IMAGE_RENAME_L0, 
+                                        pref)
+                                        
             
     def testBadImageValue(self):
         for pref in self.bad_image_value:
             self.assertRaises(PrefValueInvalidError, checkPreferenceValid, 
                                         DICT_IMAGE_RENAME_L0, 
-                                        pref)
+                                        pref)                                        
+        
                                         
     def testBadSubfolderKey(self):
         for pref in self.bad_subfolder_key:
@@ -186,5 +237,11 @@ class BadPreferences(unittest.TestCase):
             s = SubfolderPreferences(pref, self)
             self.assertRaises(PrefValueKeyComboError, s.checkPrefsForValidity)
             
+    def testBadVideoSubfolderCombo(self):
+        
+        for pref in self.bad_subfolder_combos:
+            s = VideoSubfolderPreferences(pref, self)
+            self.assertRaises(PrefValueKeyComboError, s.checkPrefsForValidity)            
+            
 if __name__ == "__main__":
     unittest.main() 
diff --git a/rapid/videometadata.py b/rapid/videometadata.py
new file mode 100755
index 0000000..210da33
--- /dev/null
+++ b/rapid/videometadata.py
@@ -0,0 +1,187 @@
+#!/usr/bin/python
+# -*- coding: latin1 -*-
+
+### Copyright (C) 2007-10 Damon Lynch <damonlynch@gmail.com>
+
+### This program is free software; you can redistribute it and/or modify
+### it under the terms of the GNU General Public License as published by
+### the Free Software Foundation; either version 2 of the License, or
+### (at your option) any later version.
+
+### This program is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+### GNU General Public License for more details.
+
+### You should have received a copy of the GNU General Public License
+### along with this program; if not, write to the Free Software
+### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+DOWNLOAD_VIDEO = True
+
+import os
+import datetime
+import subprocess
+import tempfile
+
+import gtk
+import media
+import paths
+
+try:
+    import kaa.metadata
+except ImportError:
+    DOWNLOAD_VIDEO = False
+
+VIDEO_THUMBNAIL_FILE_EXTENSIONS = ['thm']
+VIDEO_FILE_EXTENSIONS = ['avi', 'mov', 'mp4']
+
+if DOWNLOAD_VIDEO:
+    
+    try:
+        subprocess.check_call(["ffmpegthumbnailer", "-h"], stdout=subprocess.PIPE)
+        ffmpeg = True
+    except:
+        ffmpeg = False
+
+    
+    def version_info():
+        return str(kaa.metadata.VERSION)
+    
+    class VideoMetaData():
+        def __init__(self, filename):
+            self.info = kaa.metadata.parse(filename)
+            self.filename = filename
+            self.filmstrip = gtk.gdk.pixbuf_new_from_file(paths.share_dir('glade3/filmstrip-100x75.xpm'))
+            self.FILMSTRIP_WIDTH = 100
+            self.FILMSTRIP_HEIGHT = 75
+            
+        def rpd_keys(self):
+            return self.info.keys()
+            
+        def _get(self, key, missing, stream=None):
+            if stream != None:
+                v = self.info['video'][stream][key]
+            else:
+                v = self.info[key]
+            if v:
+                return str(v)
+            else:
+                return missing
+            
+        def dateTime(self, missing=''):
+            dt = self._get('timestamp', missing=None)
+            if dt:
+                try:
+                    return datetime.datetime.fromtimestamp(self.info['timestamp'])
+                except:
+                    return missing
+            else:
+                return missing
+            
+        def codec(self, stream=0, missing=''):
+            return self._get('codec', missing, stream)
+            
+        def length(self, missing=''):
+            l = self._get('length', missing)
+            try:
+                l = '%.0f' % float(l)
+            except:
+                pass
+            return l
+            
+        def width(self, stream=0, missing=''):
+            return self._get('width', missing, stream)
+            
+        def height(self, stream=0, missing=''):
+            return self._get('height', missing, stream)
+            
+        def framesPerSecond(self, stream=0, missing=''):
+            fps = self._get('fps', missing, stream)
+            try:
+                fps = '%.0f' % float(fps)
+            except:
+                pass
+            return fps
+        
+        def fourcc(self, stream=0, missing=''):
+            return self._get('fourcc', missing, stream)
+            
+        def getThumbnailData(self, size, tempWorkingDir):
+            thm = media.getVideoThumbnailFile(self.filename)
+            if thm:
+                thumbnail = gtk.gdk.pixbuf_new_from_file_at_size(thm,  size,  size)
+                if thumbnail.get_width() <> self.FILMSTRIP_WIDTH or thumbnail.get_height() <> self.FILMSTRIP_HEIGHT:
+                    thumbnail = thumbnail.scale_simple(self.FILMSTRIP_WIDTH, self.FILMSTRIP_HEIGHT, gtk.gdk.INTERP_BILINEAR)
+                
+                self.filmstrip.composite(thumbnail, 0, 0, self.filmstrip.props.width, self.filmstrip.props.height, 0, 0, 1.0, 1.0, gtk.gdk.INTERP_HYPER, 255)
+            else:
+                if ffmpeg:
+                    tmp = tempfile.NamedTemporaryFile(dir=tempWorkingDir, prefix="rpd-tmp")
+                    tmp.close()
+                    
+                    thm = os.path.join(tempWorkingDir, tmp.name)
+                    
+                    try:
+                        subprocess.check_call(['ffmpegthumbnailer', '-i', self.filename, '-t', '10', '-f', '-o', thm, '-s', str(size)])
+                        thumbnail = gtk.gdk.pixbuf_new_from_file_at_size(thm,  size,  size)
+                        os.unlink(thm)
+                    except:
+                        thumbnail = None                    
+                else:
+                    thumbnail = None
+            return thumbnail
+        
+class DummyMetaData():
+    """
+    Class which gives metadata values for an imaginary video.
+    
+    Useful for displaying in preference examples etc. when no video is ready to
+    be downloaded.
+    
+    See VideoMetaData class for documentation of class methods.        
+    """
+    def __init__(self):
+        pass        
+    
+    def dateTime(self, missing=''):
+        return datetime.datetime.now()
+        
+    def codec(self, stream=0, missing=''):
+        return 'H.264 AVC'
+        
+    def length(self, missing=''):
+        return '57'
+        
+    def width(self, stream=0, missing=''):
+        return '1920'
+        
+    def height(self, stream=0, missing=''):
+        return '1080'
+        
+    def framesPerSecond(self, stream=0, missing=''):
+        return '24'
+    
+    def fourcc(self, stream=0, missing=''):
+        return 'AVC1'
+                    
+            
+if __name__ == '__main__':
+    import sys
+    
+    
+    if (len(sys.argv) != 2):
+        print 'Usage: ' + sys.argv[0] + ' path/to/video/containing/metadata'
+        sys.exit(0)
+
+    else:
+        m = VideoMetaData(sys.argv[1])
+        dt = m.dateTime()
+        if dt:
+            print dt.strftime('%Y%m%d-%H:%M:%S')
+        print "codec: %s" % m.codec()
+        print "%s seconds" % m.length()
+        print "%sx%s" % (m.width(), m.height())
+        print "%s fps" % m.framesPerSecond()
+        print "Fourcc: %s" % (m.fourcc())
+            
diff --git a/setup.py b/setup.py
index 2af92b4..0e2fa9f 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ class InstallData(install_data):
 
         return data_files
 
-package_data={'rapid': ['glade3/rapid.glade', 'glade3/rapid-photo-downloader-about.png', 'glade3/image-missing.svg']}
+package_data={'rapid': ['glade3/rapid.glade', 'glade3/rapid-photo-downloader-about.png', 'glade3/image-missing.svg', 'glade3/video.svg', 'glade3/filmstrip-100x75.xpm']}
 
 setup(name=name,
     version=version,
@@ -54,11 +54,12 @@ setup(name=name,
     maintainer='Damon Lynch',
     url='http://www.damonlynch.net/rapid',
     long_description=
-"""Rapid Photo Downloader is written by a photographer for
-professional and amateur photographers. It can download photos
-from multiple cameras, memory cards and Portable Storage Devices
-simultaneously. It provides many options for subfolder creation,
-image renaming and backup.""",
+"""Rapid Photo Downloader is written by a photographer for professional and
+amateur photographers. It can  download photos and videos from multiple
+cameras, memory cards and Portable Storage Devices simultaneously. It 
+provides many flexible, user-defined options for subfolder creation,
+photo and video renaming, and backup.
+""",
     packages = ['rapid'], 
     package_data=package_data, 
     scripts=['rapid-photo-downloader'],