add activity:subject to atom feeds

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

diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index a2a849105491702c3ecec0c00f1fbd732020b7df..bd97b86b58f99971914c1d6b4c7891b9e15d8f95 100644 (file)
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-09 23:44+0000\n"
-"PO-Revision-Date: 2010-01-09 23:45:05+0000\n"
+"POT-Creation-Date: 2010-01-13 22:04+0000\n"
+"PO-Revision-Date: 2010-01-13 22:05:13+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Language-Code: fa\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 
 #: actions/all.php:63 actions/public.php:97 actions/replies.php:92
@@ -42,23 +42,18 @@ msgstr "چنین صفحه‌ای وجود ندارد"
 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
 #: actions/replies.php:73 actions/repliesrss.php:38
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
-#: lib/command.php:163 lib/command.php:311 lib/command.php:364
-#: lib/command.php:410 lib/command.php:471 lib/command.php:527
+#: lib/command.php:163 lib/command.php:302 lib/command.php:355
+#: lib/command.php:401 lib/command.php:462 lib/command.php:518
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:116
+#: lib/subs.php:34 lib/subs.php:125
 msgid "No such user."
 msgstr "چنین کاربری وجود ندارد."
 
-#: actions/all.php:84
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s و دوستان، صفحهٔ %d"
-
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
 #: lib/personalgroupnav.php:100
@@ -97,11 +92,13 @@ msgstr ""
 "چیزی را ارسال کنید."
 
 #: actions/all.php:134
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"You can try to [nudge %s](../%s) from his profile or [post something to his "
-"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
+"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
+"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
+"s) پیام می‌فرستد."
 
 #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
@@ -127,6 +124,23 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$"
 #: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
+#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
+#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
+#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found."
 msgstr "رابط مورد نظر پیدا نشد."
 
@@ -183,6 +197,9 @@ msgstr ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174
+#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
 
@@ -223,26 +240,6 @@ msgstr "پیام‌های مستقیم به %s"
 msgid "All the direct messages sent to %s"
 msgstr "تمام پیام‌های مستقیم فرستاده‌شده به %s"
 
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr "رابط پیدا نشد!"
-
 #: actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "هیچ پیام متنی وجود ندارد!"
@@ -266,7 +263,8 @@ msgid "No status found with that ID."
 msgstr "هیچ وضعیتی با آن شناسه پیدا نشد."
 
 #: actions/apifavoritecreate.php:119
-msgid "This status is already a favorite!"
+#, fuzzy
+msgid "This status is already a favorite."
 msgstr "این وضعیت درحال حاضر یک وضعیت مورد علاقه است!"
 
 #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
@@ -274,7 +272,8 @@ msgid "Could not create favorite."
 msgstr "نمی‌توان وضعیت را موردعلاقه کرد."
 
 #: actions/apifavoritedestroy.php:122
-msgid "That status is not a favorite!"
+#, fuzzy
+msgid "That status is not a favorite."
 msgstr "این وضعیت یک وضعیت موردعلاقه نیست!"
 
 #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
@@ -295,7 +294,8 @@ msgid "Could not unfollow user: User not found."
 msgstr "نمی‌توان کاربر را دنبال نکرد: کاربر یافت نشد."
 
 #: actions/apifriendshipsdestroy.php:120
-msgid "You cannot unfollow yourself!"
+#, fuzzy
+msgid "You cannot unfollow yourself."
 msgstr "نمی‌توانید خودتان را دنبال نکنید!"
 
 #: actions/apifriendshipsexists.php:94
@@ -380,7 +380,7 @@ msgstr "نام و نام مستعار شما نمی تواند یکی باشد .
 msgid "Group not found!"
 msgstr "گروه یافت نشد!"
 
-#: actions/apigroupjoin.php:110
+#: actions/apigroupjoin.php:110 actions/joingroup.php:90
 msgid "You are already a member of that group."
 msgstr "شما از پیش یک عضو این گروه هستید."
 
@@ -388,18 +388,18 @@ msgstr "شما از پیش یک عضو این گروه هستید."
 msgid "You have been blocked from that group by the admin."
 msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
 
-#: actions/apigroupjoin.php:138
-#, php-format
-msgid "Could not join user %s to group %s."
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s."
 msgstr "عضویت %s در گروه %s نا موفق بود."
 
 #: actions/apigroupleave.php:114
 msgid "You are not a member of this group."
 msgstr "شما یک عضو این گروه نیستید."
 
-#: actions/apigroupleave.php:124
+#: actions/apigroupleave.php:124 actions/leavegroup.php:119
 #, fuzzy, php-format
-msgid "Could not remove user %s from group %s."
+msgid "Could not remove user %1$s from group %2$s."
 msgstr "خارج شدن %s از گروه %s نا موفق بود"
 
 #: actions/apigrouplist.php:95
@@ -407,11 +407,6 @@ msgstr "خارج شدن %s از گروه %s نا موفق بود"
 msgid "%s's groups"
 msgstr "گروه‌های %s"
 
-#: actions/apigrouplist.php:103
-#, php-format
-msgid "Groups %s is a member of on %s."
-msgstr ""
-
 #: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
 msgid "%s groups"
@@ -471,13 +466,13 @@ msgid "Unsupported format."
 msgstr "قالب پشتیبانی نشده."
 
 #: actions/apitimelinefavorites.php:108
-#, php-format
-msgid "%s / Favorites from %s"
+#, fuzzy, php-format
+msgid "%1$s / Favorites from %2$s"
 msgstr "%s / دوست داشتنی از %s"
 
 #: actions/apitimelinefavorites.php:120
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#, fuzzy, php-format
+msgid "%1$s updates favorited by %2$s / %2$s."
 msgstr "%s به روز رسانی های دوست داشتنی %s / %s"
 
 #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
@@ -545,8 +540,11 @@ msgstr "یافت نشد."
 msgid "No such attachment."
 msgstr "چنین پیوستی وجود ندارد."
 
-#: actions/avatarbynickname.php:59 actions/grouprss.php:91
-#: actions/leavegroup.php:76
+#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76
+#: actions/showgroup.php:121
 msgid "No nickname."
 msgstr "بدون لقب."
 
@@ -570,8 +568,8 @@ msgstr ""
 "شما می‌توانید چهرهٔ شخصی خود را بارگذاری کنید. حداکثر اندازه پرونده %s است."
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:103
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
+#: actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "کاربر بدون مشخصات"
 
@@ -603,11 +601,11 @@ msgstr "پایین‌گذاری"
 msgid "Crop"
 msgstr "برش"
 
-#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
-#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/avatarsettings.php:268 actions/deletenotice.php:157
+#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
+#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:337
@@ -688,19 +686,15 @@ msgstr "کاربر را مسدود کن"
 msgid "Failed to save block information."
 msgstr ""
 
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/joingroup.php:76
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "بدون لقب"
-
 #: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
 #: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "چنین گروهی وجود ندارد"
+#: actions/grouprss.php:98 actions/groupunblock.php:86
+#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
+msgid "No such group."
+msgstr "چنین گروهی وجود ندارد."
 
 #: actions/blockedfromgroup.php:90
 #, php-format
@@ -708,8 +702,8 @@ msgid "%s blocked profiles"
 msgstr "%s کاربران مسدود شده"
 
 #: actions/blockedfromgroup.php:93
-#, php-format
-msgid "%s blocked profiles, page %d"
+#, fuzzy, php-format
+msgid "%1$s blocked profiles, page %2$d"
 msgstr "%s کاربران مسدود شده، صفحه‌ی %d"
 
 #: actions/blockedfromgroup.php:108
@@ -822,10 +816,6 @@ msgstr "این پیام را پاک نکن"
 msgid "Delete this notice"
 msgstr "این پیام را پاک کن"
 
-#: actions/deletenotice.php:157
-msgid "There was a problem with your session token.  Try again, please."
-msgstr "مشکلی در دریافت جلسه‌ی شما وجود دارد. لطفا بعدا سعی کنید."
-
 #: actions/deleteuser.php:67
 msgid "You cannot delete users."
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
@@ -991,7 +981,8 @@ msgstr "برای ساخت یک گروه، باید وارد شده باشید."
 
 #: actions/editgroup.php:103 actions/editgroup.php:168
 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-msgid "You must be an admin to edit the group"
+#, fuzzy
+msgid "You must be an admin to edit the group."
 msgstr "برای ویرایش گروه، باید یک مدیر باشید."
 
 #: actions/editgroup.php:154
@@ -1016,7 +1007,8 @@ msgid "Options saved."
 msgstr "گزینه‌ها ذخیره شدند."
 
 #: actions/emailsettings.php:60
-msgid "Email Settings"
+#, fuzzy
+msgid "Email settings"
 msgstr "تنظیمات پست الکترونیک"
 
 #: actions/emailsettings.php:71
@@ -1051,8 +1043,9 @@ msgid "Cancel"
 msgstr "انصراف"
 
 #: actions/emailsettings.php:121
-msgid "Email Address"
-msgstr "نشانی پست الکترونیکی"
+#, fuzzy
+msgid "Email address"
+msgstr "نشانی‌های پست الکترونیکی"
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
@@ -1126,9 +1119,10 @@ msgstr "پست الکترونیک وجود ندارد."
 msgid "Cannot normalize that email address"
 msgstr "نمی‌توان نشانی را قانونی کرد"
 
-#: actions/emailsettings.php:331 actions/siteadminpanel.php:157
-msgid "Not a valid email address"
-msgstr "این یک نشانی صحیح نیست"
+#: actions/emailsettings.php:331 actions/register.php:201
+#: actions/siteadminpanel.php:157
+msgid "Not a valid email address."
+msgstr "یک آدرس ایمیل معتبر نیست."
 
 #: actions/emailsettings.php:334
 msgid "That is already your email address."
@@ -1308,13 +1302,6 @@ msgstr "خدمات مورد نظر از نسخه‌ی نا مفهومی از ق
 msgid "Error updating remote profile"
 msgstr "اشکال در به روز کردن کاربر دوردست."
 
-#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
-#: actions/grouprss.php:98 actions/groupunblock.php:86
-#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212
-#: lib/command.php:263
-msgid "No such group."
-msgstr "چنین گروهی وجود ندارد."
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "چنین پرونده‌ای وجود ندارد."
@@ -1331,7 +1318,7 @@ msgstr "کاربری مشخص نشده است."
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:77
 msgid "No profile with that ID."
 msgstr "کاربری با چنین شناسه‌ای وجود ندارد."
 
@@ -1357,11 +1344,11 @@ msgid "Block user from group"
 msgstr "دسترسی کاربر به گروه را مسدود کن"
 
 #: actions/groupblock.php:162
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
-"be removed from the group, unable to post, and unable to subscribe to the "
-"group in the future."
+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
 msgstr "آیا مطمئن هستید می‌خواهید دسترسی »%s« را به گروه »%s« مسدود کنید؟"
 
 #: actions/groupblock.php:178
@@ -1376,9 +1363,9 @@ msgstr "دسترسی کاربر را به گروه مسدود کن"
 msgid "Database error blocking user from group."
 msgstr "اشکال پایگاه داده در مسدود کردن کاربر"
 
-#: actions/groupbyid.php:74
-msgid "No ID"
-msgstr "شناسه وجود ندارد"
+#: actions/groupbyid.php:74 actions/userbyid.php:70
+msgid "No ID."
+msgstr ""
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
@@ -1399,12 +1386,6 @@ msgstr "ظاهر گروه را تغییر دهید تا شما را راضی ک
 msgid "Couldn't update your design."
 msgstr "نمی‌توان ظاهر را به روز کرد."
 
-#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings!"
-msgstr "نمی‌توان تنظیمات شما را ذخیره کرد!"
-
 #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
 msgid "Design preferences saved."
 msgstr "ترجیحات طرح ذخیره شد."
@@ -1419,6 +1400,11 @@ msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "شما می‌توانید یک نشان برای گروه خود با بیشینه حجم %s بفرستید."
 
+#: actions/grouplogo.php:178
+#, fuzzy
+msgid "User without matching profile."
+msgstr "کاربر بدون مشخصات"
+
 #: actions/grouplogo.php:362
 msgid "Pick a square area of the image to be the logo."
 msgstr "یک ناحیه‌ی مربع از تصویر را انتخاب کنید تا به عنوان نشان باشد."
@@ -1437,8 +1423,8 @@ msgid "%s group members"
 msgstr "اعضای گروه %s"
 
 #: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
+#, fuzzy, php-format
+msgid "%1$s group members, page %2$d"
 msgstr "اعضای گروه %s، صفحهٔ %d"
 
 #: actions/groupmembers.php:111
@@ -1546,7 +1532,8 @@ msgid "Error removing the block."
 msgstr "اشکال در پاکسازی"
 
 #: actions/imsettings.php:59
-msgid "IM Settings"
+#, fuzzy
+msgid "IM settings"
 msgstr "تنظیمات پیام‌رسان فوری"
 
 #: actions/imsettings.php:70
@@ -1576,7 +1563,8 @@ msgstr ""
 "بیش‌تر بررسی کنید. (آیا %s را به فهرست خود اضافه کرده اید؟) "
 
 #: actions/imsettings.php:124
-msgid "IM Address"
+#, fuzzy
+msgid "IM address"
 msgstr "نشانی پیام‌رسان فوری"
 
 #: actions/imsettings.php:126
@@ -1638,11 +1626,6 @@ msgstr ""
 msgid "That is not your Jabber ID."
 msgstr "این شناسه‌ی Jabber شما نیست."
 
-#: actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "ورودی‌های %s - صفحه‌ی %d"
-
 #: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
@@ -1678,10 +1661,10 @@ msgstr "دعوت کردن کاربران تازه"
 msgid "You are already subscribed to these users:"
 msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: "
 
-#: actions/invite.php:131 actions/invite.php:139
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
 #, php-format
-msgid "%s (%s)"
-msgstr "%s )%s("
+msgid "%1$s (%2$s)"
+msgstr ""
 
 #: actions/invite.php:136
 msgid ""
@@ -1722,7 +1705,7 @@ msgstr "پیام خصوصی"
 msgid "Optionally add a personal message to the invitation."
 msgstr "اگر دوست دارید می‌توانید یک پیام به همراه دعوت نامه ارسال کنید."
 
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237
 msgid "Send"
 msgstr "فرستادن"
 
@@ -1766,91 +1749,69 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "برای پیوستن به یک گروه، باید وارد شده باشید."
 
-#: actions/joingroup.php:90 lib/command.php:217
-msgid "You are already a member of that group"
-msgstr "شما یک کاربر این گروه هستید."
-
-#: actions/joingroup.php:128 lib/command.php:234
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "نمی‌توان کاربر %s را به گروه %s پیوند داد."
-
-#: actions/joingroup.php:135 lib/command.php:239
-#, php-format
-msgid "%s joined group %s"
+#: actions/joingroup.php:131
+#, fuzzy, php-format
+msgid "%1$s joined group %2$s"
 msgstr "ملحق شدن به گروه"
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
 
-#: actions/leavegroup.php:90 lib/command.php:268
+#: actions/leavegroup.php:90 lib/command.php:265
 msgid "You are not a member of that group."
 msgstr "شما یک کاربر این گروه نیستید."
 
-#: actions/leavegroup.php:119 lib/command.php:278
-msgid "Could not find membership record."
-msgstr "عضویت ثبت شده پیدا نشد."
-
 #: actions/leavegroup.php:127
 #, fuzzy, php-format
-msgid "Could not remove user %s from group %s"
-msgstr "خارج شدن %s از گروه %s نا موفق بود"
-
-#: actions/leavegroup.php:134 lib/command.php:289
-#, php-format
-msgid "%s left group %s"
+msgid "%1$s left group %2$s"
 msgstr "%s گروه %s را ترک کرد."
 
-#: actions/login.php:83 actions/register.php:137
+#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "قبلا وارد شده"
 
-#: actions/login.php:114 actions/login.php:124
-msgid "Invalid or expired token."
-msgstr "علامت بی اعتبار یا منقضی."
-
-#: actions/login.php:147
+#: actions/login.php:126
 msgid "Incorrect username or password."
 msgstr "نام کاربری یا رمز عبور نادرست."
 
-#: actions/login.php:153
+#: actions/login.php:132 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید."
 
-#: actions/login.php:208 actions/login.php:261 lib/action.php:460
+#: actions/login.php:188 actions/login.php:241 lib/action.php:460
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "ورود"
 
-#: actions/login.php:247
+#: actions/login.php:227
 msgid "Login to site"
 msgstr "ورود به وب‌گاه"
 
-#: actions/login.php:250 actions/profilesettings.php:106
-#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: actions/login.php:230 actions/profilesettings.php:106
+#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "نام کاربری"
 
-#: actions/login.php:253 actions/register.php:428
+#: actions/login.php:233 actions/register.php:429
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "گذرواژه"
 
-#: actions/login.php:256 actions/register.php:477
+#: actions/login.php:236 actions/register.php:478
 msgid "Remember me"
 msgstr "مرا به یاد بسپار"
 
-#: actions/login.php:257 actions/register.php:479
+#: actions/login.php:237 actions/register.php:480
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
 
-#: actions/login.php:267
+#: actions/login.php:247
 msgid "Lost or forgotten password?"
 msgstr "رمز عبور خود را گم یا فراموش کرده اید؟"
 
-#: actions/login.php:286
+#: actions/login.php:266
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1858,7 +1819,7 @@ msgstr ""
 "به دلایل امنیتی، لطفا نام کاربری و رمز عبور خود را قبل از تغییر تنظیمات "
 "دوباره وارد نمایید."
 
-#: actions/login.php:290
+#: actions/login.php:270
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1872,18 +1833,18 @@ msgid "Only an admin can make another user an admin."
 msgstr "فقط یک مدیر می‌تواند کاربر دیگری را مدیر کند."
 
 #: actions/makeadmin.php:95
-#, php-format
-msgid "%s is already an admin for group \"%s\"."
+#, fuzzy, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%s از قبل مدیر گروه %s بود."
 
 #: actions/makeadmin.php:132
-#, php-format
-msgid "Can't get membership record for %s in group %s"
+#, fuzzy, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "نمی‌توان اطلاعات عضویت %s را در گروه %s به دست آورد."
 
 #: actions/makeadmin.php:145
-#, php-format
-msgid "Can't make %s an admin for group %s"
+#, fuzzy, php-format
+msgid "Can't make %1$s an admin for group %2$s."
 msgstr "نمی‌توان %s را مدیر گروه %s کرد."
 
 #: actions/microsummary.php:69
@@ -1902,12 +1863,12 @@ msgstr "از این فرم برای ساختن یک گروه جدید استفا
 msgid "New message"
 msgstr "پیام جدید"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
 msgid "You can't send a message to this user."
 msgstr "شما نمی توانید به این کاربر پیام بفرستید."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
-#: lib/command.php:484
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
+#: lib/command.php:475
 msgid "No content!"
 msgstr "بدون محتوا!"
 
@@ -1915,7 +1876,7 @@ msgstr "بدون محتوا!"
 msgid "No recipient specified."
 msgstr "هیچ گیرنده ای مشخص نشده"
 
-#: actions/newmessage.php:164 lib/command.php:370
+#: actions/newmessage.php:164 lib/command.php:361
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید."
@@ -1924,9 +1885,9 @@ msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن 
 msgid "Message sent"
 msgstr "پیام فرستاده‌شد"
 
-#: actions/newmessage.php:185 lib/command.php:376
-#, php-format
-msgid "Direct message to %s sent"
+#: actions/newmessage.php:185
+#, fuzzy, php-format
+msgid "Direct message to %s sent."
 msgstr "پیام مستقیم به %s فرستاده شد."
 
 #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
@@ -1955,8 +1916,8 @@ msgid "Text search"
 msgstr "جست‌وجوی متن"
 
 #: actions/noticesearch.php:91
-#, php-format
-msgid "Search results for \"%s\" on %s"
+#, fuzzy, php-format
+msgid "Search results for \"%1$s\" on %2$s"
 msgstr "نتایج جست‌و‌جو برای %s در %s"
 
 #: actions/noticesearch.php:121
@@ -2019,8 +1980,8 @@ msgstr "نوع محتوا "
 msgid "Only "
 msgstr " فقط"
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031
-#: lib/api.php:1059 lib/api.php:1169
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
+#: lib/api.php:1061 lib/api.php:1171
 msgid "Not a supported data format."
 msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
 
@@ -2064,10 +2025,29 @@ msgstr "نمایش یا عدم‌نمایش طراحی‌های کاربران."
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "کوتاه کننده‌ی نشانی بسیار طولانی است (بیش‌تر از ۵۰ حرف)."
 
-#: actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "فرستاده‌های %s - صفحه‌ی %d"
+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "گروهی مشخص نشده است."
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "خبری مشخص نشده."
+
+#: actions/otp.php:90
+msgid "No login token requested."
+msgstr ""
+
+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "علامت بی اعتبار یا منقضی."
+
+#: actions/otp.php:104
+#, fuzzy
+msgid "Login token expired."
+msgstr "ورود به وب‌گاه"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2105,7 +2085,7 @@ msgid "6 or more characters"
 msgstr "۶ نویسه یا بیش‌تر"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:432 actions/smssettings.php:134
+#: actions/register.php:433 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "تایید"
 
@@ -2267,8 +2247,9 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:308
-msgid "SSL Server"
-msgstr ""
+#, fuzzy
+msgid "SSL server"
+msgstr "کارگزار"
 
 #: actions/pathsadminpanel.php:309
 msgid "Server to direct SSL requests to"
@@ -2297,8 +2278,8 @@ msgid "Not a valid people tag: %s"
 msgstr "یک برچسب کاربری معتبر نیست: %s"
 
 #: actions/peopletag.php:144
-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#, fuzzy, php-format
+msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "کاربران خود برچسب‌گذاری شده با %s - صفحهٔ %d"
 
 #: actions/postnotice.php:84
@@ -2307,7 +2288,7 @@ msgstr "محتوای آگهی نامعتبر"
 
 #: actions/postnotice.php:90
 #, php-format
-msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #: actions/profilesettings.php:60
@@ -2329,42 +2310,42 @@ msgstr "اطلاعات شناس‌نامه"
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
 
-#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/profilesettings.php:111 actions/register.php:448
 #: actions/showgroup.php:247 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:149
 msgid "Full name"
 msgstr "نام‌کامل"
 
-#: actions/profilesettings.php:115 actions/register.php:452
+#: actions/profilesettings.php:115 actions/register.php:453
 #: lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "صفحهٔ خانگی"
 
-#: actions/profilesettings.php:117 actions/register.php:454
+#: actions/profilesettings.php:117 actions/register.php:455
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا مشخصات کاربری‌تان در یک وب‌گاه دیگر"
 
-#: actions/profilesettings.php:122 actions/register.php:460
+#: actions/profilesettings.php:122 actions/register.php:461
 #, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr ""
 
-#: actions/profilesettings.php:125 actions/register.php:463
+#: actions/profilesettings.php:125 actions/register.php:464
 msgid "Describe yourself and your interests"
 msgstr "خودتان و علایقتان را توصیف کنید."
 
-#: actions/profilesettings.php:127 actions/register.php:465
+#: actions/profilesettings.php:127 actions/register.php:466
 msgid "Bio"
 msgstr "شرح‌حال"
 
-#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/profilesettings.php:132 actions/register.php:471
 #: actions/showgroup.php:256 actions/tagother.php:112
 #: actions/userauthorization.php:158 lib/groupeditform.php:177
 #: lib/userprofile.php:164
 msgid "Location"
 msgstr "موقعیت"
 
-#: actions/profilesettings.php:134 actions/register.php:472
+#: actions/profilesettings.php:134 actions/register.php:473
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -2659,7 +2640,7 @@ msgstr ""
 msgid "New password successfully saved. You are now logged in."
 msgstr "کلمه ی عبور جدید با موفقیت ذخیره شد. شما الان وارد شده اید."
 
-#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+#: actions/register.php:85 actions/register.php:189 actions/register.php:405
 msgid "Sorry, only invited people can register."
 msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند."
 
@@ -2671,7 +2652,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است."
 msgid "Registration successful"
 msgstr "ثبت نام با موفقیت انجام شد."
 
-#: actions/register.php:114 actions/register.php:502 lib/action.php:457
+#: actions/register.php:114 actions/register.php:503 lib/action.php:457
 #: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "ثبت نام"
@@ -2684,58 +2665,54 @@ msgstr "اجازه‌ی ثبت نام داده نشده است."
 msgid "You can't register if you don't agree to the license."
 msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) موافقت نکنید."
 
-#: actions/register.php:201
-msgid "Not a valid email address."
-msgstr "یک آدرس ایمیل معتبر نیست."
-
 #: actions/register.php:212
 msgid "Email address already exists."
 msgstr "آدرس ایمیل از قبل وجود دارد."
 
-#: actions/register.php:243 actions/register.php:264
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "نام کاربری یا کلمه ی عبور نا معتبر."
 
-#: actions/register.php:342
+#: actions/register.php:343
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:424
+#: actions/register.php:425
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است."
 
-#: actions/register.php:429
+#: actions/register.php:430
 msgid "6 or more characters. Required."
 msgstr "۶ کاراکتر یا بیشتر نیاز است."
 
-#: actions/register.php:433
+#: actions/register.php:434
 msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/register.php:437 actions/register.php:441
+#: actions/register.php:438 actions/register.php:442
 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:439 actions/register.php:443
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:449
+#: actions/register.php:450
 msgid "Longer name, preferably your \"real\" name"
 msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
 
-#: actions/register.php:493
+#: actions/register.php:494
 msgid "My text and files are available under "
 msgstr ""
 
-#: actions/register.php:495
+#: actions/register.php:496
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/register.php:496
+#: actions/register.php:497
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
@@ -2743,13 +2720,13 @@ msgstr ""
 "به استثنای این داده ی محرمانه : کلمه ی عبور، آدرس ایمیل، آدرس IM، و شماره "
 "تلفن."
 
-#: actions/register.php:537
+#: actions/register.php:538
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
 "\n"
-"* Go to [your profile](%s) and post your first message.\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
 "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
 "notices through instant messages.\n"
 "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
@@ -2762,7 +2739,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:561
+#: actions/register.php:562
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -2853,11 +2830,6 @@ msgstr ""
 msgid "Replies to %s"
 msgstr "پاسخ‌های به %s"
 
-#: actions/replies.php:127
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "پاسخ‌های به %s، صفحهٔ %d"
-
 #: actions/replies.php:144
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
@@ -2874,11 +2846,11 @@ msgid "Replies feed for %s (Atom)"
 msgstr "خوراک پاسخ‌ها برای %s (Atom)"
 
 #: actions/replies.php:198
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This is the timeline showing replies to %s but %s hasn't received a notice "
-"to his attention yet."
-msgstr ""
+"This is the timeline showing replies to %1$s but %2$s hasn't received a "
+"notice to his attention yet."
+msgstr "این خط‌زمانی %s و دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند."
 
 #: actions/replies.php:203
 #, php-format
@@ -2888,11 +2860,13 @@ msgid ""
 msgstr ""
 
 #: actions/replies.php:205
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"You can try to [nudge %s](../%s) or [post something to his or her attention]"
-"(%%%%action.newnotice%%%%?status_textarea=%s)."
+"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
+"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
+"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
+"s) پیام می‌فرستد."
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -2907,11 +2881,6 @@ msgstr ""
 msgid "User is already sandboxed."
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s's favorite notices, page %d"
-msgstr ""
-
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "ناتوان در بازیابی آگهی های محبوب."
@@ -2961,11 +2930,6 @@ msgstr "این یک راه است برای به اشتراک گذاشتن آنچ
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:84
-#, php-format
-msgid "%s group, page %d"
-msgstr ""
-
 #: actions/showgroup.php:218
 msgid "Group profile"
 msgstr ""
@@ -3014,7 +2978,7 @@ msgstr "اعضا"
 
 #: actions/showgroup.php:386 lib/profileaction.php:117
 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "هیچ"
 
@@ -3080,15 +3044,10 @@ msgstr ""
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:79
-#, php-format
-msgid "%s, page %d"
-msgstr ""
-
 #: actions/showstream.php:122
-#, php-format
-msgid "Notice feed for %s tagged %s (RSS 1.0)"
-msgstr ""
+#, fuzzy, php-format
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr "خوراک پاسخ‌ها برای %s (RSS 1.0)"
 
 #: actions/showstream.php:129
 #, php-format
@@ -3111,9 +3070,9 @@ msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:191
-#, php-format
-msgid "This is the timeline for %s but %s hasn't posted anything yet."
-msgstr ""
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgstr "این خط‌زمانی %s و دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند."
 
 #: actions/showstream.php:196
 msgid ""
@@ -3124,11 +3083,13 @@ msgstr ""
 "تواند زمان خوبی برای شروع باشد :)"
 
 #: actions/showstream.php:198
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"You can try to nudge %s or [post something to his or her attention](%%%%"
-"action.newnotice%%%%?status_textarea=%s)."
+"You can try to nudge %1$s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%2$s)."
 msgstr ""
+"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
+"s) پیام می‌فرستد."
 
 #: actions/showstream.php:234
 #, php-format
@@ -3169,12 +3130,13 @@ msgid "Site name must have non-zero length."
 msgstr "نام سایت باید طولی غیر صفر داشته باشد."
 
 #: actions/siteadminpanel.php:154
-msgid "You must have a valid contact email address"
+#, fuzzy
+msgid "You must have a valid contact email address."
 msgstr "شما باید یک آدرس ایمیل قابل قبول برای ارتباط داشته باشید"
 
 #: actions/siteadminpanel.php:172
 #, php-format
-msgid "Unknown language \"%s\""
+msgid "Unknown language \"%s\"."
 msgstr ""
 
 #: actions/siteadminpanel.php:179
@@ -3356,8 +3318,9 @@ msgid "Save site settings"
 msgstr ""
 
 #: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr ""
+#, fuzzy
+msgid "SMS settings"
+msgstr "تنظیمات پیام‌رسان فوری"
 
 #: actions/smssettings.php:69
 #, php-format
@@ -3385,7 +3348,8 @@ msgid "Enter the code you received on your phone."
 msgstr "کدی را که در گوشیتان گرفتید وارد کنید."
 
 #: actions/smssettings.php:138
-msgid "SMS Phone number"
+#, fuzzy
+msgid "SMS phone number"
 msgstr "شماره تماس پیامک"
 
 #: actions/smssettings.php:140
@@ -3471,9 +3435,9 @@ msgid "%s subscribers"
 msgstr ""
 
 #: actions/subscribers.php:52
-#, php-format
-msgid "%s subscribers, page %d"
-msgstr ""
+#, fuzzy, php-format
+msgid "%1$s subscribers, page %2$d"
+msgstr "%s کاربران مسدود شده، صفحه‌ی %d"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -3508,9 +3472,9 @@ msgid "%s subscriptions"
 msgstr ""
 
 #: actions/subscriptions.php:54
-#, php-format
-msgid "%s subscriptions, page %d"
-msgstr ""
+#, fuzzy, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr "%d گروه , صفحه %S"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -3544,11 +3508,6 @@ msgstr ""
 msgid "SMS"
 msgstr ""
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr ""
-
 #: actions/tag.php:86
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3628,17 +3587,14 @@ msgstr "کاربر ساکت نشده است."
 msgid "No profile id in request."
 msgstr ""
 
-#: actions/unsubscribe.php:84
-msgid "No profile with that id."
-msgstr ""
-
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 
 #: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgid ""
+"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
@@ -3788,7 +3744,7 @@ msgstr ""
 
 #: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here"
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
 #: actions/userauthorization.php:301
@@ -3821,10 +3777,6 @@ msgstr ""
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
-#: actions/userbyid.php:70
-msgid "No ID."
-msgstr ""
-
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 msgid "Profile design"
 msgstr "طراحی پروفیل"
@@ -3839,11 +3791,6 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr "از هات داگ خود لذت ببرید!"
 
-#: actions/usergroups.php:64
-#, php-format
-msgid "%s groups, page %d"
-msgstr "%d گروه , صفحه %S"
-
 #: actions/usergroups.php:130
 msgid "Search for more groups"
 msgstr "جستجو برای گروه های بیشتر"
@@ -3866,8 +3813,8 @@ msgstr "آمار"
 #: actions/version.php:153
 #, php-format
 msgid ""
-"This site is powered by %s version %s, Copyright 2008-2010 StatusNet, Inc. "
-"and contributors."
+"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. and contributors."
 msgstr ""
 
 #: actions/version.php:157
@@ -3925,23 +3872,41 @@ msgstr "مؤلف"
 msgid "Description"
 msgstr ""
 
-#: classes/File.php:137
+#: classes/File.php:144
 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 "to upload a smaller version."
 msgstr ""
 
-#: classes/File.php:147
+#: classes/File.php:154
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: classes/File.php:154
+#: classes/File.php:161
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
+#: classes/Group_member.php:41
+msgid "Group join failed."
+msgstr ""
+
+#: classes/Group_member.php:53
+#, fuzzy
+msgid "Not part of group."
+msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
+
+#: classes/Group_member.php:60
+msgid "Group leave failed."
+msgstr ""
+
+#: classes/Login_token.php:76
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "نمی‌توان نام‌های مستعار را ساخت."
+
 #: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "شما از فرستادن پیام مستقیم مردود شده اید."
@@ -3954,27 +3919,27 @@ msgstr "پیغام نمی تواند درج گردد"
 msgid "Could not update message with new URI."
 msgstr ""
 
-#: classes/Notice.php:172
+#: classes/Notice.php:171
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:226
+#: classes/Notice.php:225
 msgid "Problem saving notice. Too long."
 msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
 
-#: classes/Notice.php:230
+#: classes/Notice.php:229
 msgid "Problem saving notice. Unknown user."
 msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
 
-#: classes/Notice.php:235
+#: classes/Notice.php:234
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال "
 "کنید."
 
-#: classes/Notice.php:241
+#: classes/Notice.php:240
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -3982,25 +3947,25 @@ msgstr ""
 "تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا "
 "ارسال کنید."
 
-#: classes/Notice.php:247
+#: classes/Notice.php:246
 msgid "You are banned from posting notices on this site."
 msgstr "شما از فرستادن پست در این سایت مردود شدید ."
 
-#: classes/Notice.php:309 classes/Notice.php:334
+#: classes/Notice.php:305 classes/Notice.php:330
 msgid "Problem saving notice."
 msgstr "مشکل در ذخیره کردن آگهی."
 
-#: classes/Notice.php:1034
+#: classes/Notice.php:1052
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: classes/Notice.php:1359
+#: classes/Notice.php:1423
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
-#: classes/User.php:368
+#: classes/User.php:382
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "خوش امدید به %1$s , @%2$s!"
@@ -4042,9 +4007,9 @@ msgid "Other options"
 msgstr "انتخابات دیگر"
 
 #: lib/action.php:144
-#, php-format
-msgid "%s - %s"
-msgstr ""
+#, fuzzy, php-format
+msgid "%1$s - %2$s"
+msgstr "%s گروه %s را ترک کرد."
 
 #: lib/action.php:159
 msgid "Untitled page"
@@ -4286,7 +4251,7 @@ msgstr "تغییر گذرواژه"
 msgid "Command results"
 msgstr "نتیجه دستور"
 
-#: lib/channel.php:210
+#: lib/channel.php:210 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr "دستور انجام شد"
 
@@ -4308,9 +4273,9 @@ msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #: lib/command.php:99
-#, php-format
+#, fuzzy, php-format
 msgid "Nudge sent to %s"
-msgstr ""
+msgstr "فرتادن اژیر"
 
 #: lib/command.php:126
 #, php-format
@@ -4323,12 +4288,12 @@ msgstr ""
 "مشترک : %2$s\n"
 "خبر : %3$s"
 
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
+#: lib/command.php:152 lib/command.php:390 lib/command.php:451
 msgid "Notice with that id does not exist"
 msgstr "خبری با این مشخصه ایجاد نشد"
 
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
 msgid "User has no last notice"
 msgstr "کاربر آگهی آخر ندارد"
 
@@ -4336,158 +4301,174 @@ msgstr "کاربر آگهی آخر ندارد"
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:284
+#: lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "شما از پیش یک عضو این گروه هستید."
+
+#: lib/command.php:231
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "عضویت %s در گروه %s نا موفق بود."
+
+#: lib/command.php:236
 #, php-format
+msgid "%s joined group %s"
+msgstr "ملحق شدن به گروه"
+
+#: lib/command.php:275
+#, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
-msgstr ""
+msgstr "خارج شدن %s از گروه %s نا موفق بود"
 
-#: lib/command.php:315
+#: lib/command.php:280
 #, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
+msgid "%s left group %s"
+msgstr "%s گروه %s را ترک کرد."
 
-#: lib/command.php:318
+#: lib/command.php:309
 #, php-format
 msgid "Fullname: %s"
 msgstr "نام کامل : %s"
 
-#: lib/command.php:321
+#: lib/command.php:312 lib/mail.php:254
 #, php-format
 msgid "Location: %s"
 msgstr "موقعیت : %s"
 
-#: lib/command.php:324
+#: lib/command.php:315 lib/mail.php:256
 #, php-format
 msgid "Homepage: %s"
 msgstr "صفحه خانگی : %s"
 
-#: lib/command.php:327
+#: lib/command.php:318
 #, php-format
 msgid "About: %s"
 msgstr "درباره ی : %s"
 
-#: lib/command.php:358 scripts/xmppdaemon.php:301
+#: lib/command.php:349
 #, php-format
 msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
 "تا فرستادید"
 
-#: lib/command.php:378
+#: lib/command.php:367
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "پیام مستقیم به %s فرستاده شد."
+
+#: lib/command.php:369
 msgid "Error sending direct message."
 msgstr "خطا در فرستادن پیام مستقیم."
 
-#: lib/command.php:422
+#: lib/command.php:413
 msgid "Cannot repeat your own notice"
 msgstr "نمی توان آگهی خودتان را تکرار کرد"
 
-#: lib/command.php:427
+#: lib/command.php:418
 msgid "Already repeated that notice"
 msgstr "آن آگهی قبلا تکرار شده است."
 
-#: lib/command.php:435
-#, php-format
+#: lib/command.php:426
+#, fuzzy, php-format
 msgid "Notice from %s repeated"
-msgstr ""
+msgstr "آگهی تکرار شد"
 
-#: lib/command.php:437
+#: lib/command.php:428
 msgid "Error repeating notice."
 msgstr "خطا هنگام تکرار آگهی."
 
-#: lib/command.php:491
-#, php-format
+#: lib/command.php:482
+#, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
+"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
+"تا فرستادید"
 
-#: lib/command.php:500
-#, php-format
+#: lib/command.php:491
+#, fuzzy, php-format
 msgid "Reply to %s sent"
-msgstr ""
+msgstr "به این آگهی جواب دهید"
 
-#: lib/command.php:502
+#: lib/command.php:493
 msgid "Error saving notice."
 msgstr "خطا هنگام ذخیره ی آگهی"
 
-#: lib/command.php:556
+#: lib/command.php:547
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:563
+#: lib/command.php:554
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:584
+#: lib/command.php:575
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:591
+#: lib/command.php:582
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:609 lib/command.php:632
+#: lib/command.php:600 lib/command.php:623
 msgid "Command not yet implemented."
 msgstr "دستور هنوز اجرا نشده"
 
-#: lib/command.php:612
+#: lib/command.php:603
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:614
+#: lib/command.php:605
 msgid "Can't turn off notification."
 msgstr "ناتوان در خاموش کردن آگاه سازی."
 
-#: lib/command.php:635
+#: lib/command.php:626
 msgid "Notification on."
 msgstr "آگاه سازی فعال است."
 
-#: lib/command.php:637
+#: lib/command.php:628
 msgid "Can't turn on notification."
 msgstr "ناتوان در روشن کردن آگاه سازی."
 
-#: lib/command.php:650
+#: lib/command.php:641
 msgid "Login command is disabled"
 msgstr "فرمان ورود از کار افتاده است"
 
-#: lib/command.php:664
-#, php-format
-msgid "Could not create login token for %s"
-msgstr ""
-
-#: lib/command.php:669
+#: lib/command.php:652
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:685
+#: lib/command.php:668
 msgid "You are not subscribed to anyone."
 msgstr "شما توسط هیچ کس تصویب نشده اید ."
 
-#: lib/command.php:687
+#: lib/command.php:670
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: "
 
-#: lib/command.php:707
+#: lib/command.php:690
 msgid "No one is subscribed to you."
 msgstr "هیچکس شما را تایید نکرده ."
 
-#: lib/command.php:709
+#: lib/command.php:692
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "هیچکس شما را تایید نکرده ."
 
-#: lib/command.php:729
+#: lib/command.php:712
 msgid "You are not a member of any groups."
 msgstr "شما در هیچ گروهی عضو نیستید ."
 
-#: lib/command.php:731
+#: lib/command.php:714
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "شما یک عضو این گروه نیستید."
 
-#: lib/command.php:745
+#: lib/command.php:728
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4528,19 +4509,19 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:199
+#: lib/common.php:131
 msgid "No configuration file found. "
 msgstr ""
 
-#: lib/common.php:200
+#: lib/common.php:132
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:201
+#: lib/common.php:134
 msgid "You may wish to run the installer to fix this."
 msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند."
 
-#: lib/common.php:202
+#: lib/common.php:135
 msgid "Go to the installer."
 msgstr "برو به نصاب."
 
@@ -4739,11 +4720,16 @@ msgstr "مگابایت"
 msgid "kB"
 msgstr "کیلوبایت"
 
-#: lib/jabber.php:191
+#: lib/jabber.php:202
 #, php-format
 msgid "[%s]"
 msgstr ""
 
+#: lib/jabber.php:385
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "مشارکت کردن"
@@ -4801,22 +4787,10 @@ msgid ""
 "Change your email address or notification options at %8$s\n"
 msgstr ""
 
-#: lib/mail.php:254
-#, php-format
-msgid "Location: %s\n"
-msgstr "موقعیت : %s\n"
-
-#: lib/mail.php:256
-#, php-format
-msgid "Homepage: %s\n"
-msgstr "صفحه خانگی : %s\n"
-
 #: lib/mail.php:258
-#, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
-msgstr ""
+#, fuzzy, php-format
+msgid "Bio: %s"
+msgstr "موقعیت : %s"
 
 #: lib/mail.php:286
 #, php-format
@@ -4972,6 +4946,11 @@ msgstr "با عرض پوزش، این پست الکترونیک شما نیست.
 msgid "Sorry, no incoming email allowed."
 msgstr "با عرض پوزش، اجازه‌ی ورودی پست الکترونیک وجود ندارد"
 
+#: lib/mailhandler.php:228
+#, fuzzy, php-format
+msgid "Unsupported message type: %s"
+msgstr "فرمت(فایل) عکس پشتیبانی نشده."
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5004,7 +4983,7 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #: lib/mediafile.php:179 lib/mediafile.php:216
-msgid "File exceeds user's quota!"
+msgid "File exceeds user's quota."
 msgstr ""
 
 #: lib/mediafile.php:196 lib/mediafile.php:233
@@ -5012,8 +4991,9 @@ msgid "File could not be moved to destination directory."
 msgstr "فایل نتوانست به دایرکتوری مقصد منتقل شود."
 
 #: lib/mediafile.php:201 lib/mediafile.php:237
-msgid "Could not determine file's mime-type!"
-msgstr ""
+#, fuzzy
+msgid "Could not determine file's MIME type."
+msgstr "نمی‌توان کاربر منبع را تعیین کرد."
 
 #: lib/mediafile.php:270
 #, php-format
@@ -5022,7 +5002,7 @@ msgstr "تلاش برای امتحان نوع دیگر %s"
 
 #: lib/mediafile.php:275
 #, php-format
-msgid "%s is not a supported filetype on this server."
+msgid "%s is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
@@ -5055,18 +5035,25 @@ msgid "Attach a file"
 msgstr "یک فایل ضمیمه کنید"
 
 #: lib/noticeform.php:212
+#, fuzzy
 msgid "Share my location"
-msgstr ""
+msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
 
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
 #, fuzzy
-msgid "Do not share my location."
+msgid "Do not share my location"
 msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Hide this info"
 msgstr ""
 
+#: lib/noticeform.php:217
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
+msgstr ""
+
 #: lib/noticelist.php:428
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
@@ -5325,23 +5312,23 @@ msgstr "قبلا تایید شده !"
 msgid "User has blocked you."
 msgstr ""
 
-#: lib/subs.php:60
+#: lib/subs.php:63
 msgid "Could not subscribe."
 msgstr ""
 
-#: lib/subs.php:79
+#: lib/subs.php:82
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: lib/subs.php:128
+#: lib/subs.php:137
 msgid "Not subscribed!"
 msgstr "تایید نشده!"
 
-#: lib/subs.php:133
+#: lib/subs.php:142
 msgid "Couldn't delete self-subscription."
 msgstr ""
 
-#: lib/subs.php:146
+#: lib/subs.php:158
 msgid "Couldn't delete subscription."
 msgstr ""
 
@@ -5355,10 +5342,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(هیج)"
-
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "هیچ"
@@ -5419,47 +5402,47 @@ msgstr "پیام"
 msgid "Moderate"
 msgstr ""
 
-#: lib/util.php:837
+#: lib/util.php:877
 msgid "a few seconds ago"
 msgstr "چند ثانیه پیش"
 
-#: lib/util.php:839
+#: lib/util.php:879
 msgid "about a minute ago"
 msgstr "حدود یک دقیقه پیش"
 
-#: lib/util.php:841
+#: lib/util.php:881
 #, php-format
 msgid "about %d minutes ago"
 msgstr "حدود %d دقیقه پیش"
 
-#: lib/util.php:843
+#: lib/util.php:883
 msgid "about an hour ago"
 msgstr "حدود یک ساعت پیش"
 
-#: lib/util.php:845
+#: lib/util.php:885
 #, php-format
 msgid "about %d hours ago"
 msgstr "حدود %d ساعت پیش"
 
-#: lib/util.php:847
+#: lib/util.php:887
 msgid "about a day ago"
 msgstr "حدود یک روز پیش"
 
-#: lib/util.php:849
+#: lib/util.php:889
 #, php-format
 msgid "about %d days ago"
 msgstr "حدود %d روز پیش"
 
-#: lib/util.php:851
+#: lib/util.php:891
 msgid "about a month ago"
 msgstr "حدود یک ماه پیش"
 
-#: lib/util.php:853
+#: lib/util.php:893
 #, php-format
 msgid "about %d months ago"
 msgstr "حدود %d ماه پیش"
 
-#: lib/util.php:855
+#: lib/util.php:895
 msgid "about a year ago"
 msgstr "حدود یک سال پیش"
 
@@ -5472,3 +5455,10 @@ msgstr "%s یک رنگ صحیح نیست!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ حرف مبنای شانزده استفاده کنید"
+
+#: scripts/xmppdaemon.php:301
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
+"تا فرستادید"