diff options
author | Brion Vibber <brion@pobox.com> | 2010-12-16 15:56:19 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-12-16 15:56:19 -0800 |
commit | e79034e163967a375aee8a9afff54fd9c37030dd (patch) | |
tree | daa48934b25ea7e4f399d59981c9534e7e43fbcc /plugins/OpenID/locale/nb/LC_MESSAGES | |
parent | bf20258f4b61dd8396db9a1980463c060dab292c (diff) | |
parent | f901c25012f6c83f70c83bff9e76edb4d01b8373 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
Diffstat (limited to 'plugins/OpenID/locale/nb/LC_MESSAGES')
-rw-r--r-- | plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po index c99c9fb67..038e5f42a 100644 --- a/plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - OpenID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-30 20:16+0000\n" -"PO-Revision-Date: 2010-11-30 20:19:36+0000\n" +"POT-Creation-Date: 2010-12-16 15:08+0000\n" +"PO-Revision-Date: 2010-12-16 15:12:30+0000\n" "Language-Team: Norwegian (bokmål) <http://translatewiki.net/wiki/Portal:no>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n" -"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n" +"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: #out-statusnet-plugin-openid\n" @@ -382,113 +382,113 @@ msgstr "" msgid "OpenID Account Setup" msgstr "" -#: finishopenidlogin.php:110 +#: finishopenidlogin.php:117 msgid "Create new account" msgstr "Opprett ny konto" -#: finishopenidlogin.php:112 +#: finishopenidlogin.php:119 msgid "Create a new user with this nickname." msgstr "Opprett en ny bruker med dette kallenavnet." -#: finishopenidlogin.php:115 +#: finishopenidlogin.php:122 msgid "New nickname" msgstr "Nytt kallenavn" -#: finishopenidlogin.php:117 +#: finishopenidlogin.php:124 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom" #. TRANS: Button label in form in which to create a new user on the site for an OpenID. -#: finishopenidlogin.php:142 +#: finishopenidlogin.php:149 msgctxt "BUTTON" msgid "Create" msgstr "Opprett" #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site. -#: finishopenidlogin.php:148 +#: finishopenidlogin.php:163 msgid "Connect existing account" msgstr "" #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site. -#: finishopenidlogin.php:151 +#: finishopenidlogin.php:166 msgid "" "If you already have an account, login with your username and password to " "connect it to your OpenID." msgstr "" #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site. -#: finishopenidlogin.php:155 +#: finishopenidlogin.php:170 msgid "Existing nickname" msgstr "" #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site. -#: finishopenidlogin.php:159 +#: finishopenidlogin.php:174 msgid "Password" msgstr "Passord" #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site. -#: finishopenidlogin.php:163 +#: finishopenidlogin.php:178 msgctxt "BUTTON" msgid "Connect" msgstr "Koble til" #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled. -#: finishopenidlogin.php:176 finishaddopenid.php:90 +#: finishopenidlogin.php:191 finishaddopenid.php:90 msgid "OpenID authentication cancelled." msgstr "" #. TRANS: OpenID authentication failed; display the error message. %s is the error message. #. TRANS: OpenID authentication failed; display the error message. #. TRANS: %s is the error message. -#: finishopenidlogin.php:180 finishaddopenid.php:95 +#: finishopenidlogin.php:195 finishaddopenid.php:95 #, php-format msgid "OpenID authentication failed: %s" msgstr "" -#: finishopenidlogin.php:200 finishaddopenid.php:111 +#: finishopenidlogin.php:215 finishaddopenid.php:111 msgid "" "OpenID authentication aborted: you are not allowed to login to this site." msgstr "" #. TRANS: OpenID plugin message. No new user registration is allowed on the site. #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided. -#: finishopenidlogin.php:252 finishopenidlogin.php:262 +#: finishopenidlogin.php:267 finishopenidlogin.php:277 msgid "Registration not allowed." msgstr "" #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid. -#: finishopenidlogin.php:270 +#: finishopenidlogin.php:285 msgid "Not a valid invitation code." msgstr "" #. TRANS: OpenID plugin message. The entered new user name is blacklisted. -#: finishopenidlogin.php:284 +#: finishopenidlogin.php:299 msgid "Nickname not allowed." msgstr "" #. TRANS: OpenID plugin message. The entered new user name is already used. -#: finishopenidlogin.php:290 +#: finishopenidlogin.php:305 msgid "Nickname already in use. Try another one." msgstr "" #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved. #. TRANS: OpenID plugin server error. A stored OpenID cannot be found. -#: finishopenidlogin.php:298 finishopenidlogin.php:385 +#: finishopenidlogin.php:313 finishopenidlogin.php:400 msgid "Stored OpenID not found." msgstr "" #. TRANS: OpenID plugin server error. -#: finishopenidlogin.php:308 +#: finishopenidlogin.php:323 msgid "Creating new account for OpenID that already has a user." msgstr "" #. TRANS: OpenID plugin message. -#: finishopenidlogin.php:373 +#: finishopenidlogin.php:388 msgid "Invalid username or password." msgstr "" #. TRANS: OpenID plugin server error. The user or user profile could not be saved. -#: finishopenidlogin.php:393 +#: finishopenidlogin.php:408 msgid "Error connecting user to OpenID." msgstr "" |