Merge branch '0.9.x' into adminpanel

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

diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index c4fad2f35a422508e2c16a10eaf5fc6cc60bdbb4..c0bef7ddf29cdce9ed0eab799e4ec1a6f749a335 100644 (file)
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -5,12 +5,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: 2009-11-08 22:51+0000\n"
-"PO-Revision-Date: 2009-11-08 22:58:18+0000\n"
+"POT-Creation-Date: 2009-11-10 20:53+0000\n"
+"PO-Revision-Date: 2009-11-10 20:59:10+0000\n"

 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"

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


@@ -474,7 +474,7 @@ msgid "Invalid size."
 msgstr "Ótæk stærð."
 
 #: actions/avatarsettings.php:67 actions/showgroup.php:221
 msgstr "Ótæk stærð."
 
 #: actions/avatarsettings.php:67 actions/showgroup.php:221

-#: lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:113

 msgid "Avatar"
 msgstr "Mynd"
 
 msgid "Avatar"
 msgstr "Mynd"
 


@@ -522,7 +522,7 @@ msgstr "Skera af"
 #: actions/groupunblock.php:66 actions/imsettings.php:206
 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/groupunblock.php:66 actions/imsettings.php:206
 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80

-#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/othersettings.php:145 actions/passwordsettings.php:151

 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
 #: actions/register.php:165 actions/remotesubscribe.php:77
 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
 #: actions/register.php:165 actions/remotesubscribe.php:77
 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46


@@ -620,7 +620,7 @@ msgstr "Engin persónuleg síða tilgreind"
 msgid "No profile with that ID."
 msgstr "Engin persónulega síða með þessu einkenni"
 
 msgid "No profile with that ID."
 msgstr "Engin persónulega síða með þessu einkenni"
 

-#: actions/block.php:111 actions/block.php:134
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160

 msgid "Block user"
 msgstr "Loka á notanda"
 
 msgid "Block user"
 msgstr "Loka á notanda"
 


@@ -632,22 +632,24 @@ msgid ""
 msgstr ""
 
 #: actions/block.php:149 actions/deletenotice.php:145
 msgstr ""
 
 #: actions/block.php:149 actions/deletenotice.php:145

-#: actions/groupblock.php:176
+#: actions/groupblock.php:178

 msgid "No"
 msgstr "Nei"
 
 #: actions/block.php:149
 msgid "No"
 msgstr "Nei"
 
 #: actions/block.php:149

-msgid "Do not block this user from this group"
-msgstr ""
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Opna á þennan notanda"

 
 #: actions/block.php:150 actions/deletenotice.php:146
 
 #: actions/block.php:150 actions/deletenotice.php:146

-#: actions/groupblock.php:177
+#: actions/groupblock.php:179

 msgid "Yes"
 msgstr "Já"
 
 msgid "Yes"
 msgstr "Já"
 

-#: actions/block.php:150
-msgid "Block this user from this group"
-msgstr ""
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Loka á þennan notanda"

 
 #: actions/block.php:165
 msgid "You have already blocked this user."
 
 #: actions/block.php:165
 msgid "You have already blocked this user."


@@ -1132,7 +1134,7 @@ msgstr ""
 msgid "Block user from group"
 msgstr ""
 
 msgid "Block user from group"
 msgstr ""
 

-#: actions/groupblock.php:155
+#: actions/groupblock.php:162

 #, php-format
 msgid ""
 "Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%s\" from the group \"%s\"? They will "


@@ -1140,7 +1142,15 @@ msgid ""
 "group in the future."
 msgstr ""
 
 "group in the future."
 msgstr ""
 

-#: actions/groupblock.php:193
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/groupblock.php:196

 msgid "Database error blocking user from group."
 msgstr ""
 
 msgid "Database error blocking user from group."
 msgstr ""
 


@@ -1199,7 +1209,7 @@ msgstr "Einkennismynd uppfærð."
 msgid "Failed updating logo."
 msgstr "Tókst ekki að uppfæra einkennismynd"
 
 msgid "Failed updating logo."
 msgstr "Tókst ekki að uppfæra einkennismynd"
 

-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/groupmembers.php:93 lib/groupnav.php:92

 #, php-format
 msgid "%s group members"
 msgstr "Hópmeðlimir %s"
 #, php-format
 msgid "%s group members"
 msgstr "Hópmeðlimir %s"


@@ -1213,7 +1223,7 @@ msgstr "Hópmeðlimir %s, síða %d"
 msgid "A list of the users in this group."
 msgstr "Listi yfir notendur í þessum hóp."
 
 msgid "A list of the users in this group."
 msgstr "Listi yfir notendur í þessum hóp."
 

-#: actions/groupmembers.php:175 lib/groupnav.php:106
+#: actions/groupmembers.php:175 lib/groupnav.php:107

 msgid "Admin"
 msgstr "Stjórnandi"
 
 msgid "Admin"
 msgstr "Stjórnandi"
 


@@ -1221,10 +1231,6 @@ msgstr "Stjórnandi"
 msgid "Block"
 msgstr "Loka"
 
 msgid "Block"
 msgstr "Loka"
 

-#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Loka á þennan notanda"
-

 #: actions/groupmembers.php:441
 msgid "Make user an admin of the group"
 msgstr ""
 #: actions/groupmembers.php:441
 msgid "Make user an admin of the group"
 msgstr ""


@@ -1632,7 +1638,7 @@ msgid "Nickname"
 msgstr "Stuttnefni"
 
 #: actions/login.php:249 actions/register.php:428
 msgstr "Stuttnefni"
 
 #: actions/login.php:249 actions/register.php:428

-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:118

 msgid "Password"
 msgstr "Lykilorð"
 
 msgid "Password"
 msgstr "Lykilorð"
 


@@ -1879,60 +1885,65 @@ msgstr ""
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
 msgid "Change password"
 msgstr "Breyta lykilorði"
 

-#: actions/passwordsettings.php:69
+#: actions/passwordsettings.php:70
+#, fuzzy
+msgid "You are not allowed to change your password"
+msgstr "Breyta lykilorðinu þínu"
+
+#: actions/passwordsettings.php:82

 msgid "Change your password."
 msgstr "Breyta lykilorðinu þínu."
 
 msgid "Change your password."
 msgstr "Breyta lykilorðinu þínu."
 

-#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:109 actions/recoverpassword.php:231

 msgid "Password change"
 msgstr "Lykilorðabreyting"
 
 msgid "Password change"
 msgstr "Lykilorðabreyting"
 

-#: actions/passwordsettings.php:103
+#: actions/passwordsettings.php:117

 msgid "Old password"
 msgstr "Eldra lykilorð"
 
 msgid "Old password"
 msgstr "Eldra lykilorð"
 

-#: actions/passwordsettings.php:107 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:121 actions/recoverpassword.php:235

 msgid "New password"
 msgstr "Nýtt lykilorð"
 
 msgid "New password"
 msgstr "Nýtt lykilorð"
 

-#: actions/passwordsettings.php:108
+#: actions/passwordsettings.php:122

 msgid "6 or more characters"
 msgstr "6 eða fleiri tákn"
 
 msgid "6 or more characters"
 msgstr "6 eða fleiri tákn"
 

-#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:125 actions/recoverpassword.php:239

 #: actions/register.php:432 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Staðfesta"
 
 #: actions/register.php:432 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Staðfesta"
 

-#: actions/passwordsettings.php:112
+#: actions/passwordsettings.php:126

 msgid "same as password above"
 msgstr "sama og lykilorðið hér fyrir ofan"
 
 msgid "same as password above"
 msgstr "sama og lykilorðið hér fyrir ofan"
 

-#: actions/passwordsettings.php:116
+#: actions/passwordsettings.php:130

 msgid "Change"
 msgstr "Breyta"
 
 msgid "Change"
 msgstr "Breyta"
 

-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:167 actions/register.php:230

 msgid "Password must be 6 or more characters."
 msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
 
 msgid "Password must be 6 or more characters."
 msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
 

-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:170 actions/register.php:233

 msgid "Passwords don't match."
 msgstr "Lykilorðin passa ekki saman."
 
 msgid "Passwords don't match."
 msgstr "Lykilorðin passa ekki saman."
 

-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:178

 msgid "Incorrect old password"
 msgstr "Rangt eldra lykilorð"
 
 msgid "Incorrect old password"
 msgstr "Rangt eldra lykilorð"
 

-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:194

 msgid "Error saving user; invalid."
 msgstr "Villa kom upp í vistun notanda: ótækt."
 
 msgid "Error saving user; invalid."
 msgstr "Villa kom upp í vistun notanda: ótækt."
 

-#: actions/passwordsettings.php:185 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:199 actions/recoverpassword.php:368

 msgid "Can't save new password."
 msgstr "Get ekki vistað nýja lykilorðið."
 
 msgid "Can't save new password."
 msgstr "Get ekki vistað nýja lykilorðið."
 

-#: actions/passwordsettings.php:191 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:205 actions/recoverpassword.php:211

 msgid "Password saved."
 msgstr "Lykilorð vistað."
 
 msgid "Password saved."
 msgstr "Lykilorð vistað."
 


@@ -2373,7 +2384,7 @@ msgid "Same as password above. Required."
 msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
 
 #: actions/register.php:437 actions/register.php:441
 msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
 
 #: actions/register.php:437 actions/register.php:441

-#: lib/accountsettingsaction.php:117
+#: lib/accountsettingsaction.php:122

 msgid "Email"
 msgstr "Tölvupóstur"
 
 msgid "Email"
 msgstr "Tölvupóstur"
 


@@ -2605,7 +2616,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
 msgid "This is a way to share what you like."
 msgstr ""
 

-#: actions/showgroup.php:82 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86

 #, php-format
 msgid "%s group"
 msgstr "%s hópurinn"
 #, php-format
 msgid "%s group"
 msgstr "%s hópurinn"


@@ -2657,7 +2668,7 @@ msgstr ""
 msgid "FOAF for %s group"
 msgstr "%s hópurinn"
 
 msgid "FOAF for %s group"
 msgstr "%s hópurinn"
 

-#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91

 msgid "Members"
 msgstr "Meðlimir"
 
 msgid "Members"
 msgstr "Meðlimir"
 


@@ -3293,39 +3304,39 @@ msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 

-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109

 msgid "Profile"
 msgstr "Persónuleg síða"
 
 msgid "Profile"
 msgstr "Persónuleg síða"
 

-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:110

 msgid "Change your profile settings"
 msgstr "Breyta persónulegu stillingunum þínum"
 
 msgid "Change your profile settings"
 msgstr "Breyta persónulegu stillingunum þínum"
 

-#: lib/accountsettingsaction.php:112
+#: lib/accountsettingsaction.php:114

 msgid "Upload an avatar"
 msgstr "Hlaða upp einkennismynd"
 
 msgid "Upload an avatar"
 msgstr "Hlaða upp einkennismynd"
 

-#: lib/accountsettingsaction.php:115
+#: lib/accountsettingsaction.php:119

 msgid "Change your password"
 msgstr "Breyta lykilorðinu þínu"
 
 msgid "Change your password"
 msgstr "Breyta lykilorðinu þínu"
 

-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:123

 msgid "Change email handling"
 msgstr "Breyta tölvupóstumsjón"
 
 msgid "Change email handling"
 msgstr "Breyta tölvupóstumsjón"
 

-#: lib/accountsettingsaction.php:120 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:125 lib/groupnav.php:119

 msgid "Design"
 msgstr ""
 
 msgid "Design"
 msgstr ""
 

-#: lib/accountsettingsaction.php:121
+#: lib/accountsettingsaction.php:126

 msgid "Design your profile"
 msgstr ""
 
 msgid "Design your profile"
 msgstr ""
 

-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:128

 msgid "Other"
 msgstr "Annað"
 
 msgid "Other"
 msgstr "Annað"
 

-#: lib/accountsettingsaction.php:124
+#: lib/accountsettingsaction.php:129

 msgid "Other options"
 msgstr "Aðrir valkostir"
 
 msgid "Other options"
 msgstr "Aðrir valkostir"
 


@@ -3911,34 +3922,34 @@ msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 

-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84

 msgid "Group"
 msgstr "Hópur"
 
 msgid "Group"
 msgstr "Hópur"
 

-#: lib/groupnav.php:100
+#: lib/groupnav.php:101

 msgid "Blocked"
 msgstr ""
 
 msgid "Blocked"
 msgstr ""
 

-#: lib/groupnav.php:101
+#: lib/groupnav.php:102

 #, php-format
 msgid "%s blocked users"
 msgstr ""
 
 #, php-format
 msgid "%s blocked users"
 msgstr ""
 

-#: lib/groupnav.php:107
+#: lib/groupnav.php:108

 #, php-format
 msgid "Edit %s group properties"
 msgstr "Breyta hópstillingum %s"
 
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Breyta hópstillingum %s"
 

-#: lib/groupnav.php:112
+#: lib/groupnav.php:113

 msgid "Logo"
 msgstr "Einkennismerki"
 
 msgid "Logo"
 msgstr "Einkennismerki"
 

-#: lib/groupnav.php:113
+#: lib/groupnav.php:114

 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Bæta við eða breyta einkennismerki %s"
 
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Bæta við eða breyta einkennismerki %s"
 

-#: lib/groupnav.php:119
+#: lib/groupnav.php:120

 #, php-format
 msgid "Add or edit %s design"
 msgstr ""
 #, php-format
 msgid "Add or edit %s design"
 msgstr ""


@@ -4136,7 +4147,7 @@ msgid ""
 "\n"
 "%3$s\n"
 "\n"
 "\n"
 "%3$s\n"
 "\n"

-"Do not reply to this email. It will not get to them.\n"
+"Don't reply to this email; it won't get to them.\n"

 "\n"
 "With kind regards,\n"
 "%4$s\n"
 "\n"
 "With kind regards,\n"
 "%4$s\n"


@@ -4160,7 +4171,7 @@ msgid ""
 "\n"
 "%4$s\n"
 "\n"
 "\n"
 "%4$s\n"
 "\n"

-"Do not reply to this email. It will not get to them.\n"
+"Don't reply to this email; it won't get to them.\n"

 "\n"
 "With kind regards,\n"
 "%5$s\n"
 "\n"
 "With kind regards,\n"
 "%5$s\n"


@@ -4553,47 +4564,47 @@ msgstr "Senda bein skilaboð til þessa notanda"
 msgid "Message"
 msgstr "Skilaboð"
 
 msgid "Message"
 msgstr "Skilaboð"
 

-#: lib/util.php:844
+#: lib/util.php:818

 msgid "a few seconds ago"
 msgstr "fyrir nokkrum sekúndum"
 
 msgid "a few seconds ago"
 msgstr "fyrir nokkrum sekúndum"
 

-#: lib/util.php:846
+#: lib/util.php:820

 msgid "about a minute ago"
 msgstr "fyrir um einni mínútu síðan"
 
 msgid "about a minute ago"
 msgstr "fyrir um einni mínútu síðan"
 

-#: lib/util.php:848
+#: lib/util.php:822

 #, php-format
 msgid "about %d minutes ago"
 msgstr "fyrir um %d mínútum síðan"
 
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fyrir um %d mínútum síðan"
 

-#: lib/util.php:850
+#: lib/util.php:824

 msgid "about an hour ago"
 msgstr "fyrir um einum klukkutíma síðan"
 
 msgid "about an hour ago"
 msgstr "fyrir um einum klukkutíma síðan"
 

-#: lib/util.php:852
+#: lib/util.php:826

 #, php-format
 msgid "about %d hours ago"
 msgstr "fyrir um %d klukkutímum síðan"
 
 #, php-format
 msgid "about %d hours ago"
 msgstr "fyrir um %d klukkutímum síðan"
 

-#: lib/util.php:854
+#: lib/util.php:828

 msgid "about a day ago"
 msgstr "fyrir um einum degi síðan"
 
 msgid "about a day ago"
 msgstr "fyrir um einum degi síðan"
 

-#: lib/util.php:856
+#: lib/util.php:830

 #, php-format
 msgid "about %d days ago"
 msgstr "fyrir um %d dögum síðan"
 
 #, php-format
 msgid "about %d days ago"
 msgstr "fyrir um %d dögum síðan"
 

-#: lib/util.php:858
+#: lib/util.php:832

 msgid "about a month ago"
 msgstr "fyrir um einum mánuði síðan"
 
 msgid "about a month ago"
 msgstr "fyrir um einum mánuði síðan"
 

-#: lib/util.php:860
+#: lib/util.php:834

 #, php-format
 msgid "about %d months ago"
 msgstr "fyrir um %d mánuðum síðan"
 
 #, php-format
 msgid "about %d months ago"
 msgstr "fyrir um %d mánuðum síðan"
 

-#: lib/util.php:862
+#: lib/util.php:836

 msgid "about a year ago"
 msgstr "fyrir um einu ári síðan"
 
 msgid "about a year ago"
 msgstr "fyrir um einu ári síðan"