Merge tag 'upstream/0.4.10'

Upstream version 0.4.10

1 files changed, 703 insertions, 598 deletions

diff --git a/po/nn.po b/po/nn.po
index 342e8a0..656f7c6 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-20 13:25-0600\n"
-"PO-Revision-Date: 2011-11-21 08:52+0000\n"
-"Last-Translator: Kevin Brubeck Unhammer <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-28 07:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:107 rapid/rapid.py:1699 rapid/glade3/rapid.ui.h:14
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:114
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:127
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:152
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Eining"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:170
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Storleik"
 
-#: rapid/rapid.py:173
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Nedlastingsframgang"
 
-#: rapid/rapid.py:319
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s vart ikkje avmontert"
@@ -66,22 +66,22 @@ msgstr "%(device)s vart ikkje avmontert"
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1186
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "leiter..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1697
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "rotmappa til filsystemet"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1701
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Lastar ned frå %(location)s."
 
-#: rapid/rapid.py:1702
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -89,15 +89,15 @@ msgstr ""
 "Vil du verkeleg lasta ned herfrå? På visse system kan det ta veldig lang tid "
 "å skanna dette."
 
-#: rapid/rapid.py:2124 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Last ned"
 
-#: rapid/rapid.py:2127
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pause"
 
-#: rapid/rapid.py:2228
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2231
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,187 @@ msgstr ""
 "Mappa er ugyldig:\n"
 "%s"
 
-#: rapid/rapid.py:2232
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Kan ikkje gå vidare med nedlasting"
 
-#: rapid/rapid.py:2559
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "bilete"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "videoar"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Omtrent eitt sekund igjen"
 
-#: rapid/rapid.py:2561
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Omtrent %i sekund igjen"
 
-#: rapid/rapid.py:2563
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Omtrent eitt minutt igjen"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2568
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Omtrent %(minutes)i minutt og %(seconds)02i sekund igjen"
 
-#: rapid/rapid.py:2590 rapid/rpdfile.py:113
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "bilete og videoar"
 
-#: rapid/rapid.py:2592 rapid/rpdfile.py:115
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "bilete eller videoar"
 
-#: rapid/rapid.py:2595 rapid/rapid.py:3408 rapid/rpdfile.py:118
-msgid "videos"
-msgstr "videoar"
-
-#: rapid/rapid.py:2597 rapid/preferencesdialog.py:1617 rapid/rpdfile.py:120
-#: rapid/rpdfile.py:254
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2600 rapid/rapid.py:3406 rapid/rpdfile.py:123
-msgid "photos"
-msgstr "bilete"
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2602 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:125
-#: rapid/rpdfile.py:234
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "bilete"
 
-#: rapid/rapid.py:2629
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Lasta ned %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2633
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Klarte ikkje å laste ned %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2636 rapid/rapid.py:2688
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "åtvaringar"
 
-#: rapid/rapid.py:2645
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Alle nedlastingar er ferdige"
 
-#: rapid/rapid.py:2651 rapid/rapid.py:2660 rapid/rapid.py:2669
-#: rapid/rapid.py:2678 rapid/rapid.py:2686
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2653 rapid/rapid.py:2671
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s lasta ned"
 
-#: rapid/rapid.py:2662 rapid/rapid.py:2680
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Klarte ikkje å laste ned %(filetype)s"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2719
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s av %(total)s %(filetypes)s (%(remaining)s igjen)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2726
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s av %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3072
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Frå"
 
-#: rapid/rapid.py:3080
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Oppdag automatisk"
 
-#: rapid/rapid.py:3084 rapid/preferencesdialog.py:1324
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Vel ei mappe med %(file_types)s"
 
-#: rapid/rapid.py:3125
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Kopier"
 
-#: rapid/rapid.py:3138
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Flytt"
 
-#: rapid/rapid.py:3160
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Til"
 
-#: rapid/rapid.py:3167 rapid/rapid.py:3796
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Bilete:"
 
-#: rapid/rapid.py:3170 rapid/preferencesdialog.py:1161
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Vel ei mappe å laste inn bilete til"
 
-#: rapid/rapid.py:3182 rapid/rapid.py:3796
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Videoar:"
 
-#: rapid/rapid.py:3184 rapid/preferencesdialog.py:1179
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Vel ei mappe å laste inn video til"
 
-#: rapid/rapid.py:3376
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "og"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Nyttar einingar for tryggleikskopiering"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Nyttar eining for tryggleikskopiering"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Fann ingen einingar for tryggleikskopiering"
 
-#: rapid/rapid.py:3412
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Ledig plass:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:3424
+#: rapid/rapid.py:3698
 #, python-format
 msgid "(%(file_type)s)"
 msgstr "(%(file_type)s)"
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:3428
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +305,87 @@ msgstr "%(free)s %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:3433
+#: rapid/rapid.py:3707
 msgid "; "
 msgstr "; "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:3438
+#: rapid/rapid.py:3712
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3444
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s tilgjengeleg"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3452
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Tek tryggleikskopi av bilete og videoar til %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3455
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Tek tryggleikskopi til %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3458
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Tek tryggleikskopi av bilete  til %(path)s og videoar til %(path2)s"
 
-#: rapid/rapid.py:3465
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3494
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Programinnstillingane er ugyldige"
 
-#: rapid/rapid.py:3613 rapid/rpdfile.py:235
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Bilete"
 
-#: rapid/rapid.py:3615 rapid/rpdfile.py:255
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3624
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "Nedlastingsmappa til %(file_type)s finst ikkje"
 
-#: rapid/rapid.py:3626 rapid/rapid.py:3640 rapid/rapid.py:3653
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Mappe: %s"
 
-#: rapid/rapid.py:3638
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "Nedlastingsmappa til %(file_type)s er ugyldig"
 
-#: rapid/rapid.py:3651
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "Nedlastingsmappa til %(file_type)s er ikkje skrivbar"
 
-#: rapid/rapid.py:3729
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Miniatyrbilete"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3777
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,43 +394,68 @@ msgstr ""
 "vis programinformasjon på kommandolinja når programmet køyrer \n"
 "(standard: %default)"
 
-#: rapid/rapid.py:3778
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "vis avlusingsinformasjon ved køyring frå kommandolinja"
 
-#: rapid/rapid.py:3779
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "vis berre feil på kommandolinja"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "vis kva for bilet- og videofiltypane programmet gjenkjenner, og avslutt"
 
-#: rapid/rapid.py:3783
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+"oppdag automatisk einingar du vil lasta ned frå, overstyrer eksisterande "
+"innstillingar"
+
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+"manuelt spesifiser stien til eininga du vil lasta ned frå, overstyrer "
+"eksisterande innstillingar"
+
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "nullstill alle programinnstillingar og avslutt"
 
-#: rapid/rapid.py:3801
+#: rapid/rapid.py:4110
+msgid ""
+"Error: specify device auto-detection or manually specify a device's path "
+"from which to download, but do not do both."
+msgstr ""
+"Feil: Bruk auto-oppdaging av einingar eller oppgi ei sti til ei eining du "
+"vil lasta ned frå, men ikkje gjer begge på ein gong."
+
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "og %s"
 
-#: rapid/rapid.py:3809
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Alle innstillingar er nullstilte"
 
-#: rapid/backupfile.py:142 rapid/backupfile.py:165
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Feil ved tryggleikskopiering"
 
-#: rapid/backupfile.py:144
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Klarte ikkje å opprette målmappa %(directory)s\n"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -428,13 +464,29 @@ msgstr ""
 "Kjelde: %(source)s\n"
 "Mål: %(destination)s"
 
-#: rapid/backupfile.py:149 rapid/backupfile.py:169
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Feil: %(inst)s"
 
-#: rapid/copyfiles.py:159 rapid/subfolderfile.py:211
-#: rapid/subfolderfile.py:352 rapid/subfolderfile.py:370
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -443,492 +495,506 @@ msgstr ""
 "%(problem)s\n"
 "Fil: %(file)s"
 
-#: rapid/device.py:79
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Oppdaga eining"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:88
+#: rapid/device.py:89
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr "Vil du laste ned bilete eller videoar frå denne eininga/partisjonen?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:107
+#: rapid/device.py:108
 msgid "_Remember this choice"
 msgstr "_Hugs dette valet"
 
-#: rapid/downloadtracker.py:298
+#: rapid/downloadtracker.py:299
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr "Dato tid"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Filnamn"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/generatenameconfig.py:154
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Sekvensar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:156 rapid/preferencesdialog.py:574
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
 msgid "Job code"
 msgstr "Jobbnamn"
 
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Biletdato"
 
-#: rapid/generatenameconfig.py:158
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Videodato"
 
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Idag"
 
-#: rapid/generatenameconfig.py:160
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Igår"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:162
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Nedlastingstidspunkt"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Namn + filtype"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Namn"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Filtype"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Bilettal"
 
-#: rapid/generatenameconfig.py:171
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Videotal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:173
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Blenderopning"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:175
+#: rapid/generatenameconfig.py:176
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:177
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "Lukketid"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:179
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr "Brennvidde"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:181
+#: rapid/generatenameconfig.py:182
 msgid "Camera make"
 msgstr "Kameramerke"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:183
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:185
+#: rapid/generatenameconfig.py:186
 msgid "Short camera model"
 msgstr "Kort kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
 msgstr "Bindestrek, kort kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "Eksponeringsteljar"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:194
 msgid "File number"
 msgstr "Filnummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:196
 msgid "Folder only"
 msgstr "Berre mappa"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:198
 msgid "Folder and file"
 msgstr "Mappe og fil"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr "Namn på eigar"
 
-#: rapid/generatenameconfig.py:200
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Breidd"
 
-#: rapid/generatenameconfig.py:202
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Høgd"
 
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Lengd"
 
-#: rapid/generatenameconfig.py:204
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Bilet per sekund"
 
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:206
 msgid "Artist"
 msgstr "Kunstnar"
 
-#: rapid/generatenameconfig.py:206
+#: rapid/generatenameconfig.py:207
 msgid "Copyright"
 msgstr "Opphavsrett"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:208
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr "Nedlastingar idag"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:210
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
 msgstr "Øktteljar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:212
+#: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
 msgstr "Undermappeteljar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:214
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
 msgstr "Lagra tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:216
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
 msgstr "Sekvensbokstav"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
 msgstr "Alle tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr "Siste tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
 msgstr "Siste to tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
 msgstr "Siste tre tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
 msgstr "Siste fire tal"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:229
 msgid "Original Case"
 msgstr "Opphavleg Versalisering"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr "STORE BOKSTAVAR"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "små bokstavar"
 
-#: rapid/generatenameconfig.py:233
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Eitt tal"
 
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "To tal"
 
-#: rapid/generatenameconfig.py:235
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Tre tal"
 
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Fire tal"
 
-#: rapid/generatenameconfig.py:237
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Fem tal"
 
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Seks tal"
 
-#: rapid/generatenameconfig.py:239
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Sju tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:241
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
 msgstr "Delsekund"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:243
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:245
+#: rapid/generatenameconfig.py:246
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:247
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:249
+#: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:251
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:253
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:255
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:257
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:259
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:261
+#: rapid/generatenameconfig.py:262
 msgid "YYYY"
 msgstr "ÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:263
+#: rapid/generatenameconfig.py:264
 msgid "YY"
 msgstr "ÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:265
+#: rapid/generatenameconfig.py:266
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:267
+#: rapid/generatenameconfig.py:268
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:269
+#: rapid/generatenameconfig.py:270
+msgid "Month (full)"
+msgstr "Månad (heile)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:272
+msgid "Month (abbreviated)"
+msgstr "Månad (forkorta)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
 msgid "HHMMSS"
 msgstr "TTMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:271
+#: rapid/generatenameconfig.py:276
 msgid "HHMM"
 msgstr "TTMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:273
+#: rapid/generatenameconfig.py:278
 msgid "HH-MM-SS"
 msgstr "TT-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:275
+#: rapid/generatenameconfig.py:280
 msgid "HH-MM"
 msgstr "TT-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:277
+#: rapid/generatenameconfig.py:282
 msgid "HH"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:279
+#: rapid/generatenameconfig.py:284
 msgid "MM (minutes)"
 msgstr "MM (minutt)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:281
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr "SS"
 
-#: rapid/preferencesdialog.py:371
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Innstillingane for undermapper burde ikkje byrje med %s"
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Innstillingane for undermapper burde ikkje ende med %s"
 
-#: rapid/preferencesdialog.py:377
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Innstillingane for undermapper burde ikkje ha to %s etter kvarandre"
 
-#: rapid/preferencesdialog.py:436 rapid/preferencesdialog.py:697
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr "Fjern alle jobbnamn?"
 
-#: rapid/preferencesdialog.py:437 rapid/preferencesdialog.py:714
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr "Skal alle jobbnamn fjernast?"
 
-#: rapid/preferencesdialog.py:443
+#: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
 msgstr "Fjern alle hugsa søkjestiar?"
 
-#: rapid/preferencesdialog.py:444
+#: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
 msgstr "Skal alle hugsa søkjestiar fjernast?"
 
-#: rapid/preferencesdialog.py:450
+#: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
 msgstr "Fjern alle oversedde søkjestiar?"
 
-#: rapid/preferencesdialog.py:451
+#: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
 msgstr "Skal alle oversedde søkjestiar fjernast?"
 
-#: rapid/preferencesdialog.py:462
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr "Feil i innstillingane til biletomdøping"
 
-#: rapid/preferencesdialog.py:642
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr "Feil i innstillingane til videoomdøping"
 
-#: rapid/preferencesdialog.py:663
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Feil i innstillingane til undermapper for biletnedlasting"
 
-#: rapid/preferencesdialog.py:680
+#: rapid/preferencesdialog.py:683
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Feil i innstillingane til undermapper for videonedlasting"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:742
 msgid "Enter a Job Code"
 msgstr "Skriv inn eit jobbnamn"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:755
+#: rapid/preferencesdialog.py:758
 msgid "Enter a new Job Code, or select a previous one"
 msgstr "Skriv inn eit jobbnamn, eller vel eit du har nytta tidlegare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:758
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr "Skriv inn eit nytt jobbnamn"
 
-#: rapid/preferencesdialog.py:763
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr "Jobbnamn:"
 
-#: rapid/preferencesdialog.py:819
+#: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
 msgstr "Oppgi ein søkjesti å oversjå"
 
-#: rapid/preferencesdialog.py:831
+#: rapid/preferencesdialog.py:834
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Oppgi ein sti som du vil aldri skal gjennomsøkjast etter bilete eller videoar"
 
-#: rapid/preferencesdialog.py:836
+#: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr "Sti:"
 
-#: rapid/preferencesdialog.py:1079
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Jobbnamn"
 
-#: rapid/preferencesdialog.py:1350
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Vel ei mappe kor du vil tryggleikskopiera bilete"
 
-#: rapid/preferencesdialog.py:1363
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Vel ei mappe kor du vil tryggleikskopiera videoar"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1458
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -936,7 +1002,7 @@ msgstr ""
 "<i><b>Åtvaring:</b> Det er ikkje nok metadata for å fullt ut\n"
 "generere namnet. Ver vennleg og nytt andre omdøpingsval.</i>"
 
-#: rapid/preferencesdialog.py:1509
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -945,13 +1011,13 @@ msgstr ""
 "generere undermappene. Ver vennleg og nytt andre omdøpingsval.</i><"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Døme: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1602
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -962,7 +1028,7 @@ msgstr ""
 "og kan ikkje nyttast.\n"
 "Dei blir endra til standardverdiar."
 
-#: rapid/preferencesdialog.py:1747
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -973,7 +1039,7 @@ msgstr ""
 "endrar dei:\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1749
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -984,142 +1050,147 @@ msgstr ""
 "endrar det:\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Ugyldig regulært uttrykk"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1931
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "eksterndisk1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1933
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "eksterndisk2"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Prague"
 msgstr "Praha"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr "Moskva"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr "Warszawa"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:363
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "undermappe"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:361
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "filnamn"
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Dato-/tidsverdien %s synest ugyldig."
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Filnamnet manglar filending."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:83
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Filnamnet manglar nummerdelen."
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Feil ved oppretting av %s-komponenten."
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "Klarte ikkje å lesa metadata i %(filetype)s."
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "Klarte ikkje å oppretta %(filetype)s %(area)s."
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Ein feil oppstod ved kopiering av %(filetype)s"
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s finst allereie"
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1128,7 +1199,7 @@ msgstr ""
 "Kunne ikkje ta tryggleikskopi av %(filetype)s, fann inga målmappe for "
 "tryggleikskopiar."
 
-#: rapid/problemnotification.py:102
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1137,12 +1208,12 @@ msgstr ""
 "%(image1)s vart teke den %(image1_date)s kl. %(image1_time)s, og %(image2)s "
 "den %(image2_date)s kl. %(image2_time)s."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s er allereie lasta ned"
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1151,538 +1222,562 @@ msgstr ""
 "Den eksisterande %(filetype)s-en vart sist endra sist den %(date)s kl. "
 "%(time)s, og har fått «%(identifier)s» som unik ID."
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "Den eksisterande %(filetype)s-en var sist endra den %(date)s kl. %(time)s."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Manglar data for å namngi %(filetype)s."
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Feil: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Metadataen kan vera korrupt."
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr "Filnamnet, filendinga og Exif-informasjonen er allereie overført."
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Han vart tryggleikskopiert til %(volume)s"
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Han vart tryggleikskopiert til dei følgjande einingane: "
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s og %(final_volume)s."
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr "Fann bilete med same filnamn, men tekne ved ulike tider: %(details)s"
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Ein feil oppstod ved tryggleikskopiering til %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Ein feil oppstod ved tryggleikskopiering til %(volume)s."
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Ein feil oppstod ved tryggleikskopiering til følgjande einingar: "
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s og %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:276
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s og %(volume)s."
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Tryggleikskopien finst allereie på %(volume)s."
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Tryggleikskopien finst allereie på følgjande stader: "
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Tryggleikskopien vart overskriven på %(volume)s."
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Tryggleikskopien vart overskriven på følgjande einingar: "
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Ein feil oppstod ved oppretting av mapper på %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Feil oppstod ved oppretting av mapper på følgjande einingar for "
 "tryggleikskopiering: "
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s I tillegg, %(newproblem)s"
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " I tillegg oppstod %(problems)s."
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " I tillegg oppstod %(problem)s."
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)s-metadataen manglar."
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Følgjande metadata manglar: "
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:363
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problem ved oppretting av undermappe og filnamn"
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem ved oppretting av undermappe og filnamn"
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problem ved oppretting av %s"
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem ved oppretting av %s"
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s finst allereie, men blei tryggleikskopiert"
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Ein feil oppstod ved kopiering av %(filetype)s-en, men han blei "
 "tryggleikskopiert"
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Fleire feil oppstod"
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr "Fann bilete med like filnamn, tatt på ulike datoar"
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "det oppstod feil i tryggleikskopieringa"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Det oppstod feil i tryggleikskopieringa"
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "det oppstod ein feil i tryggleikskopieringa"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Det oppstod ein feil i tryggleikskopieringa"
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, og %(backinguperror)s"
 
-#: rapid/rpdfile.py:139
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr "skannar (fann %(photos)s bilete og %(videos)s videoar) …"
+
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:300
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "undermappe og filnamn"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Biletet er allereie lasta ned"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Kjelde: %(source)s"
 
-#: rapid/subfolderfile.py:359
-msgid "subfolder and filename"
-msgstr "undermappe og filnamn"
-
-#: rapid/subfolderfile.py:397
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Klarte ikkje å lasta ned undermappa"
 
-#: rapid/subfolderfile.py:398
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Sti: %s"
 
 #: rapid/glade3/rapid.ui.h:1
 msgid "About..."
-msgstr "Om …"
+msgstr "Om …"
 
 #: rapid/glade3/rapid.ui.h:2
-msgid "Check All"
-msgstr "Merk alle"
+msgid "_Check All"
+msgstr "_Merk alle"
 
 #: rapid/glade3/rapid.ui.h:3
 msgid "Check All Photos"
-msgstr "Merk alle bilete"
+msgstr "Sjekk alle bilete"
 
 #: rapid/glade3/rapid.ui.h:4
 msgid "Check All Videos"
-msgstr "Merk alle videoar"
+msgstr "Sjekk alle videoar"
 
-#: rapid/glade3/rapid.ui.h:6
-msgid "Download / Pause"
-msgstr "Last ned / Pause"
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Doner..."
 
 #: rapid/glade3/rapid.ui.h:7
-msgid "Get Help Online..."
-msgstr "Få hjelp på nettet …"
+msgid "_Get Help Online..."
+msgstr "_Få hjelp på nettet..."
 
 #: rapid/glade3/rapid.ui.h:8
 msgid "Help"
 msgstr "Hjelp"
 
 #: rapid/glade3/rapid.ui.h:9
-msgid "Make a Donation..."
-msgstr "Doner …"
+msgid "Preferences"
+msgstr "Innstillingar"
 
 #: rapid/glade3/rapid.ui.h:10
-msgid "Next File"
-msgstr "Neste fil"
+msgid "Quit"
+msgstr "Avslutt"
 
 #: rapid/glade3/rapid.ui.h:11
-msgid "Preferences"
-msgstr "Innstillingar"
+msgid "Refresh"
+msgstr "Frisk opp att"
 
 #: rapid/glade3/rapid.ui.h:12
-msgid "Previous File"
-msgstr "Førre fil"
+msgid "_Report a Problem..."
+msgstr "_Meld frå om eit problem"
 
 #: rapid/glade3/rapid.ui.h:13
-msgid "Quit"
-msgstr "Avslutt"
+msgid "Translate this Application..."
+msgstr "Omsett denne applikasjonen …"
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "Refresh"
-msgstr "Oppdater"
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "Merk _ingen"
 
 #: rapid/glade3/rapid.ui.h:16
-msgid "Report a Problem..."
-msgstr "Rapporter eit problem …"
+msgid "_File"
+msgstr "_Fil"
 
 #: rapid/glade3/rapid.ui.h:17
-msgid "Select All Wit_h Job Code"
-msgstr "Vel alle med _jobbnamn"
+msgid "Download / Pause"
+msgstr "Last ned / Pause"
 
 #: rapid/glade3/rapid.ui.h:18
-msgid "Select All Without _Job Code"
-msgstr "Vel alle _utan jobbnamn"
+msgid "_Select"
+msgstr "_Vel"
 
 #: rapid/glade3/rapid.ui.h:19
-msgid "Translate this Application..."
-msgstr "Omsett dette programmet …"
+msgid "Select All Without _Job Code"
+msgstr "Vel alle _utan jobbnamn"
 
 #: rapid/glade3/rapid.ui.h:20
-msgid "Uncheck All"
-msgstr "Merk ingen"
+msgid "Select All Wit_h Job Code"
+msgstr "Vel alle med _jobbnamn"
 
 #: rapid/glade3/rapid.ui.h:21
-msgid "_Check All"
-msgstr "_Merk alle"
+msgid "_View"
+msgstr "_Vis"
 
 #: rapid/glade3/rapid.ui.h:22
-msgid "_Clear Completed Downloads"
-msgstr "_Fjern fullførte nedlastingar"
+msgid "_Error Log"
+msgstr "_Feillogg"
 
 #: rapid/glade3/rapid.ui.h:23
-msgid "_Download"
-msgstr "_Last ned"
+msgid "_Clear Completed Downloads"
+msgstr "_Fjern fullførte nedlastingar"
 
 #: rapid/glade3/rapid.ui.h:24
-msgid "_Error Log"
-msgstr "_Feillogg"
+msgid "Previous File"
+msgstr "Førre fil"
 
 #: rapid/glade3/rapid.ui.h:25
-msgid "_File"
-msgstr "_Fil"
+msgid "Next File"
+msgstr "Neste fil"
 
 #: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Hjelp"
 
 #: rapid/glade3/rapid.ui.h:27
-msgid "_Include in download"
-msgstr "Inkluder i _nedlastinga"
-
-#: rapid/glade3/rapid.ui.h:28
-msgid "_Make a Donation..."
-msgstr "_Doner..."
-
-#: rapid/glade3/rapid.ui.h:29
-msgid "_Select"
-msgstr "_Vel"
-
-#: rapid/glade3/rapid.ui.h:30
 msgid "_Translate this Application..."
 msgstr "_Omset dette programmet..."
 
-#: rapid/glade3/rapid.ui.h:31
-msgid "_Uncheck All"
-msgstr "Merk _ingen"
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr "Inkluder i _nedlastinga"
 
-#: rapid/glade3/rapid.ui.h:32
-msgid "_View"
-msgstr "_Vis"
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
+msgstr "_Last ned"
 
 #: rapid/glade3/prefs.ui.h:1
-msgid " "
-msgstr " "
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "Innstillingar: Rapid Photo Downloader"
 
 #: rapid/glade3/prefs.ui.h:2
-msgid " hh:mm"
-msgstr " tt:mm"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Biletnedlastingsmapper</span>"
 
 #: rapid/glade3/prefs.ui.h:3
-msgid ":"
-msgstr ":"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Døme: /home/brukar/Bilete</i>"
 
 #: rapid/glade3/prefs.ui.h:4
-msgid "<b>Backup</b>"
-msgstr "<b>Tryggleikskopi</b>"
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Nedlastingsundermapper</b>"
 
 #: rapid/glade3/prefs.ui.h:5
-msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr "<b>Kompatibilitet med andre operativsystem</b>"
+msgid "Download folder:"
+msgstr "Nedlastingsmappe:"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Download Folder</b>"
-msgstr "<b>Nedlastingsmappe</b>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
+"automatisk oppretta undermapper for dei nedlasta bileta i denne mappa."
 
 #: rapid/glade3/prefs.ui.h:7
-msgid "<b>Download Subfolders</b>"
-msgstr "<b>Nedlastingsundermapper</b>"
+msgid "<b>Download Folder</b>"
+msgstr "<b>Nedlastingsmappe</b>"
 
 #: rapid/glade3/prefs.ui.h:8
-msgid "<b>Example</b>"
-msgstr "<b>Døme</b>"
+msgid "Photo Folders"
+msgstr "Biletmapper"
 
 #: rapid/glade3/prefs.ui.h:9
-msgid "<b>Job Codes</b>"
-msgstr "<b>Jobbnamn</b>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av bilete</span>\t"
 
 #: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Omdøping av bilete</b>"
 
 #: rapid/glade3/prefs.ui.h:11
-msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr "<b>Namnekonfliktar i bilete og video</b>"
+msgid " "
+msgstr " "
 
 #: rapid/glade3/prefs.ui.h:12
-msgid "<b>Program Automation</b>"
-msgstr "<b>Automatisering</b>"
+msgid "<i>New:</i>"
+msgstr "<i>Ny:</i>"
 
 #: rapid/glade3/prefs.ui.h:13
-msgid "<b>Sequence Numbers</b>"
-msgstr "<b>Sekvenstal</b>"
+msgid "<i>Original:</i>"
+msgstr "<i>Opphavleg:</i>"
 
 #: rapid/glade3/prefs.ui.h:14
-msgid "<i>/media/externaldrive/Photos</i>"
-msgstr "<i>/media/eksterndisk/Bilete</i>"
+msgid "<b>Example</b>"
+msgstr "<b>Døme</b>"
 
 #: rapid/glade3/prefs.ui.h:15
-msgid "<i>Example: /home/user/Pictures</i>"
-msgstr "<i>Døme: /home/brukar/Bilete</i>"
+msgid "Photo Rename"
+msgstr "Omdøping av bilete"
 
 #: rapid/glade3/prefs.ui.h:16
-msgid "<i>Example:</i>"
-msgstr "<i>Døme:</i>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</span>"
 
 #: rapid/glade3/prefs.ui.h:17
-msgid "<i>New:</i>"
-msgstr "<i>Ny:</i>"
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
+"for python, or <i>exiftool</i>."
+msgstr ""
+"Orsak, videonedlasting er skrudd av. Ver venleg og last ned anten python-"
+"pakkene <i>hachoir metadata</i> og <i>kaa metadata</i>, eller "
+"<i>exiftool</i>, for å lasta ned videoar."
 
 #: rapid/glade3/prefs.ui.h:18
-msgid "<i>Original:</i>"
-msgstr "<i>Opphavleg:</i>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
+"automatisk oppretta undermapper for dei nedlasta videoane i denne mappa."
 
 #: rapid/glade3/prefs.ui.h:19
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Tryggleikskopi</span>\t"
+msgid "Video Folders"
+msgstr "Videomapper"
 
 #: rapid/glade3/prefs.ui.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Einingsinnstillingar</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av videoar</span>\t"
 
 #: rapid/glade3/prefs.ui.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Einingar</span>"
+msgid "Video Rename"
+msgstr "Omdøping av videoar"
 
 #: rapid/glade3/prefs.ui.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Feilhandtering</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Omdøpingsval</span>"
 
 #: rapid/glade3/prefs.ui.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Jobbnamn</span>"
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Sekvenstal</b>"
 
 #: rapid/glade3/prefs.ui.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ymse</span>"
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
+msgstr ""
+"Oppgi tida i 24-timarsformat som sekvensteljaren <i>Nedlastingar idag</i> "
+"skal nullstillast til."
 
 #: rapid/glade3/prefs.ui.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Biletnedlastingsmapper</span>"
+msgid "Day start:"
+msgstr "Dag byrjar:"
 
 #: rapid/glade3/prefs.ui.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av bilete</span>\t"
+msgid "Downloads today:"
+msgstr "Nedlastingar idag:"
 
 #: rapid/glade3/prefs.ui.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Omdøpingsval</span>"
+msgid "Stored number:"
+msgstr "Lagra tal:"
 
 #: rapid/glade3/prefs.ui.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</span>"
+msgid ":"
+msgstr ":"
 
 #: rapid/glade3/prefs.ui.h:29
-msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av videoar</span>\t"
+msgid " hh:mm"
+msgstr " tt:mm"
 
 #: rapid/glade3/prefs.ui.h:30
-msgid "Add unique identifier"
-msgstr "Legg til unik identifikator"
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Synkroniser sekvenstal for RAW og JPEG"
 
 #: rapid/glade3/prefs.ui.h:31
-msgid "Automatically detect Portable Storage Devices"
-msgstr "Oppdag portable lagringseiningar automatisk"
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Kompatibilitet med andre operativsystem</b>"
 
 #: rapid/glade3/prefs.ui.h:32
-msgid "Automatically detect backup devices"
-msgstr "Oppdag einingar for tryggleikskopiering automatisk"
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
+msgstr ""
+"Oppgi om du vil fjerne teikn som andre operativsystem ikkje forstår frå "
+"bilete, videoar eller mappenamn."
 
 #: rapid/glade3/prefs.ui.h:33
-msgid "Automatically detect devices"
-msgstr "Oppdag einingar automatisk"
+msgid "Strip incompatible characters"
+msgstr "Fjern inkompatible teikn"
 
 #: rapid/glade3/prefs.ui.h:34
-msgid "Automatically rotate JPEG images"
-msgstr "Roter JPEG-bilete automatisk"
+msgid "Rename Options"
+msgstr "Omdøpingsval"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup"
-msgstr "Tryggleikskopi"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Jobbnamn</span>"
 
 #: rapid/glade3/prefs.ui.h:36
-msgid "Backup photos and videos when downloading"
-msgstr "Ta tryggleikskopi av bilete og videoar ved nedlasting"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Jobbnamn</b>"
 
 #: rapid/glade3/prefs.ui.h:37
-msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
-msgstr ""
-"Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
-"automatisk oppretta undermapper for dei nedlasta bileta i denne mappa."
-
-#: rapid/glade3/prefs.ui.h:38
-msgid ""
-"Choose the download folder. Subfolders for the downloaded videos will be "
-"automatically created in this folder using the structure specified below."
-msgstr ""
-"Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
-"automatisk oppretta undermapper for dei nedlasta videoane i denne mappa."
+msgid "_Add..."
+msgstr "_Legg til..."
 
 #: rapid/glade3/prefs.ui.h:39
-msgid "Day start:"
-msgstr "Dag byrjar:"
+msgid "R_emove All"
+msgstr "_Fjern alle"
 
 #: rapid/glade3/prefs.ui.h:40
-msgid "Device Options"
-msgstr "Val for einingar"
+msgid "Job Codes"
+msgstr "Jobbnamn"
 
 #: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Einingar</span>"
+
+#: rapid/glade3/prefs.ui.h:42
 msgid "Devices"
 msgstr "Einingar"
 
-#: rapid/glade3/prefs.ui.h:42
+#: rapid/glade3/prefs.ui.h:43
 msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
@@ -1705,36 +1800,30 @@ msgstr ""
 "Viss det fungerer dårleg eller ikkje i det heile, prøv å setja apparatet i "
 "PTP-modus. Viss det ikkje går an, må du bruka ein kortlesar.</i>"
 
-#: rapid/glade3/prefs.ui.h:47
-msgid "Download folder:"
-msgstr "Nedlastingsmappe:"
-
 #: rapid/glade3/prefs.ui.h:48
-msgid "Downloads today:"
-msgstr "Nedlastingar idag:"
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Oppdag portable lagringseiningar automatisk"
 
 #: rapid/glade3/prefs.ui.h:49
-msgid "Error Handling"
-msgstr "Feilhandtering"
+msgid "Automatically detect devices"
+msgstr "Oppdag einingar automatisk"
 
 #: rapid/glade3/prefs.ui.h:50
-msgid "Exit program even if download had warnings or errors"
-msgstr "Avslutt programmet sjølv om nedlastinga hadde feil eller åtvaringar"
-
-#: rapid/glade3/prefs.ui.h:51
-msgid "Exit program when download completes"
-msgstr "Avslutt programmet når nedlastinga er ferdig"
-
-#: rapid/glade3/prefs.ui.h:52
-msgid "Generate thumbnails (slower)"
-msgstr "Lag miniatyrbilete (treigare)"
-
-#: rapid/glade3/prefs.ui.h:53
 msgid ""
-"If you disable automatic detection, choose the exact backup locations."
+"If you enable automatic detection of Portable Storage Devices, the entire "
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
-"Viss du skrur av automatisk oppdaging, må du oppgi kor du vil ta "
-"tryggleikskopi til."
+"Viss du skrur på automatisk oppdaging på ei berbar lagringseining, vil heile "
+"eininga gjennomsøkjast. På store einingar kan dette ta litt tid.\n"
+"Når dette er skrudd på, og programmet oppdagar ei mogleg eining, vil det "
+"spørja deg om du vil søkja gjennom eininga eller ikkje."
+
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
+msgstr "Stad:"
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
@@ -1744,190 +1833,186 @@ msgstr ""
 "Viss du skrur av automatisk oppdaging, må du oppgi kor bileta og videoane er."
 
 #: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Einingsinnstillingar</span>"
+
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr "Hugsa stiar"
+
+#: rapid/glade3/prefs.ui.h:57
 msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned. On large devices, this could take some time.\n"
-"\n"
-"When this option is enabled, and a potential device is detected, you will be "
-"prompted to determine if it should be scanned or not."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
-"Viss du skrur på automatisk oppdaging på ei berbar lagringseining, vil heile "
-"eininga gjennomsøkjast. På store einingar kan dette ta litt tid.\n"
-"Når dette er skrudd på, og programmet oppdagar ei mogleg eining, vil det "
-"spørja deg om du vil søkja gjennom eininga eller ikkje."
+"Hugsa stiar er kopla til einingar som du har valt å alltid søkja gjennom, "
+"eller alltid oversjå, ved automatisk oppdaging av berbare lagringseiningar."
 
 #: rapid/glade3/prefs.ui.h:58
 msgid "Ignored Paths"
 msgstr "Oversedde stiar"
 
 #: rapid/glade3/prefs.ui.h:59
-msgid "Job Codes"
-msgstr "Jobbnamn"
-
-#: rapid/glade3/prefs.ui.h:60
-msgid "Location:"
-msgstr "Stad:"
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+"Oppgi endinga av stiane som du vil oversjå når du søkjer gjennom einingar "
+"etter bilete eller videoar. Stiar som ender med verdiane under vil ikkje bli "
+"gjennomsøkt."
 
 #: rapid/glade3/prefs.ui.h:61
-msgid "Miscellaneous"
-msgstr "Ymse"
+msgid "Re_move All"
+msgstr "_Fjern alle"
 
 #: rapid/glade3/prefs.ui.h:62
-msgid "Overwrite"
-msgstr "Overskriv"
+msgid "Use _python-style regular expressions"
+msgstr "Bruk _python sine regulære uttrykk"
 
 #: rapid/glade3/prefs.ui.h:63
-msgid "Performance"
-msgstr "Yting"
+msgid "Device Options"
+msgstr "Val for einingar"
 
 #: rapid/glade3/prefs.ui.h:64
-msgid "Photo Folders"
-msgstr "Biletmapper"
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Tryggleikskopi</span>\t"
 
 #: rapid/glade3/prefs.ui.h:65
-msgid "Photo Rename"
-msgstr "Omdøping av bilete"
+msgid "<b>Backup</b>"
+msgstr "<b>Tryggleikskopi</b>"
 
 #: rapid/glade3/prefs.ui.h:66
-msgid "Photo backup folder name:"
-msgstr "Mappenamn for tryggleikskopiering av bilete:"
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
+"Viss du skrur av automatisk oppdaging, må du oppgi kor du vil ta "
+"tryggleikskopi til."
 
 #: rapid/glade3/prefs.ui.h:67
-msgid "Photo backup location:"
-msgstr "Ta tryggleikskopi av bilete til:"
+msgid "Automatically detect backup devices"
+msgstr "Oppdag einingar for tryggleikskopiering automatisk"
 
 #: rapid/glade3/prefs.ui.h:68
-msgid "Preferences: Rapid Photo Downloader"
-msgstr "Innstillingar: Rapid Photo Downloader"
+msgid ""
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
+msgstr ""
+"Du kan ta tryggleikskopi av bilete og videoar til fleire stader når du "
+"lastar ned, t.d. til eksterne harddisker."
 
-#: rapid/glade3/prefs.ui.h:70
-msgid "R_emove All"
-msgstr "_Fjern alle"
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr "Ta tryggleikskopi av bilete og videoar ved nedlasting"
 
-#: rapid/glade3/prefs.ui.h:72
-msgid "Re_move All"
-msgstr "_Fjern alle"
+#: rapid/glade3/prefs.ui.h:70
+msgid ""
+"Specify the folder in which backups are stored on the device.  \n"
+"\n"
+"<i>Note: this will also be used to determine whether or not the device is "
+"used for backups. For each device you wish to use for backing up to, create "
+"a folder in it with one of these names.</i>"
+msgstr ""
+"Oppgi mappa på eininga kor tryggleikskopiar er lagra.  \n"
+"\n"
+"<i>Merk: dette blir au nytta for å finne ut om eininga er nytta til "
+"tryggleikskopiering. Lag ei mappe med eitt av desse namna på kvar eining som "
+"du vil ta tryggleikskopi til.</i>"
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Paths"
-msgstr "Hugsa stiar"
+msgid "Photo backup location:"
+msgstr "Ta tryggleikskopi av bilete til:"
 
 #: rapid/glade3/prefs.ui.h:74
-msgid ""
-"Remembered paths are those associated with devices that you have chosen to "
-"always scan or ignore when automatic detection of Portable Storage Devices "
-"is enabled."
-msgstr ""
-"Hugsa stiar er kopla til einingar som du har valt å alltid søkja gjennom, "
-"eller alltid oversjå, ved automatisk oppdaging av berbare lagringseiningar."
+msgid "Photo backup folder name:"
+msgstr "Mappenamn for tryggleikskopiering av bilete:"
 
 #: rapid/glade3/prefs.ui.h:75
-msgid "Rename Options"
-msgstr "Omdøpingsval"
+msgid "<i>Example:</i>"
+msgstr "<i>Døme:</i>"
 
 #: rapid/glade3/prefs.ui.h:76
-msgid "Skip"
-msgstr "Hopp over"
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/eksterndisk/Bilete</i>"
 
 #: rapid/glade3/prefs.ui.h:77
-msgid "Skip download"
-msgstr "Hopp over nedlasting"
+msgid "Video backup folder name:"
+msgstr "Mappenamn for tryggleikskopiering av video:"
 
 #: rapid/glade3/prefs.ui.h:78
-msgid ""
-"Sorry, video downloading functionality disabled. To download videos, please "
-"install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
-"for python, or <i>exiftool</i>."
-msgstr ""
-"Orsak, videonedlasting er skrudd av. Ver venleg og last ned anten python-"
-"pakkene <i>hachoir metadata</i> og <i>kaa metadata</i>, eller "
-"<i>exiftool</i>, for å lasta ned videoar."
+msgid "Video backup location:"
+msgstr "Ta tryggleikskopi av videoar til:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid ""
-"Specify the ending portion of any paths you want ignored when scanning "
-"devices for photos or videos. Any path ending with the values below will not "
-"be scanned."
+msgid "Back up"
 msgstr ""
-"Oppgi endinga av stiane som du vil oversjå når du søkjer gjennom einingar "
-"etter bilete eller videoar. Stiar som ender med verdiane under vil ikkje bli "
-"gjennomsøkt."
 
 #: rapid/glade3/prefs.ui.h:80
-msgid ""
-"Specify the folder in which backups are stored on the device.  \n"
-"\n"
-"<i>Note: this will also be used to determine whether or not the device is "
-"used for backups. For each device you wish to use for backing up to, create "
-"a folder in it with one of these names.</i>"
-msgstr ""
-"Oppgi mappa på eininga kor tryggleikskopiar er lagra.  \n"
-"\n"
-"<i>Merk: dette blir au nytta for å finne ut om eininga er nytta til "
-"tryggleikskopiering. Lag ei mappe med eitt av desse namna på kvar eining som "
-"du vil ta tryggleikskopi til.</i>"
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Ymse</span>"
 
-#: rapid/glade3/prefs.ui.h:83
-msgid ""
-"Specify the time in 24 hour format at which the <i>Downloads today</i> "
-"sequence number should be reset."
-msgstr ""
-"Oppgi tida i 24-timarsformat som sekvensteljaren <i>Nedlastingar idag</i> "
-"skal nullstillast til."
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
+msgstr "<b>Automatisering</b>"
 
-#: rapid/glade3/prefs.ui.h:84
-msgid ""
-"Specify whether photo, video and folder names should have any characters "
-"removed that are not allowed by other operating systems."
-msgstr ""
-"Oppgi om du vil fjerne teikn som andre operativsystem ikkje forstår frå "
-"bilete, videoar eller mappenamn."
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Avmonter (kople ut) eining når nedlastinga er fullført"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:83
 msgid "Start downloading at program startup"
 msgstr "Gå i gang med å laste ned bilete når programmet startar"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading upon device insertion"
 msgstr "Gå i gang med å laste ned når einingar blir kopla til"
 
-#: rapid/glade3/prefs.ui.h:87
-msgid "Stored number:"
-msgstr "Lagra tal:"
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr "Avslutt programmet når nedlastinga er ferdig"
 
-#: rapid/glade3/prefs.ui.h:88
-msgid "Strip incompatible characters"
-msgstr "Fjern inkompatible teikn"
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr "Avslutt programmet sjølv om nedlastinga hadde feil eller åtvaringar"
+
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr "Roter JPEG-bilete automatisk"
 
 #: rapid/glade3/prefs.ui.h:89
-msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr "Synkroniser sekvenstal for RAW og JPEG"
+msgid "Verify files as they are downloaded"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:90
-msgid "Unmount (\"eject\") device upon download completion"
-msgstr "Avmonter (kople ut) eining når nedlastinga er fullført"
+msgid "Performance"
+msgstr "Yting"
 
 #: rapid/glade3/prefs.ui.h:91
-msgid "Use _python-style regular expressions"
-msgstr "Bruk _python sine regulære uttrykk"
+msgid "Generate thumbnails (slower)"
+msgstr "Lag miniatyrbilete (treigare)"
 
 #: rapid/glade3/prefs.ui.h:92
-msgid "Video Folders"
-msgstr "Videomapper"
+msgid "Miscellaneous"
+msgstr "Ymse"
 
 #: rapid/glade3/prefs.ui.h:93
-msgid "Video Rename"
-msgstr "Omdøping av videoar"
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Feilhandtering</span>"
 
 #: rapid/glade3/prefs.ui.h:94
-msgid "Video backup folder name:"
-msgstr "Mappenamn for tryggleikskopiering av video:"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Namnekonfliktar i bilete og video</b>"
 
 #: rapid/glade3/prefs.ui.h:95
-msgid "Video backup location:"
-msgstr "Ta tryggleikskopi av videoar til:"
+msgid "Add unique identifier"
+msgstr "Legg til unik identifikator"
 
 #: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "Hopp over nedlasting"
+
+#: rapid/glade3/prefs.ui.h:97
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
@@ -1935,7 +2020,7 @@ msgstr ""
 "Vel om du skal hoppe over fila eller leggje til ein unik identifikator når "
 "eit bilete eller ein video med det same namnet allereie er lasta ned."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1943,17 +2028,17 @@ msgstr ""
 "Ved tryggleikskopiering, vel om du skal overskrive filer på eininga som har "
 "same namn, eller hoppe over den fila."
 
-#: rapid/glade3/prefs.ui.h:98
-msgid ""
-"You can have your photos and videos backed up to multiple locations as they "
-"are downloaded, e.g. external hard drives."
-msgstr ""
-"Du kan ta tryggleikskopi av bilete og videoar til fleire stader når du "
-"lastar ned, t.d. til eksterne harddisker."
-
 #: rapid/glade3/prefs.ui.h:99
-msgid "_Add..."
-msgstr "_Legg til..."
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Hopp over"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr "Feilhandtering"
 
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
@@ -2157,6 +2242,9 @@ msgstr "Importer bileta og videoane dine trygt og effektivt"
 #~ msgid "Automation"
 #~ msgstr "Automatisering"
 
+#~ msgid "Backup"
+#~ msgstr "Tryggleikskopi"
+
 #~ msgid "Backup location:"
 #~ msgstr "Kopier til:"
 
@@ -2206,8 +2294,25 @@ msgstr "Importer bileta og videoane dine trygt og effektivt"
 #~ "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
 #~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Få hjelp på nettet..."
+#~ msgid "Select an image folder"
+#~ msgstr "Vel ei biletmappe"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Vel ei tryggingskopimappe"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s bilete lasta ned"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s bilete hoppa over"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Tryggingskopibiletet finst alt."
+
+#~ msgid "The image was not copied."
+#~ msgstr "Biletet vart ikkje kopiert."
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Meld frå om eit problem"
+#~ msgid "Backup device missing"
+#~ msgstr "Tryggingskopieininga finst ikkje"