Committing present MediaGoblin translations before pushing extracted messages

[mediagoblin.git] / mediagoblin / i18n / nn_NO / LC_MESSAGES / mediagoblin.po

diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
index 2cfe7f616a75e50ea2318028715636d97696aebb..5dbc12e3833837747168fc9562a07f0d67fcf95e 100644 (file)
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -1,15 +1,16 @@
 # Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
+# Copyright (C) 2013 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
-#   <odin.omdal@gmail.com>, 2011-2012.
+# velmont <odin.omdal@gmail.com>, 2013
+# velmont <odin.omdal@gmail.com>, 2011-2012
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-12-20 09:18-0600\n"
-"PO-Revision-Date: 2012-12-20 16:04+0000\n"
+"POT-Creation-Date: 2013-08-26 17:38-0500\n"
+"PO-Revision-Date: 2013-08-28 15:34+0000\n"
 "Last-Translator: velmont <odin.omdal@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,271 +20,410 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
-msgid "Username"
-msgstr "Brukarnamn"
-
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
-msgid "Password"
-msgstr "Passord"
+#: mediagoblin/decorators.py:252
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Registrering er slege av. Orsak."
 
-#: mediagoblin/auth/forms.py:34
-msgid "Email address"
-msgstr "Epost"
+#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/plugins/persona/views.py:76
+msgid "Sorry, authentication is disabled on this instance."
+msgstr "Autentisering er slege av. Orsak."
 
-#: mediagoblin/auth/forms.py:51
+#: mediagoblin/auth/forms.py:25
 msgid "Username or email"
 msgstr "Brukarnamn eller epost"
 
-#: mediagoblin/auth/forms.py:58
-msgid "Incorrect input"
-msgstr "Ugyldig verdi"
+#: mediagoblin/auth/tools.py:41
+msgid "Invalid User name or email address."
+msgstr "Ugyldig brukarnamn eller passord."
 
-#: mediagoblin/auth/views.py:55
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Registrering er slege av. Orsak."
+#: mediagoblin/auth/tools.py:42
+msgid "This field does not take email addresses."
+msgstr "Dette feltet tek ikkje epostadresser."
 
-#: mediagoblin/auth/views.py:75
+#: mediagoblin/auth/tools.py:43
+msgid "This field requires an email address."
+msgstr "Dette feltet krev ei epostadresse."
+
+#: mediagoblin/auth/tools.py:146
 msgid "Sorry, a user with that name already exists."
 msgstr "Ein konto med dette brukarnamnet finst allereide."
 
-#: mediagoblin/auth/views.py:79
+#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446
 msgid "Sorry, a user with that email address already exists."
 msgstr "Ein brukar med den epostadressa finst allereie."
 
-#: mediagoblin/auth/views.py:182
+#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
+#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423
+msgid "The verification key or user id is incorrect."
+msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
+
+#: mediagoblin/auth/views.py:161
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Kontoen din er stadfesta. Du kan no logga inn, endra profilen din og lasta opp filer."
 
-#: mediagoblin/auth/views.py:188
+#: mediagoblin/auth/views.py:167
 msgid "The verification key or user id is incorrect"
 msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
 
-#: mediagoblin/auth/views.py:206
+#: mediagoblin/auth/views.py:185
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Du må vera innlogga, slik me veit kven som skal ha eposten."
 
-#: mediagoblin/auth/views.py:214
+#: mediagoblin/auth/views.py:193
 msgid "You've already verified your email address!"
 msgstr "Du har allereie verifisiert epostadressa."
 
-#: mediagoblin/auth/views.py:227
+#: mediagoblin/auth/views.py:203
 msgid "Resent your verification email."
-msgstr "Send ein ny stadfestingsepost."
+msgstr "Stadfestingsepost sendt."
+
+#: mediagoblin/auth/views.py:237
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr "Dersom denne epostadressa er registrert, har ein epost med instruksjonar for å endra passord vorte sendt til han."
+
+#: mediagoblin/auth/views.py:248
+msgid "Couldn't find someone with that username."
+msgstr "Fann ingen med det brukarnamnet."
 
-#: mediagoblin/auth/views.py:263
+#: mediagoblin/auth/views.py:251
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr "Sender epost med instruksjonar for å endra passordet ditt."
 
-#: mediagoblin/auth/views.py:273
+#: mediagoblin/auth/views.py:258
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr "Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller uverifisert."
+msgstr "Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller ikkje stadfesta."
 
-#: mediagoblin/auth/views.py:285
-msgid "Couldn't find someone with that username or email."
-msgstr "Fann ingen med det brukarnamnet eller passordet."
+#: mediagoblin/auth/views.py:306
+msgid "The user id is incorrect."
+msgstr "Brukar-ID-en er feil."
 
-#: mediagoblin/auth/views.py:333
+#: mediagoblin/auth/views.py:323
 msgid "You can now log in using your new password."
 msgstr "Du kan no logga inn med det nye passordet ditt."
 
-#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82
+#: mediagoblin/auth/views.py:334
+msgid "You need to verify your email before you can reset your password."
+msgstr "Du må bekrefta eposten din før du kan tilbakestilla passordet ditt."
+
+#: mediagoblin/auth/views.py:340
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr "Brukaren er ikkje aktiv. Kontakt administrator for å aktivera kontoen din att."
+
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
-#: mediagoblin/user_pages/forms.py:40
+#: mediagoblin/user_pages/forms.py:45
 msgid "Title"
 msgstr "Tittel"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Skildring av verk"
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
-#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44
+#: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
+#: mediagoblin/submit/forms.py:51
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til formattering."
 
-#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Merkelappar"
 
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr "Separer merkelappar med komma."
 
-#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
 msgid "Slug"
 msgstr "Nettnamn"
 
-#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
 msgid "The slug can't be empty"
 msgstr "Nettnamnet kan ikkje vera tomt"
 
-#: mediagoblin/edit/forms.py:40
+#: mediagoblin/edit/forms.py:42
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr "Nettnamnet (adressetittel) for verket di. Trengst ikkje endrast."
 
-#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
 #: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr "Lisens"
 
-#: mediagoblin/edit/forms.py:50
+#: mediagoblin/edit/forms.py:52
 msgid "Bio"
 msgstr "Presentasjon"
 
-#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:58
 msgid "Website"
 msgstr "Heimeside"
 
-#: mediagoblin/edit/forms.py:58
+#: mediagoblin/edit/forms.py:60
 msgid "This address contains errors"
 msgstr "Adressa inneheld feil"
 
-#: mediagoblin/edit/forms.py:63
-msgid "Old password"
-msgstr "Gamalt passort"
-
-#: mediagoblin/edit/forms.py:64
-msgid "Enter your old password to prove you own this account."
-msgstr "Skriv inn det gamle passordet ditt for å stadfesta at du eig denne kontoen."
+#: mediagoblin/edit/forms.py:65
+msgid "Email me when others comment on my media"
+msgstr "Send meg epost når andre kjem med innspel på verka mine."
 
 #: mediagoblin/edit/forms.py:67
-msgid "New password"
-msgstr "Nytt passord"
+msgid "Enable/Disable insite notifications"
+msgstr "Slå av/på notifikasjonar på netsida"
 
-#: mediagoblin/edit/forms.py:71
-msgid "Email me when others comment on my media"
-msgstr "Send meg epost når andre kjem med innspel på verka mine."
+#: mediagoblin/edit/forms.py:69
+msgid "License preference"
+msgstr "Lisens-val"
+
+#: mediagoblin/edit/forms.py:75
+msgid "This will be your default license on upload forms."
+msgstr "Dette vil vera standardvalet ditt for lisens."
 
-#: mediagoblin/edit/forms.py:83
+#: mediagoblin/edit/forms.py:87
 msgid "The title can't be empty"
 msgstr "Tittelen kjan ikkje vera tom"
 
-#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50
-#: mediagoblin/user_pages/forms.py:43
+#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
+#: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Forklaringa til denne samlinga"
 
-#: mediagoblin/edit/forms.py:92
+#: mediagoblin/edit/forms.py:96
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Tittel-delen av denne samlinga si adresse. Du treng normalt sett ikkje endra denne."
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/forms.py:103
+msgid "Old password"
+msgstr "Gamalt passort"
+
+#: mediagoblin/edit/forms.py:105
+msgid "Enter your old password to prove you own this account."
+msgstr "Skriv inn det gamle passordet ditt for å stadfesta at du eig denne kontoen."
+
+#: mediagoblin/edit/forms.py:108
+msgid "New password"
+msgstr "Nytt passord"
+
+#: mediagoblin/edit/forms.py:116
+msgid "New email address"
+msgstr "Ny epostadresse"
+
+#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/tests/test_util.py:110
+msgid "Password"
+msgstr "Passord"
+
+#: mediagoblin/edit/forms.py:122
+msgid "Enter your password to prove you own this account."
+msgstr "Skriv inn passordet som prov på at dette er din konto."
+
+#: mediagoblin/edit/views.py:73
 msgid "An entry with that slug already exists for this user."
 msgstr "Eit innlegg med denne adressetittelen finst allereie."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:91
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sine verk."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:161
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "La til vedlegg %s."
 
-#: mediagoblin/edit/views.py:181
+#: mediagoblin/edit/views.py:188
+msgid "You can only edit your own profile."
+msgstr "Du kan berre enda din eigen profil."
+
+#: mediagoblin/edit/views.py:194
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sin profil."
 
-#: mediagoblin/edit/views.py:197
+#: mediagoblin/edit/views.py:210
 msgid "Profile changes saved"
 msgstr "Lagra endring av profilen"
 
-#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246
+#: mediagoblin/edit/views.py:247
 msgid "Account settings saved"
 msgstr "Lagra kontoinstellingar"
 
-#: mediagoblin/edit/views.py:251
-msgid "Wrong password"
-msgstr "Feil passord"
+#: mediagoblin/edit/views.py:281
+msgid "You need to confirm the deletion of your account."
+msgstr "Du må stadfesta slettinga av kontoen din."
 
-#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211
-#: mediagoblin/user_pages/views.py:210
+#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148
+#: mediagoblin/user_pages/views.py:242
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Du har allereie ei samling med namn «%s»."
 
-#: mediagoblin/edit/views.py:291
+#: mediagoblin/edit/views.py:321
 msgid "A collection with that slug already exists for this user."
 msgstr "Ei samling med den nettadressa finst allereie for denne brukaren."
 
-#: mediagoblin/edit/views.py:308
+#: mediagoblin/edit/views.py:336
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Du endrar ein annan brukar si samling. Trå varsamt."
 
-#: mediagoblin/gmg_commands/theme.py:58
+#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452
+msgid "Wrong password"
+msgstr "Feil passord"
+
+#: mediagoblin/edit/views.py:374
+msgid "Your password was changed successfully"
+msgstr "Endra passord"
+
+#: mediagoblin/edit/views.py:417
+msgid "Your email address has been verified."
+msgstr "Epostadressa di er bekrefta."
+
+#: mediagoblin/gmg_commands/assetlink.py:60
 msgid "Cannot link theme... no theme set\n"
 msgstr "Cannot link theme... no theme set\n"
 
-#: mediagoblin/gmg_commands/theme.py:71
+#: mediagoblin/gmg_commands/assetlink.py:73
 msgid "No asset directory for this theme\n"
 msgstr "No asset directory for this theme\n"
 
-#: mediagoblin/gmg_commands/theme.py:74
+#: mediagoblin/gmg_commands/assetlink.py:76
 msgid "However, old link directory symlink found; removed.\n"
 msgstr "However, old link directory symlink found; removed.\n"
 
-#: mediagoblin/media_types/__init__.py:60
-#: mediagoblin/media_types/__init__.py:101
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr "Kunne ikkje lenkja «%s»: %s eksisterer og er ikkje ei symlenkje\n"
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr "Hopper over «%s»: allereie satt opp.\n"
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr "Gamal lenkje funnen for «%s»; fjernar.\n"
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie blocker "
+"or somesuch.<br/>Make sure to permit the settings of cookies for this "
+"domain."
+msgstr "Finn ikkje CSRF-cookien. Dette er truleg grunna ein cookie-blokkar.<br/>\nSjå til at du tillet cookies for dette domenet."
+
+#: mediagoblin/media_types/__init__.py:78
+#: mediagoblin/media_types/__init__.py:100
 msgid "Sorry, I don't support that file type :("
 msgstr "Orsak, stør ikkje den filtypen :("
 
-#: mediagoblin/media_types/video/processing.py:35
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr "klarte ikkje køyra unoconv, sjekk logg-fil"
+
+#: mediagoblin/media_types/video/processing.py:44
 msgid "Video transcoding failed"
 msgstr "Skjedde noko gale med video transkodinga"
 
-#: mediagoblin/plugins/oauth/forms.py:26
-msgid "Client ID"
-msgstr "Klient-ID (client ID)"
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+msgid "commented on your post"
+msgstr "kom med innspel på innlegget ditt"
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr "Tingar innspel frå %s."
 
-#: mediagoblin/plugins/oauth/forms.py:28
-msgid "Next URL"
-msgstr "Neste adresse (next URL)"
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr "Du vil ikkje få notifikasjonar for innspel på %s."
 
-#: mediagoblin/plugins/oauth/forms.py:30
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr "Treng oauth_token (must provide oath_token)."
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294
+msgid "No request token found."
+msgstr "Noko gjekk gale :( (no request token found)."
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr "Epost"
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr "Brukarnamn eller epost"
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr "Hald meg innlogga"
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
+msgid "Location"
+msgstr "Stad"
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr "Sjå på <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+
+#: mediagoblin/plugins/oauth/forms.py:29
 msgid "Allow"
 msgstr "Godta"
 
-#: mediagoblin/plugins/oauth/forms.py:31
+#: mediagoblin/plugins/oauth/forms.py:30
 msgid "Deny"
 msgstr "Nekt"
 
-#: mediagoblin/plugins/oauth/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:34
 msgid "Name"
 msgstr "Namn"
 
-#: mediagoblin/plugins/oauth/forms.py:36
+#: mediagoblin/plugins/oauth/forms.py:35
 msgid "The name of the OAuth client"
 msgstr "Namnet til OAuth-klienten"
 
-#: mediagoblin/plugins/oauth/forms.py:37
+#: mediagoblin/plugins/oauth/forms.py:36
 msgid "Description"
 msgstr "Forklaring"
 
-#: mediagoblin/plugins/oauth/forms.py:39
+#: mediagoblin/plugins/oauth/forms.py:38
 msgid ""
 "This will be visible to users allowing your\n"
 "                application to authenticate as them."
 msgstr "Dette vil vera synleg for brukarar som godtek applikasjonen din til å autentisera dei."
 
-#: mediagoblin/plugins/oauth/forms.py:41
+#: mediagoblin/plugins/oauth/forms.py:40
 msgid "Type"
 msgstr "Type"
 
-#: mediagoblin/plugins/oauth/forms.py:46
+#: mediagoblin/plugins/oauth/forms.py:45
 msgid ""
 "<strong>Confidential</strong> - The client can\n"
 "                make requests to the GNU MediaGoblin instance that can not be\n"
@@ -293,107 +433,236 @@ msgid ""
 "                JavaScript client)."
 msgstr "<strong>Confidential</strong> - Konfidensielt, på engelsk: The client can\n                make requests to the GNU MediaGoblin instance that can not be\n                intercepted by the user agent (e.g. server-side client).<br />\n<strong>Public</strong> - Open, på engelsk: The client can't make confidential\n                requests to the GNU MediaGoblin instance (e.g. client-side\n                JavaScript client)."
 
-#: mediagoblin/plugins/oauth/forms.py:53
+#: mediagoblin/plugins/oauth/forms.py:52
 msgid "Redirect URI"
 msgstr "Omdirigering URI"
 
-#: mediagoblin/plugins/oauth/forms.py:55
+#: mediagoblin/plugins/oauth/forms.py:54
 msgid ""
 "The redirect URI for the applications, this field\n"
 "            is <strong>required</strong> for public clients."
 msgstr "Omdirigerings-URI-en for programmene. Denne feltet <strong>krevst</strong> for opne (public) klientar."
 
-#: mediagoblin/plugins/oauth/forms.py:67
+#: mediagoblin/plugins/oauth/forms.py:66
 msgid "This field is required for public clients"
 msgstr "Dette feltet krevst for opne (public) klientar"
 
-#: mediagoblin/plugins/oauth/views.py:60
+#: mediagoblin/plugins/oauth/views.py:55
 msgid "The client {0} has been registered!"
 msgstr "Klienten {0} er registrert."
 
-#: mediagoblin/processing/__init__.py:138
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr "OAuth klient-tilkoplingar"
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr "Dine OAuth-klientar"
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr "Legg til"
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:268
+#: mediagoblin/plugins/openid/views.py:297
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr "Ein konto er allereie registrert til den OpenID-en."
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr "OpenID"
+
+#: mediagoblin/plugins/openid/views.py:48
+msgid "Sorry, the OpenID server could not be found"
+msgstr "Fann ikkje OpenID-tenaren."
+
+#: mediagoblin/plugins/openid/views.py:61
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr "Ingen OpenID funne for %s."
+
+#: mediagoblin/plugins/openid/views.py:106
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr "Stadfesting av %s feila: %s"
+
+#: mediagoblin/plugins/openid/views.py:117
+msgid "Verification cancelled"
+msgstr "Stadfesting avbrutt"
+
+#: mediagoblin/plugins/openid/views.py:314
+msgid "Your OpenID url was saved successfully."
+msgstr "Lagra OpenID-url."
+
+#: mediagoblin/plugins/openid/views.py:338
+#: mediagoblin/plugins/openid/views.py:393
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr "Kan ikkje sletta den einaste OpenID-urlen utan at du har eit passord satt."
+
+#: mediagoblin/plugins/openid/views.py:343
+#: mediagoblin/plugins/openid/views.py:402
+msgid "That OpenID is not registered to this account."
+msgstr "Den OpenID-en er ikkje registrert til denne kontoen."
+
+#: mediagoblin/plugins/openid/views.py:385
+msgid "OpenID was successfully removed."
+msgstr "Fjerna OpenID-en."
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr "Legg til OpenID"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr "Slett ein OpenID"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+msgid "Delete"
+msgstr "Slett"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr "OpenID-ar"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:58
+msgid "Log in"
+msgstr "Logg inn"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr "Innlogging feila"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr "Logg inn for å oppretta ein konto"
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr "Eller logg inn med passord."
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr "Eller logg inn med OpenID."
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr "Eller registrer med OpenID."
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr "Ein konto er allereie registrert til den Persona-eposten."
+
+#: mediagoblin/plugins/persona/views.py:137
+msgid "The Persona email address was successfully removed."
+msgstr "Persone-eposten fjerna."
+
+#: mediagoblin/plugins/persona/views.py:143
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr "Du kan ikkje sletta din einaste Persona-epostadresse utan eit passord satt."
+
+#: mediagoblin/plugins/persona/views.py:148
+msgid "That Persona email address is not registered to this account."
+msgstr "Den Persona-epostadressa er ikkje registrert til denne kontoen."
+
+#: mediagoblin/plugins/persona/views.py:175
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr "Ein konto med den Persona-epostadressa finst allereie."
+
+#: mediagoblin/plugins/persona/views.py:189
+msgid "Your Persona email address was saved successfully."
+msgstr "Persone-epostadressa lagra."
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr "Fjern ei Persona-epostadresse"
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr "Ny Persona-epostadresse"
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
+msgid "Edit your Persona email addresses"
+msgstr "Endra Persona-epostadressa di"
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr "Eller logg inn med Persona."
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr "Eller registrer med Persona."
+
+#: mediagoblin/processing/__init__.py:414
 msgid "Invalid file given for media type."
 msgstr "Ugyldig fil for medietypen."
 
+#: mediagoblin/processing/__init__.py:421
+msgid "Copying to public storage failed."
+msgstr "Klarte ikkje kopiera til «public storage»."
+
+#: mediagoblin/processing/__init__.py:429
+msgid "An acceptable processing file was not found"
+msgstr "Fann ingen akseptable filar for prosessering."
+
 #: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Fil"
 
-#: mediagoblin/submit/views.py:57
+#: mediagoblin/submit/views.py:52
 msgid "You must provide a file."
 msgstr "Du må velja ei fil."
 
-#: mediagoblin/submit/views.py:164
+#: mediagoblin/submit/views.py:101
 msgid "Woohoo! Submitted!"
 msgstr "Johoo! Opplasta!"
 
-#: mediagoblin/submit/views.py:215
+#: mediagoblin/submit/views.py:154
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "La til samlinga «%s»."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
-msgid "MediaGoblin logo"
-msgstr "MediaGoblin"
-
-#: mediagoblin/templates/mediagoblin/base.html:54
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
-msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> sin konto"
+#: mediagoblin/templates/mediagoblin/base.html:79
+msgid "Verify your email!"
+msgstr "Stadfest epostadressa di."
 
-#: mediagoblin/templates/mediagoblin/base.html:60
+#: mediagoblin/templates/mediagoblin/base.html:86
 msgid "log out"
 msgstr "Logg ut"
 
-#: mediagoblin/templates/mediagoblin/base.html:62
-#: mediagoblin/templates/mediagoblin/root.html:28
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
-msgid "Add media"
-msgstr "Legg til verk"
-
-#: mediagoblin/templates/mediagoblin/base.html:68
-msgid "Verify your email!"
-msgstr "Verifiser epostadressa di."
-
-#: mediagoblin/templates/mediagoblin/base.html:73
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Log in"
-msgstr "Logg inn"
-
-#: mediagoblin/templates/mediagoblin/base.html:87
-msgid ""
-"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
-"href=\"http://gnu.org/\">GNU</a> project."
-msgstr "Drive av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit <a href=\"http://gnu.org/\">GNU</a>-prosjekt."
-
-#: mediagoblin/templates/mediagoblin/base.html:90
+#: mediagoblin/templates/mediagoblin/base.html:105
 #, python-format
-msgid ""
-"Released under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
-"href=\"%(source_link)s\">Source code</a> available."
-msgstr "Lisensiert med <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Kjeldekode</a> er tilgjengeleg."
-
-#: mediagoblin/templates/mediagoblin/error.html:24
-msgid "Image of goblin stressing out"
-msgstr "Bilete av stressa goblin"
-
-#: mediagoblin/templates/mediagoblin/root.html:25
-msgid "Actions"
-msgstr "Handlingar"
-
-#: mediagoblin/templates/mediagoblin/root.html:31
-msgid "Create new collection"
-msgstr "Lag ny samling"
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> sin konto"
 
-#: mediagoblin/templates/mediagoblin/root.html:34
+#: mediagoblin/templates/mediagoblin/base.html:112
 msgid "Change account settings"
 msgstr "Endra kontoinstellingar"
 
-#: mediagoblin/templates/mediagoblin/root.html:38
-#: mediagoblin/templates/mediagoblin/root.html:44
+#: mediagoblin/templates/mediagoblin/base.html:116
+#: mediagoblin/templates/mediagoblin/base.html:137
 #: mediagoblin/templates/mediagoblin/admin/panel.html:21
 #: mediagoblin/templates/mediagoblin/admin/panel.html:26
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -401,39 +670,25 @@ msgstr "Endra kontoinstellingar"
 msgid "Media processing panel"
 msgstr "Verkprosesseringspanel"
 
-#: mediagoblin/templates/mediagoblin/root.html:51
-msgid "Explore"
-msgstr "Utforsk"
-
-#: mediagoblin/templates/mediagoblin/root.html:53
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Heihei, velkomen til denne MediaGoblin-sida."
-
-#: mediagoblin/templates/mediagoblin/root.html:55
-msgid ""
-"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Denne sida køyrer <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit superbra program for å visa fram dine kreative verk."
+#: mediagoblin/templates/mediagoblin/base.html:125
+msgid "Log out"
+msgstr "Logg ut"
 
-#: mediagoblin/templates/mediagoblin/root.html:56
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "Vil du leggja til eigne verk og innpel, so må du logga inn."
+#: mediagoblin/templates/mediagoblin/base.html:128
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
+msgid "Add media"
+msgstr "Legg til verk"
 
-#: mediagoblin/templates/mediagoblin/root.html:58
-msgid "Don't have one yet? It's easy!"
-msgstr "Har du ikkje ein enno? Det er enkelt!"
+#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr "Lag ny samling"
 
-#: mediagoblin/templates/mediagoblin/root.html:59
-#, python-format
-msgid ""
-"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n"
-"        or\n"
-"        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
-msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Opprett ein konto på denne sida</a> eller <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">set opp MediaGoblin på eigen tenar</a>"
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr "Bilete av stressa goblin"
 
-#: mediagoblin/templates/mediagoblin/root.html:67
+#: mediagoblin/templates/mediagoblin/root.html:32
 msgid "Most recent media"
 msgstr "Nyaste verk"
 
@@ -471,6 +726,59 @@ msgstr "Dei siste ti opplastningane"
 msgid "No processed entries, yet!"
 msgstr "Ingenting prossesert, enno."
 
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr "Godkjenning"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr "Godkjenn"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr "Du er innlogga som"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr "Vil du godkjenna"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr "som ukjend applikasjon"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr "å få tilgang til kontoen din?"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr "Applikasjonar med tilgang til kontoen din kan:"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr "Leggja til media som deg"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr "Sjå informasjonen din (t.d. profil, bilete, osb...)"
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr "Endra informasjonen din"
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr "Godkjenning ferdig"
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr "Godkjenning ferdig"
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this into your client:"
+msgstr "Kopier og lim inn dette i klienten din:"
+
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
 msgid "Set your new password"
@@ -503,28 +811,24 @@ msgid ""
 "a happy goblin!"
 msgstr "Hei %(username)s,\n\nfor å endra MediaGoblin-passordet ditt, opna fylgjande URL i ein netlesar:\n\n    <%(verification_url)s>\n\nDersom du mistenkjer dette er eit misstak, ignorer eposten og hald fram med å vera ein glad goblin!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Innlogging feila"
-
 #: mediagoblin/templates/mediagoblin/auth/login.html:44
 msgid "Don't have an account yet?"
-msgstr "Har du ingen konto?"
+msgstr "Manglar du konto?"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:45
+#: mediagoblin/templates/mediagoblin/auth/login.html:46
 msgid "Create one here!"
-msgstr "Lag ein!"
+msgstr "Opprett ein!"
 
-#: mediagoblin/templates/mediagoblin/auth/login.html:51
+#: mediagoblin/templates/mediagoblin/auth/login.html:54
 msgid "Forgot your password?"
 msgstr "Gløymd passordet?"
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
 msgid "Create an account!"
-msgstr "Lag ein konto."
+msgstr "Opprett ein konto."
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:40
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
 msgid "Create"
 msgstr "Opprett"
 
@@ -539,41 +843,131 @@ msgid ""
 "%(verification_url)s"
 msgstr "Hei %(username)s,\n\nopna fylgjande netadresse i netlesaren din for å aktivera kontoen din:\n\n%(verification_url)s"
 
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgstr "Drive av <a href=\"http://mediagoblin.org\" title='Version %(version)s'>MediaGoblin</a>, eit <a href=\"http://gnu.org/\">GNU</a>-prosjekt."
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr "Lisensiert med <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Kjeldekode</a> er tilgjengeleg."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr "Utforsk"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr "Heihei, velkomen til denne MediaGoblin-sida."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
+"extraordinarily great piece of media hosting software."
+msgstr "Denne sida køyrer <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit superbra program for å visa fram dine kreative verk."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26
+msgid ""
+"To add your own media, place comments, and more, you can log in with your "
+"MediaGoblin account."
+msgstr "Vil du leggja til eigne verk og innpel, so må du logga inn."
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28
+msgid "Don't have one yet? It's easy!"
+msgstr "Har du ikkje ein enno? Det er enkelt!"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35
+msgid ""
+"\n"
+"        >Create an account at this site</a>\n"
+"        or"
+msgstr "\n>Opprett ein konto på denne sida</a>\neller"
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41
+msgid ""
+"\n"
+"        <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+msgstr "\n      <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set opp din eigen MediaGoblin-server</a>"
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr "MediaGoblin"
+
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:23
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35
 #, python-format
 msgid "Editing attachments for %(media_title)s"
 msgstr "Endrar vedlegg for %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:43
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:171
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:187
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:192
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
 msgid "Add attachment"
 msgstr "Legg ved vedlegg"
 
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:60
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
 #: mediagoblin/templates/mediagoblin/edit/edit.html:41
 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
 msgid "Cancel"
 msgstr "Bryt av"
 
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:62
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
 msgid "Save changes"
 msgstr "Lagra"
 
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr "Endrar eposten til %(username)s"
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
+msgid "Save"
+msgstr "Lagra"
+
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
+#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Endrar passordet til %(username)s"
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr "Sletta brukar '%(user_name)s' og alle relaterte verk og kommentarar?"
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr "Ja, slett kontoen min"
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr "Slett permanent"
+
 #: mediagoblin/templates/mediagoblin/edit/edit.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit.html:35
 #, python-format
@@ -586,17 +980,55 @@ msgstr "Endrar %(media_title)s"
 msgid "Changing %(username)s's account settings"
 msgstr "Endrar kontoinnstellingane til %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+msgid "Delete my account"
+msgstr "Slett kontoen min"
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Email"
+msgstr "Epost"
+
 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
 #, python-format
 msgid "Editing %(collection_title)s"
 msgstr "Endrar %(collection_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
 #, python-format
 msgid "Editing %(username)s's profile"
 msgstr "Endrar profilen til %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr "Hei!\n\nMe ynskjer å stadfesta at du er %(username)s. Dersom du er\nfylg denne lenkja for å stadfesta epostadressa di:\n\n%(verification_url)s\n\nDersom du ikkje er %(username)s eller ikkje ynskjer ei epost-endring kan du\nberre ignorera denne eposten."
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr "Nye innspel"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:139
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s sidan"
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr "Marker alt lese"
+
 #: mediagoblin/templates/mediagoblin/listings/collection.html:30
 #: mediagoblin/templates/mediagoblin/listings/collection.html:35
 #: mediagoblin/templates/mediagoblin/listings/tag.html:30
@@ -607,8 +1039,8 @@ msgstr "Verk merka med: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:52
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
 msgid "Download"
 msgstr "Last ned"
 
@@ -631,7 +1063,8 @@ msgid ""
 msgstr "Du kan skaffa ein moderne netlesar som kan spela av dette lydklippet hjå <a href=\"http://opera.com/download\">http://opera.com/download</a>."
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:56
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
 msgid "Original file"
 msgstr "Opphavleg fil"
 
@@ -639,84 +1072,79 @@ msgstr "Opphavleg fil"
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM-fil (Vorbis-kodek)"
 
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr "Oppretta"
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:99
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:105
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:67
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:65
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Bilete for %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
-msgid "Toggle Rotate"
-msgstr "Slå av/på rotering"
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+msgid "PDF file"
+msgstr "PDF-fil"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112
 msgid "Perspective"
 msgstr "Perspektiv"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115
 msgid "Front"
 msgstr "Front"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118
 msgid "Top"
 msgstr "Topp"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121
 msgid "Side"
 msgstr "Side"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132
 msgid "Download model"
 msgstr "Last ned modell"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140
 msgid "File Format"
 msgstr "Filformat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142
 msgid "Object Height"
 msgstr "Objekthøgd"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:44
 msgid ""
-"Sorry, this video will not work because \n"
-"\t    your web browser does not support HTML5 \n"
-"\t    video."
-msgstr "Orsak, denne videoen fungerer ikkje fordi netlesaren din ikkje stør HTML5-video."
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr "Orsak, denne videoen fungerer ikkje\nfordi netlesaren din ikkje stør\nHTML5 video."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:47
 msgid ""
 "You can get a modern web browser that \n"
-"\t    can play this video at <a href=\"http://getfirefox.com\">\n"
-"\t    http://getfirefox.com</a>!"
-msgstr "Du kan skaffa ein moderne netlesar som kan spela av denne videoen hjå <a href=\"http://opera.com/download\">http://opera.com/download</a>."
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr "Du kan skaffa deg ein moderne netlesar som kan spela denne videoen hjå <a href=http://opera.com>http://opera.com</a> eller <a href=\"http://getfirefox.com\">http://getfirefox.com</a>."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:59
-msgid "WebM file (640p; VP8/Vorbis)"
-msgstr "WebM fil (640p; VP8/Vorbis)"
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
+msgid "WebM file (VP8/Vorbis)"
+msgstr "WebM-fil (VP8/Vorbis)"
 
 #: mediagoblin/templates/mediagoblin/submit/collection.html:26
 msgid "Add a collection"
 msgstr "Legg til ei samling"
 
-#: mediagoblin/templates/mediagoblin/submit/collection.html:30
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82
-msgid "Add"
-msgstr "Legg til"
-
 #: mediagoblin/templates/mediagoblin/submit/start.html:23
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add your media"
@@ -733,35 +1161,35 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "%(collection_title)s av <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:87
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
 msgid "Edit"
 msgstr "Endra"
 
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-msgid "Delete"
-msgstr "Slett"
-
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
 msgid "Really delete %(title)s?"
 msgstr "Vil du verkeleg sletta %(title)s?"
 
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
-msgid "Delete permanently"
-msgstr "Slett permanent"
-
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31
 #, python-format
 msgid "Really remove %(media_title)s from %(collection_title)s?"
 msgstr "Fjerna %(media_title)s frå %(collection_title)s?"
 
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54
 msgid "Remove"
 msgstr "Fjern"
 
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr "%(username)s sine samlingar"
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine samlingar"
+
 #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
 #, python-format
 msgid ""
@@ -774,56 +1202,50 @@ msgstr "Hei %(username)s,\n%(comment_author)s kommenterte innlegget ditt (%(comm
 msgid "%(username)s's media"
 msgstr "Verka til %(username)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine verk merka <a href=\"%(tag_url)s\">%(tag)s</a>"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine verk"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
 #, python-format
 msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "❖ Ser på <a href=\"%(user_url)s\">%(username)s</a> sine verk"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:97
 msgid "Add a comment"
 msgstr "Legg att innspel"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:109
-msgid ""
-"You can use <a "
-"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
-" formatting."
-msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til formatterring."
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:108
 msgid "Add this comment"
 msgstr "Legg til dette innspelet"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:132
-msgid "at"
-msgstr "hjå"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:152
-#, python-format
-msgid ""
-"<h3>Added on</h3>\n"
-"      <p>%(date)s</p>"
-msgstr "<h3>Lagt til</h3>\n      <p>%(date)s</p>"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid "Comment Preview"
+msgstr "Førehandsvisning av innspel"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:202
-msgid "Add media to collection"
-msgstr "Legg til verk til samling"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
+msgid "Added"
+msgstr "Lagt til"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
 #, python-format
-msgid "Add %(title)s to collection"
-msgstr "Putt %(title)s inn i samling"
+msgid "Add “%(media_title)s” to a collection"
+msgstr "Putt «%(media_title)s» i samling"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
 msgid "+"
 msgstr "+"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
 msgid "Add a new collection"
 msgstr "Legg til ei ny samling"
 
@@ -849,7 +1271,7 @@ msgstr "Fann ingen slik brukar"
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:50
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:70
 msgid "Email verification needed"
-msgstr "Epostverifisering trengst."
+msgstr "Treng stadfesting av epostadressa"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:53
 msgid "Almost done! Your account still needs to be activated."
@@ -866,7 +1288,7 @@ msgstr "I tilfelle det ikkje skjer:"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:65
 msgid "Resend verification email"
-msgstr "Send ein ny epost"
+msgstr "Send ein ny stadfestingsepost"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:73
 msgid ""
@@ -885,27 +1307,31 @@ msgstr "Viss dette er deg, kan du <a href=\"%(login_url)s\">logga inn</a> for å
 msgid "Here's a spot to tell others about yourself."
 msgstr "Her kan du fortelja om deg sjølv."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:118
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:117
 msgid "Edit profile"
 msgstr "Endra profil"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:106
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:105
 msgid "This user hasn't filled in their profile (yet)."
 msgstr "Brukaren har ikkje fylt ut profilen sin (enno)."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:132
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:124
+msgid "Browse collections"
+msgstr "Sjå gjennom samlingar"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:137
 #, python-format
 msgid "View all of %(username)s's media"
 msgstr "Sjå alle %(username)s sine verk"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:145
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:150
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
 msgstr "Her kjem verka dine."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:162
 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
 msgid "There doesn't seem to be any media here yet..."
@@ -915,28 +1341,24 @@ msgstr "Ser ikkje ut til at det finst nokon verk her nett no."
 msgid "(remove)"
 msgstr "(fjern)"
 
-#: mediagoblin/templates/mediagoblin/utils/collections.html:20
-#, python-format
-msgid "In collections (%(collected)s)"
-msgstr "I samlingar (%(collected)s)"
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr "I samling"
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr "Putt i samling"
 
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
 msgstr " "
 
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
 msgid "Atom feed"
 msgstr "Atom-kjelde"
 
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
-msgid "Location"
-msgstr "Stad"
-
-#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53
-#, python-format
-msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
-msgstr "Sjå på <a href=\"%(osm_url)s\">OpenStreetMap</a>"
-
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
 msgstr "Alle rettar reservert"
@@ -967,124 +1389,172 @@ msgstr "eldre"
 msgid "Tagged with"
 msgstr "Merka med"
 
-#: mediagoblin/tools/exif.py:78
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Klarte ikkje lesa biletefila."
 
-#: mediagoblin/tools/response.py:30
+#: mediagoblin/tools/response.py:36
 msgid "Oops!"
 msgstr "Oops."
 
-#: mediagoblin/tools/response.py:31
+#: mediagoblin/tools/response.py:37
 msgid "An error occured"
 msgstr "Noko gjekk gale"
 
-#: mediagoblin/tools/response.py:46
+#: mediagoblin/tools/response.py:51
+msgid "Bad Request"
+msgstr "Bad Request (noko gjekk gale)"
+
+#: mediagoblin/tools/response.py:53
+msgid "The request sent to the server is invalid, please double check it"
+msgstr "The request sent to the server is invalid, please double check it"
+
+#: mediagoblin/tools/response.py:60
 msgid "Operation not allowed"
 msgstr "Ulovleg operasjon"
 
-#: mediagoblin/tools/response.py:47
+#: mediagoblin/tools/response.py:61
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Orsak Dave, eg kan ikkje la deg gjera det!&lt;HAL2000&gt;</p>\n<p>Du prøvde å gjera noko du ikkje har løyve til. Prøvar du å sletta alle brukarkonti no igjen?"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:69
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
 " deleted."
 msgstr "Ser ikkje ut til å finnast noko her. Orsak.</p>\n<p>Dersom du er sikker på at adressa finst, so er ho truleg flytta eller sletta."
 
-#: mediagoblin/user_pages/forms.py:28
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr "år"
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr "månad"
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr "veke"
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr "dag"
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr "time"
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr "minutt"
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr "Innspel"
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\" target=_blank>Markdown</a> til formatterring."
+
+#: mediagoblin/user_pages/forms.py:31
 msgid "I am sure I want to delete this"
 msgstr "Eg er sikker eg vil sletta dette"
 
-#: mediagoblin/user_pages/forms.py:32
+#: mediagoblin/user_pages/forms.py:35
 msgid "I am sure I want to remove this item from the collection"
 msgstr "Eg er sikker på at eg vil fjerna dette frå samlinga"
 
-#: mediagoblin/user_pages/forms.py:35
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr "Samling"
+
+#: mediagoblin/user_pages/forms.py:40
 msgid "-- Select --"
 msgstr "-- Vel --"
 
-#: mediagoblin/user_pages/forms.py:37
+#: mediagoblin/user_pages/forms.py:42
 msgid "Include a note"
 msgstr "Legg ved eit notat"
 
-#: mediagoblin/user_pages/lib.py:56
-msgid "commented on your post"
-msgstr "kom med innspel på innlegget ditt"
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\" target=_blank>Markdown</a> til formattering."
+
+#: mediagoblin/user_pages/views.py:179
+msgid "Sorry, comments are disabled."
+msgstr "Innspel er avslege"
 
-#: mediagoblin/user_pages/views.py:156
+#: mediagoblin/user_pages/views.py:184
 msgid "Oops, your comment was empty."
 msgstr "Vops, innspelet ditt var tomt."
 
-#: mediagoblin/user_pages/views.py:162
+#: mediagoblin/user_pages/views.py:190
 msgid "Your comment has been posted!"
 msgstr "Innspelet ditt er lagt til."
 
-#: mediagoblin/user_pages/views.py:230
+#: mediagoblin/user_pages/views.py:225
+msgid "Please check your entries and try again."
+msgstr "Sjekk filene dine og prøv omatt."
+
+#: mediagoblin/user_pages/views.py:265
 msgid "You have to select or add a collection"
 msgstr "Du må velja eller laga ei samling"
 
-#: mediagoblin/user_pages/views.py:238
+#: mediagoblin/user_pages/views.py:276
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "«%s» er allereie i samling «%s»"
 
-#: mediagoblin/user_pages/views.py:253
+#: mediagoblin/user_pages/views.py:282
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "«%s» lagt til samling «%s»"
 
-#: mediagoblin/user_pages/views.py:261
-msgid "Please check your entries and try again."
-msgstr "Sjekk filene dine og prøv omatt."
-
-#: mediagoblin/user_pages/views.py:292
-msgid ""
-"Some of the files with this entry seem to be missing.  Deleting anyway."
-msgstr "Nokre av filene ser ut til å mangla. Slettar likevel."
-
-#: mediagoblin/user_pages/views.py:297
+#: mediagoblin/user_pages/views.py:302
 msgid "You deleted the media."
 msgstr "Du sletta verket."
 
-#: mediagoblin/user_pages/views.py:304
+#: mediagoblin/user_pages/views.py:314
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Sletta ikkje verket."
 
-#: mediagoblin/user_pages/views.py:312
+#: mediagoblin/user_pages/views.py:321
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du er i ferd med å sletta ein annan brukar sine verk. Trå varsamt."
 
-#: mediagoblin/user_pages/views.py:370
+#: mediagoblin/user_pages/views.py:395
 msgid "You deleted the item from the collection."
 msgstr "Du fjerna fila frå samlinga."
 
-#: mediagoblin/user_pages/views.py:374
+#: mediagoblin/user_pages/views.py:399
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Fila var ikkje fjerna fordi du ikkje var sikker."
 
-#: mediagoblin/user_pages/views.py:384
+#: mediagoblin/user_pages/views.py:407
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Du er i ferd med å fjerna ei fil frå ein annan brukar si samling. Trå varsamt."
 
-#: mediagoblin/user_pages/views.py:417
+#: mediagoblin/user_pages/views.py:440
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Samlinga «%s» sletta"
 
-#: mediagoblin/user_pages/views.py:424
+#: mediagoblin/user_pages/views.py:447
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Sletta ikkje samlinga."
 
-#: mediagoblin/user_pages/views.py:434
+#: mediagoblin/user_pages/views.py:455
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Du er i ferd med å sletta ein annan brukar si samling. Trå varsamt."