Merge branch '0.9.x' into adminpanel

2 files changed, 77 insertions, 67 deletions

diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index 700f4c5ce..faaf5f29b 100644
--- a/locale/he/LC_MESSAGES/statusnet.mo
+++ b/locale/he/LC_MESSAGES/statusnet.mo
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 7c043a5b3..902e4a5c0 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 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:16+0000\n"
+"POT-Creation-Date: 2009-11-10 20:53+0000\n"
+"PO-Revision-Date: 2009-11-10 20:59:08+0000\n"
 "Language-Team: Hebrew\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: he\n"
 "X-Message-Group: out-statusnet\n"
@@ -482,7 +482,7 @@ msgid "Invalid size."
 msgstr "גודל לא חוקי."
 
 #: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "תמונה"
 
@@ -532,7 +532,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
@@ -634,7 +634,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
 #, fuzzy
 msgid "Block user"
 msgstr "אין משתמש כזה."
@@ -647,23 +647,24 @@ 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
 #, fuzzy
-msgid "Do not block this user from this group"
-msgstr "נכשלה ההפניה לשרת: %s"
+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
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user"
 msgstr "אין משתמש כזה."
 
 #: actions/block.php:165
@@ -1155,7 +1156,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 "
@@ -1163,7 +1164,17 @@ msgid ""
 "group in the future."
 msgstr ""
 
-#: actions/groupblock.php:193
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "נכשלה ההפניה לשרת: %s"
+
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "אין משתמש כזה."
+
+#: actions/groupblock.php:196
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1227,7 +1238,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 ""
@@ -1241,7 +1252,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 ""
 
@@ -1249,11 +1260,6 @@ msgstr ""
 msgid "Block"
 msgstr ""
 
-#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "אין משתמש כזה."
-
 #: actions/groupmembers.php:441
 msgid "Make user an admin of the group"
 msgstr ""
@@ -1634,7 +1640,7 @@ msgid "Nickname"
 msgstr "כינוי"
 
 #: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:118
 msgid "Password"
 msgstr "סיסמה"
 
@@ -1876,62 +1882,66 @@ 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
 #, fuzzy
 msgid "Change your password."
 msgstr "שנה סיסמה"
 
-#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
 #, fuzzy
 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 "לפחות 6 אותיות"
 
-#: 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 "הסיסמה נשמרה."
 
@@ -2366,7 +2376,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 ""
 
@@ -2578,7 +2588,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 ""
@@ -2632,7 +2642,7 @@ msgstr "הזנת הודעות של %s"
 msgid "FOAF for %s group"
 msgstr "הזנת הודעות של %s"
 
-#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 #, fuzzy
 msgid "Members"
 msgstr "חבר מאז"
@@ -3274,41 +3284,41 @@ msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
 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
 #, fuzzy
 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
 #, fuzzy
 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 ""
 
@@ -3908,36 +3918,36 @@ 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
 #, fuzzy
 msgid "Blocked"
 msgstr "אין משתמש כזה."
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:102
 #, fuzzy, 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
 #, fuzzy
 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 ""
@@ -4133,7 +4143,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"
@@ -4157,7 +4167,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"
@@ -4565,47 +4575,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 "לפני כ-%d דקות"
 
-#: 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 "לפני כ-%d שעות"
 
-#: 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 "לפני כ-%d ימים"
 
-#: 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 "לפני כ-%d חודשים"
 
-#: lib/util.php:862
+#: lib/util.php:836
 msgid "about a year ago"
 msgstr "לפני כשנה"