summaryrefslogtreecommitdiff
path: root/locale/statusnet.po
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-10 22:02:27 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-10 22:02:27 +0100
commit5a5c6b145d7f6abac1b2a1f45c570ada248f5dba (patch)
treec8514d28c04e5bc1b70dc5aa70e8f30a00c9ba6f /locale/statusnet.po
parent923fa068a684a7e3b712714cda0cb75ffa58bd78 (diff)
Update pot
Diffstat (limited to 'locale/statusnet.po')
-rw-r--r--locale/statusnet.po135
1 files changed, 72 insertions, 63 deletions
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 2c40b9f0e..30d449fba 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 22:51+0000\n"
+"POT-Creation-Date: 2009-11-10 20:53+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -469,7 +469,7 @@ msgid "Invalid size."
msgstr ""
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:113
msgid "Avatar"
msgstr ""
@@ -517,7 +517,7 @@ msgstr ""
#: 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
@@ -614,7 +614,7 @@ msgstr ""
msgid "No profile with that ID."
msgstr ""
-#: actions/block.php:111 actions/block.php:134
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
msgid "Block user"
msgstr ""
@@ -626,21 +626,22 @@ msgid ""
msgstr ""
#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:176
+#: actions/groupblock.php:178
msgid "No"
msgstr ""
#: actions/block.php:149
-msgid "Do not block this user from this group"
+msgid "Do not block this user"
msgstr ""
#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:177
+#: actions/groupblock.php:179
msgid "Yes"
msgstr ""
-#: actions/block.php:150
-msgid "Block this user from this group"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
msgstr ""
#: actions/block.php:165
@@ -1113,7 +1114,7 @@ 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 "
@@ -1121,7 +1122,15 @@ msgid ""
"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 ""
@@ -1180,7 +1189,7 @@ msgstr ""
msgid "Failed updating logo."
msgstr ""
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/groupmembers.php:93 lib/groupnav.php:92
#, php-format
msgid "%s group members"
msgstr ""
@@ -1194,7 +1203,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/groupnav.php:106
+#: actions/groupmembers.php:175 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1202,10 +1211,6 @@ msgstr ""
msgid "Block"
msgstr ""
-#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr ""
-
#: actions/groupmembers.php:441
msgid "Make user an admin of the group"
msgstr ""
@@ -1567,7 +1572,7 @@ msgid "Nickname"
msgstr ""
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:118
msgid "Password"
msgstr ""
@@ -1799,60 +1804,64 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: actions/passwordsettings.php:69
+#: actions/passwordsettings.php:70
+msgid "You are not allowed to change your password"
+msgstr ""
+
+#: actions/passwordsettings.php:82
msgid "Change your password."
msgstr ""
-#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
msgid "Password change"
msgstr ""
-#: actions/passwordsettings.php:103
+#: actions/passwordsettings.php:117
msgid "Old password"
msgstr ""
-#: actions/passwordsettings.php:107 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
msgid "New password"
msgstr ""
-#: actions/passwordsettings.php:108
+#: actions/passwordsettings.php:122
msgid "6 or more characters"
msgstr ""
-#: 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 ""
-#: actions/passwordsettings.php:112
+#: actions/passwordsettings.php:126
msgid "same as password above"
msgstr ""
-#: actions/passwordsettings.php:116
+#: actions/passwordsettings.php:130
msgid "Change"
msgstr ""
-#: 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 ""
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:170 actions/register.php:233
msgid "Passwords don't match."
msgstr ""
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:178
msgid "Incorrect old password"
msgstr ""
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:194
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr ""
-#: actions/passwordsettings.php:191 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
msgid "Password saved."
msgstr ""
@@ -2277,7 +2286,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:117
+#: lib/accountsettingsaction.php:122
msgid "Email"
msgstr ""
@@ -2483,7 +2492,7 @@ 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 ""
@@ -2535,7 +2544,7 @@ msgstr ""
msgid "FOAF for %s group"
msgstr ""
-#: 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 ""
@@ -3145,39 +3154,39 @@ 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 ""
-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:110
msgid "Change your profile settings"
msgstr ""
-#: lib/accountsettingsaction.php:112
+#: lib/accountsettingsaction.php:114
msgid "Upload an avatar"
msgstr ""
-#: lib/accountsettingsaction.php:115
+#: lib/accountsettingsaction.php:119
msgid "Change your password"
msgstr ""
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:123
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:120 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:121
+#: lib/accountsettingsaction.php:126
msgid "Design your profile"
msgstr ""
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:128
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:124
+#: lib/accountsettingsaction.php:129
msgid "Other options"
msgstr ""
@@ -3749,34 +3758,34 @@ 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 ""
-#: lib/groupnav.php:100
+#: lib/groupnav.php:101
msgid "Blocked"
msgstr ""
-#: lib/groupnav.php:101
+#: lib/groupnav.php:102
#, php-format
msgid "%s blocked users"
msgstr ""
-#: lib/groupnav.php:107
+#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
msgstr ""
-#: lib/groupnav.php:112
+#: lib/groupnav.php:113
msgid "Logo"
msgstr ""
-#: lib/groupnav.php:113
+#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
msgstr ""
-#: lib/groupnav.php:119
+#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
msgstr ""
@@ -3962,7 +3971,7 @@ msgid ""
"\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"
@@ -3986,7 +3995,7 @@ msgid ""
"\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"
@@ -4377,47 +4386,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:844
+#: lib/util.php:818
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:846
+#: lib/util.php:820
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:848
+#: lib/util.php:822
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:850
+#: lib/util.php:824
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:852
+#: lib/util.php:826
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:854
+#: lib/util.php:828
msgid "about a day ago"
msgstr ""
-#: lib/util.php:856
+#: lib/util.php:830
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:858
+#: lib/util.php:832
msgid "about a month ago"
msgstr ""
-#: lib/util.php:860
+#: lib/util.php:834
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:862
+#: lib/util.php:836
msgid "about a year ago"
msgstr ""