Merge remote branch 'gitorious/0.9.x' into 0.9.x

1 files changed, 29 insertions, 39 deletions

diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 0fbdd0302..168ceaa95 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:42:03+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:53+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-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-09 14:31:24+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
@@ -895,7 +895,7 @@ msgstr ""
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:153 actions/deleteapplication.php:154
-#: actions/deletegroup.php:211 actions/deletenotice.php:150
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -914,7 +914,7 @@ msgstr "Ikke blokker denne brukeren"
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletegroup.php:218 actions/deletenotice.php:157
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -930,10 +930,12 @@ msgstr "Blokker denne brukeren"
 msgid "Failed to save block information."
 msgstr "Kunne ikke lagre blokkeringsinformasjon."
 
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
-#: actions/deletegroup.php:87 actions/deletegroup.php:98
+#: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1088,37 +1090,46 @@ msgstr "Ikke slett dette programmet"
 msgid "Delete this application"
 msgstr "Slett dette programmet"
 
-#: actions/deletegroup.php:65
+#. TRANS: Client error when trying to delete group while not logged in.
+#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Du må være innlogget for å forlate en gruppe."
 
-#: actions/deletegroup.php:93 actions/joingroup.php:88
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
 #: actions/leavegroup.php:88
 msgid "No nickname or ID."
 msgstr "ngen kallenavn eller ID."
 
-#: actions/deletegroup.php:104
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Du er ikke et medlem av denne gruppen."
 
-#: actions/deletegroup.php:146
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#: actions/deletegroup.php:150
 #, fuzzy, php-format
-msgid "Could not delete group %2$s."
+msgid "Could not delete group %s."
 msgstr "Kunne ikke oppdatere gruppe."
 
-#: actions/deletegroup.php:153
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
 #, fuzzy, php-format
-msgid "Deleted group %2$s"
+msgid "Deleted group %s"
 msgstr "%1$s forlot gruppe %2$s"
 
-#: actions/deletegroup.php:169 actions/deletegroup.php:194
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Slett bruker"
 
-#: actions/deletegroup.php:197
+#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1129,13 +1140,13 @@ msgstr ""
 "om brukeren fra databasen, uten sikkerhetskopi."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:215
+#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group"
 msgstr "Ikke slett denne notisen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:222
+#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group"
 msgstr "Slett denne brukeren"
@@ -7613,24 +7624,3 @@ msgstr "Ingen bruker-ID spesifisert."
 #, php-format
 msgid "%d entries in backup."
 msgstr ""
-
-#~ msgid "Deny"
-#~ msgstr "Nekt"
-
-#~ msgid "Path to locales"
-#~ msgstr "Lokaliseringssti"
-
-#~ msgid "Theme server"
-#~ msgstr "Tematjener"
-
-#~ msgid "Theme path"
-#~ msgstr "Temasti"
-
-#~ msgid "Background server"
-#~ msgstr "Bakgrunnstjener"
-
-#~ msgid "Background path"
-#~ msgstr "Bakgrunnssti"
-
-#~ msgid "Background directory"
-#~ msgstr "Bakgrunnsmappe"