Merge branch '0.9.x' into inblob

[quix0rs-gnu-social.git] / locale / nb / LC_MESSAGES / statusnet.po

diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 69f6d79da3d8e38087ddbc5e095052de47017fc7..5ff0bfa91689ee089a458d83786118c7ae97fd63 100644 (file)
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-01-10 00:46+0000\n"
-"PO-Revision-Date: 2010-01-10 00:48:33+0000\n"
+"POT-Creation-Date: 2010-01-11 23:25+0000\n"
+"PO-Revision-Date: 2010-01-11 23:27:35+0000\n"

 "Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: out-statusnet\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: out-statusnet\n"


@@ -38,7 +38,7 @@ msgstr "Ingen slik side"
 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58

-#: actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76

 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
 #: actions/replies.php:73 actions/repliesrss.php:38
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
 #: actions/replies.php:73 actions/repliesrss.php:38
 #: actions/showfavorites.php:105 actions/userbyid.php:74


@@ -121,6 +121,23 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
 #: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
 #: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118

+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
+#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
+#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
+#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101

 #, fuzzy
 msgid "API method not found."
 msgstr "API-metode ikke funnet!"
 #, fuzzy
 msgid "API method not found."
 msgstr "API-metode ikke funnet!"


@@ -181,6 +198,9 @@ msgstr ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174

+#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273

 msgid "Unable to save your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
 msgid "Unable to save your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 


@@ -222,26 +242,6 @@ msgstr "Direktemeldinger til %s"
 msgid "All the direct messages sent to %s"
 msgstr "Alle direktemeldinger sendt til %s"
 
 msgid "All the direct messages sent to %s"
 msgstr "Alle direktemeldinger sendt til %s"
 

-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr "API-metode ikke funnet!"
-

 #: actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Ingen meldingstekst!"
 #: actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Ingen meldingstekst!"


@@ -265,7 +265,8 @@ msgid "No status found with that ID."
 msgstr "Fant ingen status med den ID-en."
 
 #: actions/apifavoritecreate.php:119
 msgstr "Fant ingen status med den ID-en."
 
 #: actions/apifavoritecreate.php:119

-msgid "This status is already a favorite!"
+#, fuzzy
+msgid "This status is already a favorite."

 msgstr "Denne statusen er allerede en favoritt!"
 
 #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
 msgstr "Denne statusen er allerede en favoritt!"
 
 #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176


@@ -273,7 +274,8 @@ msgid "Could not create favorite."
 msgstr "Kunne ikke opprette favoritt."
 
 #: actions/apifavoritedestroy.php:122
 msgstr "Kunne ikke opprette favoritt."
 
 #: actions/apifavoritedestroy.php:122

-msgid "That status is not a favorite!"
+#, fuzzy
+msgid "That status is not a favorite."

 msgstr "Den statusen er ikke en favoritt!"
 
 #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
 msgstr "Den statusen er ikke en favoritt!"
 
 #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87


@@ -294,7 +296,8 @@ msgid "Could not unfollow user: User not found."
 msgstr "Kunne ikke slutte å følge brukeren: Fant ikke brukeren."
 
 #: actions/apifriendshipsdestroy.php:120
 msgstr "Kunne ikke slutte å følge brukeren: Fant ikke brukeren."
 
 #: actions/apifriendshipsdestroy.php:120

-msgid "You cannot unfollow yourself!"
+#, fuzzy
+msgid "You cannot unfollow yourself."

 msgstr "Du kan ikke slutte å følge deg selv!"
 
 #: actions/apifriendshipsexists.php:94
 msgstr "Du kan ikke slutte å følge deg selv!"
 
 #: actions/apifriendshipsexists.php:94


@@ -382,7 +385,7 @@ msgstr ""
 msgid "Group not found!"
 msgstr "API-metode ikke funnet!"
 
 msgid "Group not found!"
 msgstr "API-metode ikke funnet!"
 

-#: actions/apigroupjoin.php:110 lib/command.php:217
+#: actions/apigroupjoin.php:110 actions/joingroup.php:90

 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem av den gruppen."
 
 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem av den gruppen."
 


@@ -390,7 +393,7 @@ msgstr "Du er allerede medlem av den gruppen."
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 

-#: actions/apigroupjoin.php:138 lib/command.php:234
+#: actions/apigroupjoin.php:138 actions/joingroup.php:128

 #, fuzzy, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Klarte ikke å oppdatere bruker."
 #, fuzzy, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Klarte ikke å oppdatere bruker."


@@ -433,12 +436,12 @@ msgstr ""
 msgid "No such notice."
 msgstr ""
 
 msgid "No such notice."
 msgstr ""
 

-#: actions/apistatusesretweet.php:83 lib/command.php:422
+#: actions/apistatusesretweet.php:83

 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke slette notisen."
 
 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke slette notisen."
 

-#: actions/apistatusesretweet.php:91 lib/command.php:427
+#: actions/apistatusesretweet.php:91

 #, fuzzy
 msgid "Already repeated that notice."
 msgstr "Kan ikke slette notisen."
 #, fuzzy
 msgid "Already repeated that notice."
 msgstr "Kan ikke slette notisen."


@@ -546,8 +549,11 @@ msgstr "Ingen id."
 msgid "No such attachment."
 msgstr ""
 
 msgid "No such attachment."
 msgstr ""
 

-#: actions/avatarbynickname.php:59 actions/grouprss.php:91
-#: actions/leavegroup.php:76
+#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76
+#: actions/showgroup.php:121

 msgid "No nickname."
 msgstr ""
 
 msgid "No nickname."
 msgstr ""
 


@@ -570,8 +576,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 msgstr ""
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185

-#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:103
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
+#: actions/userrss.php:103

 msgid "User without matching profile"
 msgstr ""
 
 msgid "User without matching profile"
 msgstr ""
 


@@ -605,11 +611,11 @@ msgstr "Last opp"
 msgid "Crop"
 msgstr ""
 
 msgid "Crop"
 msgstr ""
 

-#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
-#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/avatarsettings.php:268 actions/deletenotice.php:157
+#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
+#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309

 #: actions/groupunblock.php:66 actions/imsettings.php:206
 #: actions/groupunblock.php:66 actions/imsettings.php:206

-#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66

 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:337
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:337


@@ -689,20 +695,15 @@ msgstr ""
 msgid "Failed to save block information."
 msgstr ""
 
 msgid "Failed to save block information."
 msgstr ""
 

-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/joingroup.php:76
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Nytt nick"
-

 #: actions/blockedfromgroup.php:80 actions/editgroup.php:96
 #: actions/blockedfromgroup.php:80 actions/editgroup.php:96

+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86

 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
 #: actions/grouplogo.php:99 actions/groupmembers.php:83
 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
 #: actions/grouplogo.php:99 actions/groupmembers.php:83

-#: actions/joingroup.php:83 actions/showgroup.php:137
+#: actions/grouprss.php:98 actions/groupunblock.php:86
+#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263

 #, fuzzy
 #, fuzzy

-msgid "No such group"
+msgid "No such group."

 msgstr "Klarte ikke å lagre profil."
 
 #: actions/blockedfromgroup.php:90
 msgstr "Klarte ikke å lagre profil."
 
 #: actions/blockedfromgroup.php:90


@@ -825,10 +826,6 @@ msgstr "Kan ikke slette notisen."
 msgid "Delete this notice"
 msgstr ""
 
 msgid "Delete this notice"
 msgstr ""
 

-#: actions/deletenotice.php:157
-msgid "There was a problem with your session token.  Try again, please."
-msgstr ""
-

 #: actions/deleteuser.php:67
 #, fuzzy
 msgid "You cannot delete users."
 #: actions/deleteuser.php:67
 #, fuzzy
 msgid "You cannot delete users."


@@ -1000,8 +997,9 @@ msgstr ""
 
 #: actions/editgroup.php:103 actions/editgroup.php:168
 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
 
 #: actions/editgroup.php:103 actions/editgroup.php:168
 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106

-msgid "You must be an admin to edit the group"
-msgstr ""
+#, fuzzy
+msgid "You must be an admin to edit the group."
+msgstr "Gjør brukeren til en administrator for gruppen"

 
 #: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 
 #: actions/editgroup.php:154
 msgid "Use this form to edit the group."


@@ -1027,7 +1025,8 @@ msgid "Options saved."
 msgstr ""
 
 #: actions/emailsettings.php:60
 msgstr ""
 
 #: actions/emailsettings.php:60

-msgid "Email Settings"
+#, fuzzy
+msgid "Email settings"

 msgstr "Innstillinger for e-post"
 
 #: actions/emailsettings.php:71
 msgstr "Innstillinger for e-post"
 
 #: actions/emailsettings.php:71


@@ -1064,7 +1063,8 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #: actions/emailsettings.php:121
 msgstr "Avbryt"
 
 #: actions/emailsettings.php:121

-msgid "Email Address"
+#, fuzzy
+msgid "Email address"

 msgstr "E-postadresse"
 
 #: actions/emailsettings.php:123
 msgstr "E-postadresse"
 
 #: actions/emailsettings.php:123


@@ -1138,9 +1138,10 @@ msgstr "Ingen e-postadresse."
 msgid "Cannot normalize that email address"
 msgstr "Klarer ikke normalisere epostadressen"
 
 msgid "Cannot normalize that email address"
 msgstr "Klarer ikke normalisere epostadressen"
 

-#: actions/emailsettings.php:331 actions/siteadminpanel.php:157
-msgid "Not a valid email address"
-msgstr "Ugyldig e-postadresse"
+#: actions/emailsettings.php:331 actions/register.php:201
+#: actions/siteadminpanel.php:157
+msgid "Not a valid email address."
+msgstr "Ugyldig e-postadresse."

 
 #: actions/emailsettings.php:334
 msgid "That is already your email address."
 
 #: actions/emailsettings.php:334
 msgid "That is already your email address."


@@ -1319,14 +1320,6 @@ msgstr ""
 msgid "Error updating remote profile"
 msgstr ""
 
 msgid "Error updating remote profile"
 msgstr ""
 

-#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
-#: actions/grouprss.php:98 actions/groupunblock.php:86
-#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212
-#: lib/command.php:263
-#, fuzzy
-msgid "No such group."
-msgstr "Klarte ikke å lagre profil."
-

 #: actions/getfile.php:79
 #, fuzzy
 msgid "No such file."
 #: actions/getfile.php:79
 #, fuzzy
 msgid "No such file."


@@ -1345,7 +1338,7 @@ msgstr ""
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46

-#: lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:77

 msgid "No profile with that ID."
 msgstr ""
 
 msgid "No profile with that ID."
 msgstr ""
 


@@ -1391,9 +1384,10 @@ msgstr ""
 msgid "Database error blocking user from group."
 msgstr ""
 
 msgid "Database error blocking user from group."
 msgstr ""
 

-#: actions/groupbyid.php:74
-msgid "No ID"
-msgstr "Ingen ID"
+#: actions/groupbyid.php:74 actions/userbyid.php:70
+#, fuzzy
+msgid "No ID."
+msgstr "Ingen id."

 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."


@@ -1415,12 +1409,6 @@ msgstr ""
 msgid "Couldn't update your design."
 msgstr "Klarte ikke å oppdatere bruker."
 
 msgid "Couldn't update your design."
 msgstr "Klarte ikke å oppdatere bruker."
 

-#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings!"
-msgstr ""
-

 #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
 msgid "Design preferences saved."
 msgstr ""
 #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
 msgid "Design preferences saved."
 msgstr ""


@@ -1435,6 +1423,11 @@ msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 

+#: actions/grouplogo.php:178
+#, fuzzy
+msgid "User without matching profile."
+msgstr "Brukeren har ingen profil."
+

 #: actions/grouplogo.php:362
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 #: actions/grouplogo.php:362
 msgid "Pick a square area of the image to be the logo."
 msgstr ""


@@ -1556,7 +1549,8 @@ msgid "Error removing the block."
 msgstr ""
 
 #: actions/imsettings.php:59
 msgstr ""
 
 #: actions/imsettings.php:59

-msgid "IM Settings"
+#, fuzzy
+msgid "IM settings"

 msgstr "Innstillinger for IM"
 
 #: actions/imsettings.php:70
 msgstr "Innstillinger for IM"
 
 #: actions/imsettings.php:70


@@ -1584,7 +1578,8 @@ msgstr ""
 "instruksjoner (la du %s til vennelisten din?)"
 
 #: actions/imsettings.php:124
 "instruksjoner (la du %s til vennelisten din?)"
 
 #: actions/imsettings.php:124

-msgid "IM Address"
+#, fuzzy
+msgid "IM address"

 msgstr "IM-adresse"
 
 #: actions/imsettings.php:126
 msgstr "IM-adresse"
 
 #: actions/imsettings.php:126


@@ -1784,17 +1779,7 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr ""
 
 msgid "You must be logged in to join a group."
 msgstr ""
 

-#: actions/joingroup.php:90
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Du er allerede logget inn!"
-
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Klarte ikke å oppdatere bruker."
-
-#: actions/joingroup.php:135 lib/command.php:239
+#: actions/joingroup.php:135

 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""


@@ -1811,68 +1796,64 @@ msgstr ""
 msgid "Could not find membership record."
 msgstr ""
 
 msgid "Could not find membership record."
 msgstr ""
 

-#: actions/leavegroup.php:134 lib/command.php:289
+#: actions/leavegroup.php:134

 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s sin status på %2$s"
 
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s sin status på %2$s"
 

-#: actions/login.php:83 actions/register.php:137
+#: actions/login.php:80 actions/otp.php:62 actions/register.php:137

 msgid "Already logged in."
 msgstr "Allerede innlogget."
 
 msgid "Already logged in."
 msgstr "Allerede innlogget."
 

-#: actions/login.php:114 actions/login.php:124
-msgid "Invalid or expired token."
-msgstr ""
-
-#: actions/login.php:147
+#: actions/login.php:126

 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord"
 
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord"
 

-#: actions/login.php:153
+#: actions/login.php:132 actions/otp.php:120

 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikke autorisert."
 
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikke autorisert."
 

-#: actions/login.php:208 actions/login.php:261 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:460

 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Logg inn"
 
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Logg inn"
 

-#: actions/login.php:247
+#: actions/login.php:227

 msgid "Login to site"
 msgstr ""
 
 msgid "Login to site"
 msgstr ""
 

-#: actions/login.php:250 actions/profilesettings.php:106
-#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: actions/login.php:230 actions/profilesettings.php:106
+#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94

 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nick"
 
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nick"
 

-#: actions/login.php:253 actions/register.php:428
+#: actions/login.php:233 actions/register.php:429

 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Passord"
 
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Passord"
 

-#: actions/login.php:256 actions/register.php:477
+#: actions/login.php:236 actions/register.php:478

 msgid "Remember me"
 msgstr "Husk meg"
 
 msgid "Remember me"
 msgstr "Husk meg"
 

-#: actions/login.php:257 actions/register.php:479
+#: actions/login.php:237 actions/register.php:480

 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
 
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
 

-#: actions/login.php:267
+#: actions/login.php:247

 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 

-#: actions/login.php:286
+#: actions/login.php:266

 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 

-#: actions/login.php:290
+#: actions/login.php:270

 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"


@@ -1889,13 +1870,13 @@ msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "Du er allerede logget inn!"
 
 #: actions/makeadmin.php:132
 msgstr "Du er allerede logget inn!"
 
 #: actions/makeadmin.php:132

-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s"
-msgstr ""
+#, fuzzy, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "Klarte ikke å oppdatere bruker."

 
 #: actions/makeadmin.php:145
 #, fuzzy, php-format
 
 #: actions/makeadmin.php:145
 #, fuzzy, php-format

-msgid "Can't make %1$s an admin for group %2$s"
+msgid "Can't make %1$s an admin for group %2$s."

 msgstr "Gjør brukeren til en administrator for gruppen"
 
 #: actions/microsummary.php:69
 msgstr "Gjør brukeren til en administrator for gruppen"
 
 #: actions/microsummary.php:69


@@ -1937,9 +1918,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newmessage.php:185
 msgstr ""
 
 #: actions/newmessage.php:185

-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
+#, fuzzy, php-format
+msgid "Direct message to %s sent."
+msgstr "Direktemeldinger til %s"

 
 #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
 msgid "Ajax Error"
 
 #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
 msgid "Ajax Error"


@@ -2023,8 +2004,8 @@ msgstr ""
 msgid "Only "
 msgstr ""
 
 msgid "Only "
 msgstr ""
 

-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031
-#: lib/api.php:1059 lib/api.php:1169
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
+#: lib/api.php:1061 lib/api.php:1171

 msgid "Not a supported data format."
 msgstr ""
 
 msgid "Not a supported data format."
 msgstr ""
 


@@ -2070,6 +2051,29 @@ msgstr ""
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Bioen er for lang (max 140 tegn)"
 
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Bioen er for lang (max 140 tegn)"
 

+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "Nytt nick"
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "Nytt nick"
+
+#: actions/otp.php:90
+msgid "No login token requested."
+msgstr ""
+
+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "Nytt nick"
+
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr ""
+

 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"


@@ -2106,7 +2110,7 @@ msgid "6 or more characters"
 msgstr "6 eller flere tegn"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
 msgstr "6 eller flere tegn"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239

-#: actions/register.php:432 actions/smssettings.php:134
+#: actions/register.php:433 actions/smssettings.php:134

 msgid "Confirm"
 msgstr "Bekreft"
 
 msgid "Confirm"
 msgstr "Bekreft"
 


@@ -2273,8 +2277,9 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:308
 msgstr ""
 
 #: actions/pathsadminpanel.php:308

-msgid "SSL Server"
-msgstr ""
+#, fuzzy
+msgid "SSL server"
+msgstr "Gjenopprett"

 
 #: actions/pathsadminpanel.php:309
 msgid "Server to direct SSL requests to"
 
 #: actions/pathsadminpanel.php:309
 msgid "Server to direct SSL requests to"


@@ -2331,43 +2336,43 @@ msgstr ""
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
 

-#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/profilesettings.php:111 actions/register.php:448

 #: actions/showgroup.php:247 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Fullt navn"
 
 #: actions/showgroup.php:247 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Fullt navn"
 

-#: actions/profilesettings.php:115 actions/register.php:452
+#: actions/profilesettings.php:115 actions/register.php:453

 #: lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
 #: lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Hjemmesiden"
 

-#: actions/profilesettings.php:117 actions/register.php:454
+#: actions/profilesettings.php:117 actions/register.php:455

 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 

-#: actions/profilesettings.php:122 actions/register.php:460
+#: actions/profilesettings.php:122 actions/register.php:461

 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 

-#: actions/profilesettings.php:125 actions/register.php:463
+#: actions/profilesettings.php:125 actions/register.php:464

 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 

-#: actions/profilesettings.php:127 actions/register.php:465
+#: actions/profilesettings.php:127 actions/register.php:466

 msgid "Bio"
 msgstr "Om meg"
 
 msgid "Bio"
 msgstr "Om meg"
 

-#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/profilesettings.php:132 actions/register.php:471

 #: actions/showgroup.php:256 actions/tagother.php:112
 #: actions/userauthorization.php:158 lib/groupeditform.php:177
 #: lib/userprofile.php:164
 msgid "Location"
 msgstr ""
 
 #: actions/showgroup.php:256 actions/tagother.php:112
 #: actions/userauthorization.php:158 lib/groupeditform.php:177
 #: lib/userprofile.php:164
 msgid "Location"
 msgstr ""
 

-#: actions/profilesettings.php:134 actions/register.php:472
+#: actions/profilesettings.php:134 actions/register.php:473

 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 


@@ -2664,7 +2669,7 @@ msgstr ""
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 

-#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+#: actions/register.php:85 actions/register.php:189 actions/register.php:405

 msgid "Sorry, only invited people can register."
 msgstr ""
 
 msgid "Sorry, only invited people can register."
 msgstr ""
 


@@ -2676,7 +2681,7 @@ msgstr ""
 msgid "Registration successful"
 msgstr ""
 
 msgid "Registration successful"
 msgstr ""
 

-#: actions/register.php:114 actions/register.php:502 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:457

 #: lib/logingroupnav.php:85
 msgid "Register"
 msgstr ""
 #: lib/logingroupnav.php:85
 msgid "Register"
 msgstr ""


@@ -2689,59 +2694,55 @@ msgstr ""
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 

-#: actions/register.php:201
-msgid "Not a valid email address."
-msgstr "Ugyldig e-postadresse."
-

 #: actions/register.php:212
 msgid "Email address already exists."
 msgstr ""
 
 #: actions/register.php:212
 msgid "Email address already exists."
 msgstr ""
 

-#: actions/register.php:243 actions/register.php:264
+#: actions/register.php:243 actions/register.php:265

 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord"
 
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord"
 

-#: actions/register.php:342
+#: actions/register.php:343

 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
 
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
 

-#: actions/register.php:424
+#: actions/register.php:425

 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
 

-#: actions/register.php:429
+#: actions/register.php:430

 msgid "6 or more characters. Required."
 msgstr "6 eller flere tegn. Påkrevd."
 
 msgid "6 or more characters. Required."
 msgstr "6 eller flere tegn. Påkrevd."
 

-#: actions/register.php:433
+#: actions/register.php:434

 msgid "Same as password above. Required."
 msgstr ""
 
 msgid "Same as password above. Required."
 msgstr ""
 

-#: actions/register.php:437 actions/register.php:441
+#: actions/register.php:438 actions/register.php:442

 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
 msgid "Email"
 msgstr "E-post"
 
 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
 msgid "Email"
 msgstr "E-post"
 

-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:439 actions/register.php:443

 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 

-#: actions/register.php:449
+#: actions/register.php:450

 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 

-#: actions/register.php:493
+#: actions/register.php:494

 msgid "My text and files are available under "
 msgstr ""
 
 msgid "My text and files are available under "
 msgstr ""
 

-#: actions/register.php:495
+#: actions/register.php:496

 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 

-#: actions/register.php:496
+#: actions/register.php:497

 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "


@@ -2750,7 +2751,7 @@ msgstr ""
 "utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og "
 "telefonnummer."
 
 "utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og "
 "telefonnummer."
 

-#: actions/register.php:537
+#: actions/register.php:538

 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "


@@ -2783,7 +2784,7 @@ msgstr ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 

-#: actions/register.php:561
+#: actions/register.php:562

 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"


@@ -3031,7 +3032,7 @@ msgstr "Medlem siden"
 
 #: actions/showgroup.php:386 lib/profileaction.php:117
 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
 
 #: actions/showgroup.php:386 lib/profileaction.php:117
 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95

-#: lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71

 msgid "(None)"
 msgstr ""
 
 msgid "(None)"
 msgstr ""
 


@@ -3185,12 +3186,12 @@ msgstr ""
 
 #: actions/siteadminpanel.php:154
 #, fuzzy
 
 #: actions/siteadminpanel.php:154
 #, fuzzy

-msgid "You must have a valid contact email address"
+msgid "You must have a valid contact email address."

 msgstr "Ugyldig e-postadresse"
 
 #: actions/siteadminpanel.php:172
 #, php-format
 msgstr "Ugyldig e-postadresse"
 
 #: actions/siteadminpanel.php:172
 #, php-format

-msgid "Unknown language \"%s\""
+msgid "Unknown language \"%s\"."

 msgstr ""
 
 #: actions/siteadminpanel.php:179
 msgstr ""
 
 #: actions/siteadminpanel.php:179


@@ -3373,7 +3374,8 @@ msgid "Save site settings"
 msgstr "Innstillinger for IM"
 
 #: actions/smssettings.php:58
 msgstr "Innstillinger for IM"
 
 #: actions/smssettings.php:58

-msgid "SMS Settings"
+#, fuzzy
+msgid "SMS settings"

 msgstr "Innstillinger for SMS"
 
 #: actions/smssettings.php:69
 msgstr "Innstillinger for SMS"
 
 #: actions/smssettings.php:69


@@ -3402,7 +3404,8 @@ msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: actions/smssettings.php:138
 msgstr ""
 
 #: actions/smssettings.php:138

-msgid "SMS Phone number"
+#, fuzzy
+msgid "SMS phone number"

 msgstr "Telefonnummer for SMS"
 
 #: actions/smssettings.php:140
 msgstr "Telefonnummer for SMS"
 
 #: actions/smssettings.php:140


@@ -3648,10 +3651,6 @@ msgstr ""
 msgid "No profile id in request."
 msgstr ""
 
 msgid "No profile id in request."
 msgstr ""
 

-#: actions/unsubscribe.php:84
-msgid "No profile with that id."
-msgstr ""
-

 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""


@@ -3848,11 +3847,6 @@ msgstr "Kan ikke lese brukerbilde-URL «%s»"
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 

-#: actions/userbyid.php:70
-#, fuzzy
-msgid "No ID."
-msgstr "Ingen id."
-

 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
 msgid "Profile design"
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
 msgid "Profile design"


@@ -3949,23 +3943,28 @@ msgstr ""
 msgid "Description"
 msgstr "Alle abonnementer"
 
 msgid "Description"
 msgstr "Alle abonnementer"
 

-#: classes/File.php:137
+#: classes/File.php:144

 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 "to upload a smaller version."
 msgstr ""
 
 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 "to upload a smaller version."
 msgstr ""
 

-#: classes/File.php:147
+#: classes/File.php:154

 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 

-#: classes/File.php:154
+#: classes/File.php:161

 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 

+#: classes/Login_token.php:76
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+

 #: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr ""
 #: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr ""


@@ -4064,6 +4063,11 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
 msgid "Other options"
 msgstr ""
 

+#: lib/action.php:144
+#, fuzzy, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s sin status på %2$s"
+

 #: lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 #: lib/action.php:159
 msgid "Untitled page"
 msgstr ""


@@ -4324,7 +4328,7 @@ msgstr ""
 
 #: lib/command.php:88
 #, fuzzy, php-format
 
 #: lib/command.php:88
 #, fuzzy, php-format

-msgid "Could not find a user with nickname %s."
+msgid "Could not find a user with nickname %s"

 msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
 #: lib/command.php:92
 msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
 #: lib/command.php:92


@@ -4332,9 +4336,9 @@ msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #: lib/command.php:99
 msgstr ""
 
 #: lib/command.php:99

-#, php-format
-msgid "Nudge sent to %s."
-msgstr ""
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Svar til %s"

 
 #: lib/command.php:126
 #, php-format
 
 #: lib/command.php:126
 #, php-format


@@ -4345,35 +4349,55 @@ msgid ""
 msgstr ""
 
 #: lib/command.php:152 lib/command.php:399 lib/command.php:460
 msgstr ""
 
 #: lib/command.php:152 lib/command.php:399 lib/command.php:460

-msgid "Notice with that id does not exist."
+msgid "Notice with that id does not exist"

 msgstr ""
 
 #: lib/command.php:168 lib/command.php:415 lib/command.php:476
 #: lib/command.php:532
 #, fuzzy
 msgstr ""
 
 #: lib/command.php:168 lib/command.php:415 lib/command.php:476
 #: lib/command.php:532
 #, fuzzy

-msgid "User has no last notice."
+msgid "User has no last notice"

 msgstr "Brukeren har ingen profil."
 
 #: lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
 msgstr "Brukeren har ingen profil."
 
 #: lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 

+#: lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Du er allerede medlem av den gruppen."
+
+#: lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Klarte ikke å oppdatere bruker."
+
+#: lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%1$s sin status på %2$s"
+

 #: lib/command.php:284
 #, fuzzy, php-format
 #: lib/command.php:284
 #, fuzzy, php-format

-msgid "Could not remove user %1$s to group %2$s."
+msgid "Could not remove user %s to group %s"

 msgstr "Klarte ikke å oppdatere bruker."
 
 msgstr "Klarte ikke å oppdatere bruker."
 

+#: lib/command.php:289
+#, fuzzy, php-format
+msgid "%s left group %s"
+msgstr "%1$s sin status på %2$s"
+

 #: lib/command.php:318
 #: lib/command.php:318

-#, php-format
+#, fuzzy, php-format

 msgid "Fullname: %s"
 msgid "Fullname: %s"

-msgstr ""
+msgstr "Fullt navn"

 
 

-#: lib/command.php:321
+#: lib/command.php:321 lib/mail.php:254

 #, php-format
 msgid "Location: %s"
 msgstr ""
 
 #, php-format
 msgid "Location: %s"
 msgstr ""
 

-#: lib/command.php:324
+#: lib/command.php:324 lib/mail.php:256

 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 #, php-format
 msgid "Homepage: %s"
 msgstr ""


@@ -4385,21 +4409,31 @@ msgstr ""
 
 #: lib/command.php:358
 #, php-format
 
 #: lib/command.php:358
 #, php-format

-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgid "Message too long - maximum is %d characters, you sent %d"

 msgstr ""
 
 #: lib/command.php:376
 #, fuzzy, php-format
 msgstr ""
 
 #: lib/command.php:376
 #, fuzzy, php-format

-msgid "Direct message to %s sent."
+msgid "Direct message to %s sent"

 msgstr "Direktemeldinger til %s"
 
 #: lib/command.php:378
 msgid "Error sending direct message."
 msgstr ""
 
 msgstr "Direktemeldinger til %s"
 
 #: lib/command.php:378
 msgid "Error sending direct message."
 msgstr ""
 

+#: lib/command.php:422
+#, fuzzy
+msgid "Cannot repeat your own notice"
+msgstr "Kan ikke slette notisen."
+
+#: lib/command.php:427
+#, fuzzy
+msgid "Already repeated that notice"
+msgstr "Kan ikke slette notisen."
+

 #: lib/command.php:435
 #, fuzzy, php-format
 #: lib/command.php:435
 #, fuzzy, php-format

-msgid "Notice from %s repeated."
+msgid "Notice from %s repeated"

 msgstr "Nytt nick"
 
 #: lib/command.php:437
 msgstr "Nytt nick"
 
 #: lib/command.php:437


@@ -4408,12 +4442,12 @@ msgstr ""
 
 #: lib/command.php:491
 #, php-format
 
 #: lib/command.php:491
 #, php-format

-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgid "Notice too long - maximum is %d characters, you sent %d"

 msgstr ""
 
 #: lib/command.php:500
 #, fuzzy, php-format
 msgstr ""
 
 #: lib/command.php:500
 #, fuzzy, php-format

-msgid "Reply to %s sent."
+msgid "Reply to %s sent"

 msgstr "Svar til %s"
 
 #: lib/command.php:502
 msgstr "Svar til %s"
 
 #: lib/command.php:502


@@ -4421,7 +4455,7 @@ msgid "Error saving notice."
 msgstr ""
 
 #: lib/command.php:556
 msgstr ""
 
 #: lib/command.php:556

-msgid "Specify the name of the user to subscribe to."
+msgid "Specify the name of the user to subscribe to"

 msgstr ""
 
 #: lib/command.php:563
 msgstr ""
 
 #: lib/command.php:563


@@ -4430,7 +4464,7 @@ msgid "Subscribed to %s"
 msgstr ""
 
 #: lib/command.php:584
 msgstr ""
 
 #: lib/command.php:584

-msgid "Specify the name of the user to unsubscribe from."
+msgid "Specify the name of the user to unsubscribe from"

 msgstr ""
 
 #: lib/command.php:591
 msgstr ""
 
 #: lib/command.php:591


@@ -4459,53 +4493,48 @@ msgid "Can't turn on notification."
 msgstr ""
 
 #: lib/command.php:650
 msgstr ""
 
 #: lib/command.php:650

-msgid "Login command is disabled."
+msgid "Login command is disabled"

 msgstr ""
 
 msgstr ""
 

-#: lib/command.php:664
-#, fuzzy, php-format
-msgid "Could not create login token for %s."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: lib/command.php:669
+#: lib/command.php:661

 #, php-format
 #, php-format

-msgid "This link is useable only once, and is good for only 2 minutes: %s."
+msgid "This link is useable only once, and is good for only 2 minutes: %s"

 msgstr ""
 
 msgstr ""
 

-#: lib/command.php:685
+#: lib/command.php:677

 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Ikke autorisert."
 
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Ikke autorisert."
 

-#: lib/command.php:687
+#: lib/command.php:679

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ikke autorisert."
 msgstr[1] "Ikke autorisert."
 
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ikke autorisert."
 msgstr[1] "Ikke autorisert."
 

-#: lib/command.php:707
+#: lib/command.php:699

 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Svar til %s"
 
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Svar til %s"
 

-#: lib/command.php:709
+#: lib/command.php:701

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Svar til %s"
 msgstr[1] "Svar til %s"
 
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Svar til %s"
 msgstr[1] "Svar til %s"
 

-#: lib/command.php:729
+#: lib/command.php:721

 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er allerede logget inn!"
 
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er allerede logget inn!"
 

-#: lib/command.php:731
+#: lib/command.php:723

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 

-#: lib/command.php:745
+#: lib/command.php:737

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -4836,22 +4865,10 @@ msgstr ""
 "Vennlig hilsen,\n"
 "%4$s.\n"
 
 "Vennlig hilsen,\n"
 "%4$s.\n"
 

-#: lib/mail.php:254
-#, php-format
-msgid "Location: %s\n"
-msgstr ""
-
-#: lib/mail.php:256
-#, fuzzy, php-format
-msgid "Homepage: %s\n"
-msgstr "Hjemmesiden: %s\n"
-

 #: lib/mail.php:258
 #: lib/mail.php:258

-#, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
-msgstr ""
+#, fuzzy, php-format
+msgid "Bio: %s"
+msgstr "Om meg"

 
 #: lib/mail.php:286
 #, php-format
 
 #: lib/mail.php:286
 #, php-format


@@ -5038,7 +5055,7 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #: lib/mediafile.php:179 lib/mediafile.php:216
 msgstr ""
 
 #: lib/mediafile.php:179 lib/mediafile.php:216

-msgid "File exceeds user's quota!"
+msgid "File exceeds user's quota."

 msgstr ""
 
 #: lib/mediafile.php:196 lib/mediafile.php:233
 msgstr ""
 
 #: lib/mediafile.php:196 lib/mediafile.php:233


@@ -5046,8 +5063,9 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:201 lib/mediafile.php:237
 msgstr ""
 
 #: lib/mediafile.php:201 lib/mediafile.php:237

-msgid "Could not determine file's mime-type!"
-msgstr ""
+#, fuzzy
+msgid "Could not determine file's MIME type."
+msgstr "Klarte ikke å oppdatere bruker."

 
 #: lib/mediafile.php:270
 #, php-format
 
 #: lib/mediafile.php:270
 #, php-format


@@ -5056,7 +5074,7 @@ msgstr ""
 
 #: lib/mediafile.php:275
 #, php-format
 
 #: lib/mediafile.php:275
 #, php-format

-msgid "%s is not a supported filetype on this server."
+msgid "%s is not a supported file type on this server."

 msgstr ""
 
 #: lib/messageform.php:120
 msgstr ""
 
 #: lib/messageform.php:120


@@ -5091,12 +5109,12 @@ msgstr ""
 
 #: lib/noticeform.php:212
 #, fuzzy
 
 #: lib/noticeform.php:212
 #, fuzzy

-msgid "Share my location."
+msgid "Share my location"

 msgstr "Klarte ikke å lagre profil."
 
 #: lib/noticeform.php:214
 #, fuzzy
 msgstr "Klarte ikke å lagre profil."
 
 #: lib/noticeform.php:214
 #, fuzzy

-msgid "Do not share my location."
+msgid "Do not share my location"

 msgstr "Klarte ikke å lagre profil."
 
 #: lib/noticeform.php:215
 msgstr "Klarte ikke å lagre profil."
 
 #: lib/noticeform.php:215


@@ -5404,10 +5422,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
 msgid "People Tagcloud as tagged"
 msgstr ""
 

-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-

 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""


@@ -5472,47 +5486,47 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
 msgid "Moderate"
 msgstr ""
 

-#: lib/util.php:837
+#: lib/util.php:884

 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 
 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 

-#: lib/util.php:839
+#: lib/util.php:886

 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 

-#: lib/util.php:841
+#: lib/util.php:888

 #, php-format
 msgid "about %d minutes ago"
 msgstr "omtrent %d minutter siden"
 
 #, php-format
 msgid "about %d minutes ago"
 msgstr "omtrent %d minutter siden"
 

-#: lib/util.php:843
+#: lib/util.php:890

 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 

-#: lib/util.php:845
+#: lib/util.php:892

 #, php-format
 msgid "about %d hours ago"
 msgstr "omtrent %d timer siden"
 
 #, php-format
 msgid "about %d hours ago"
 msgstr "omtrent %d timer siden"
 

-#: lib/util.php:847
+#: lib/util.php:894

 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 
 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 

-#: lib/util.php:849
+#: lib/util.php:896

 #, php-format
 msgid "about %d days ago"
 msgstr "omtrent %d dager siden"
 
 #, php-format
 msgid "about %d days ago"
 msgstr "omtrent %d dager siden"
 

-#: lib/util.php:851
+#: lib/util.php:898

 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 
 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 

-#: lib/util.php:853
+#: lib/util.php:900

 #, php-format
 msgid "about %d months ago"
 msgstr "omtrent %d måneder siden"
 
 #, php-format
 msgid "about %d months ago"
 msgstr "omtrent %d måneder siden"
 

-#: lib/util.php:855
+#: lib/util.php:902

 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 


@@ -5528,5 +5542,5 @@ msgstr ""
 
 #: scripts/xmppdaemon.php:301
 #, php-format
 
 #: scripts/xmppdaemon.php:301
 #, php-format

-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."

 msgstr ""
 msgstr ""