diff --git a/locale/fa/LC_MESSAGES/django.po b/locale/fa/LC_MESSAGES/django.po
index 91bcc09..b88cea6 100644
--- a/locale/fa/LC_MESSAGES/django.po
+++ b/locale/fa/LC_MESSAGES/django.po
@@ -21,15 +21,15 @@ msgstr ""
 
 #: templates/base.html:100
 msgid "Mark all as read."
-msgstr "خواندم"
+msgstr "همه دیده شد"
 
 #: templates/base.html:114 templates/post.html:32 templates/submit.html:11
 msgid "Submit"
-msgstr "بنار"
+msgstr "وادهید"
 
 #: templates/base.html:116 templates/user.html:10
 msgid "Comments"
-msgstr "نظر ها"
+msgstr "دیدگاه ها"
 
 #: templates/base.html:117
 msgid "New"
@@ -42,7 +42,7 @@ msgstr "تازه ها"
 msgid ""
 "Logged in as <a href=\"/user/%(username)s\" class=\"navbar-link\">"
 "%(username)s</a>"
-msgstr ""
+msgstr "اینجا"
 "خوش آمدید <a href=\"/user/%(username)s\" class=\"navbar-link\">%(username)s</"
 "a>\n"
 " "
@@ -57,38 +57,38 @@ msgstr "فهرست ها"
 
 #: templates/base.html:145
 msgid "RSS"
-msgstr ""
+msgstr "RSS"
 
 #: templates/base.html:146
 msgid "Guidelines"
-msgstr "دستورکار"
+msgstr "راهنما"
 
 #: templates/base.html:147
 msgid "FAQ"
-msgstr "سوالات متداول"
+msgstr "پرسش های همیشگی"
 
 #: templates/base.html:148
 msgid "Feature Request"
-msgstr "درخواست جلوه"
+msgstr "پیشنهادها"
 
 # TODO Needs translation
 #: templates/base.html:180
 msgid "commented"
-msgstr "نظر داده"
+msgstr "نگر داده"
 
 #: templates/base.html:181
 msgid "also commented"
-msgstr "هم نظر داده"
+msgstr "هم نگر داده"
 
 #: templates/base.html:182
 msgid "called you"
-msgstr "شما را صدا کرده"
+msgstr "شما را سدا کرده"
 
 #: templates/comments.html:10
 #, python-format
 msgid ""
 "By %(uname)s on <a href=\"/post/%(cid)s\" style=\"color:#555\">%(title)s</a>"
-msgstr "نظر %(uname)s در مورد <a href=\"/post/%(cid)s\">%(title)s</a>"
+msgstr "نگر %(uname)s در مورد <a href=\"/post/%(cid)s\">%(title)s</a>"
 
 #: templates/comments.html:13 templates/user/comments.html:4
 #, python-format
@@ -109,15 +109,15 @@ msgstr "گذرواژه"
 
 #: templates/login.html:16
 msgid "Register"
-msgstr "اسم نویسی"
+msgstr "نام نویسی"
 
 #: templates/mykeyb.html:18
 msgid "Show virtual keyboard"
-msgstr ""
+msgstr "تخته کلید روشن"
 
 #: templates/mykeyb.html:22 templates/post.html:33
 msgid "Hide virtual keyboard"
-msgstr ""
+msgstr "تخته کلید خاموش"
 
 #: templates/post.html:20
 #, python-format
@@ -131,7 +131,7 @@ msgstr ""
 
 #: templates/post.html:28
 msgid "Add a comment"
-msgstr "نظر شما چیه ؟"
+msgstr "دیدگاه شما"
 
 #: templates/post.html:49
 #, python-format
@@ -146,7 +146,7 @@ msgstr ""
 
 #: templates/post.html:53
 msgid "Reply"
-msgstr "جواب"
+msgstr "پاسخ"
 
 #: templates/posts.html:14 templates/user/posts.html:10
 #, python-format
@@ -158,11 +158,11 @@ msgstr ""
 
 #: templates/submit.html:8
 msgid "Title of this post"
-msgstr "عنوان این بحث"
+msgstr "نام این گفتاورد"
 
 #: templates/submit.html:9
 msgid "URL"
-msgstr "آدرس الکترونیکی"
+msgstr "دنبالک"
 
 #: templates/submit.html:10
 msgid "Write something here."
@@ -170,52 +170,52 @@ msgstr "چیزی بنویسید"
 
 #: templates/user.html:9
 msgid "Info"
-msgstr ""
+msgstr "گزارش"
 
 #: templates/user.html:11
 #, fuzzy
 msgid "Posts"
-msgstr "تعداد پست ها"
+msgstr "وا داده ها"
 
 #: templates/user.html:13
 msgid "Settings"
-msgstr ""
+msgstr "چینش"
 
 #: templates/user.html:24 templates/user.html.py:30
 msgid "About me"
-msgstr ""
+msgstr "درباری من"
 
 #: templates/user.html:35
 msgid "Karma"
-msgstr "کارنامه"
+msgstr "کردار"
 
 #: templates/user.html:39
 msgid "Posts count"
-msgstr "تعداد پست ها"
+msgstr "شمارگان واها"
 
 #: templates/user.html:43
 msgid "Comments count"
-msgstr "تعداد نظر ها"
+msgstr "شمارگان دیدگاه ها"
 
 #: templates/user.html:53
 msgid "From"
-msgstr ""
+msgstr "از"
 
 #: templates/user.html:59
 msgid "Age"
-msgstr ""
+msgstr "سن"
 
 #: templates/user.html:64
 msgid "Member Since"
-msgstr ""
+msgstr "هموند از"
 
 #: templates/user.html:79
 msgid "URL to your site, or anywhere you would like."
-msgstr ""
+msgstr "دنبالک تارنمای شما"
 
 #: templates/user.html:80
 msgid "Your email"
-msgstr ""
+msgstr "نشانی رایانامه"
 
 #: templates/user.html:81
 msgid "<b>TIP: </b>We use gravatars!"
@@ -223,23 +223,23 @@ msgstr ""
 
 #: templates/user.html:82
 msgid "Show my email to the public."
-msgstr ""
+msgstr "نشانیم را نمایش ده"
 
 #: templates/user.html:83
 msgid "Where are you from?"
-msgstr ""
+msgstr "از کجایید ؟"
 
 #: templates/user.html:84
 msgid "Your age?"
-msgstr ""
+msgstr "چند ساله ؟"
 
 #: templates/user.html:85
 msgid "Tell about yourself."
-msgstr ""
+msgstr "درباره ی من"
 
 #: templates/user.html:86
 msgid "Save"
-msgstr ""
+msgstr "نگه دار"
 
 #~ msgid "ago"
 #~ msgstr "پیش"
diff --git a/locale/fa/LC_MESSAGES/django.po.BAK2 b/locale/fa/LC_MESSAGES/django.po.BAK2
new file mode 100644
index 0000000..91bcc09
--- /dev/null
+++ b/locale/fa/LC_MESSAGES/django.po.BAK2
@@ -0,0 +1,245 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-15 02:24+0300\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: templates/base.html:100
+msgid "Mark all as read."
+msgstr "خواندم"
+
+#: templates/base.html:114 templates/post.html:32 templates/submit.html:11
+msgid "Submit"
+msgstr "بنار"
+
+#: templates/base.html:116 templates/user.html:10
+msgid "Comments"
+msgstr "نظر ها"
+
+#: templates/base.html:117
+msgid "New"
+msgstr "تازه ها"
+
+# This, and some of the following patterns needed to have included html code
+# Please transfer it to translated string, to its apropriate place
+#: templates/base.html:127
+#, python-format
+msgid ""
+"Logged in as <a href=\"/user/%(username)s\" class=\"navbar-link\">"
+"%(username)s</a>"
+msgstr ""
+"خوش آمدید <a href=\"/user/%(username)s\" class=\"navbar-link\">%(username)s</"
+"a>\n"
+" "
+
+#: templates/base.html:130 templates/login.html:10
+msgid "Login"
+msgstr "ورود"
+
+#: templates/base.html:144
+msgid "Lists"
+msgstr "فهرست ها"
+
+#: templates/base.html:145
+msgid "RSS"
+msgstr ""
+
+#: templates/base.html:146
+msgid "Guidelines"
+msgstr "دستورکار"
+
+#: templates/base.html:147
+msgid "FAQ"
+msgstr "سوالات متداول"
+
+#: templates/base.html:148
+msgid "Feature Request"
+msgstr "درخواست جلوه"
+
+# TODO Needs translation
+#: templates/base.html:180
+msgid "commented"
+msgstr "نظر داده"
+
+#: templates/base.html:181
+msgid "also commented"
+msgstr "هم نظر داده"
+
+#: templates/base.html:182
+msgid "called you"
+msgstr "شما را صدا کرده"
+
+#: templates/comments.html:10
+#, python-format
+msgid ""
+"By %(uname)s on <a href=\"/post/%(cid)s\" style=\"color:#555\">%(title)s</a>"
+msgstr "نظر %(uname)s در مورد <a href=\"/post/%(cid)s\">%(title)s</a>"
+
+#: templates/comments.html:13 templates/user/comments.html:4
+#, python-format
+msgid ""
+"By <a href=\"/user/%(uname)s\">%(uname)s</a> on <a href=\"/post/%(cid)s\" "
+"style=\"color:#555\">%(title)s</a> %(txt)s"
+msgstr ""
+" <a href=\"/post/%(cid)s\">%(title)s</a> %(txt)s نظر <a href=\"/user/"
+"%(uname)s\">%(uname)s</a> در مورد "
+
+#: templates/login.html:8 templates/login.html.py:14
+msgid "Username"
+msgstr "نام کاربری"
+
+#: templates/login.html:9 templates/login.html.py:15
+msgid "Password"
+msgstr "گذرواژه"
+
+#: templates/login.html:16
+msgid "Register"
+msgstr "اسم نویسی"
+
+#: templates/mykeyb.html:18
+msgid "Show virtual keyboard"
+msgstr ""
+
+#: templates/mykeyb.html:22 templates/post.html:33
+msgid "Hide virtual keyboard"
+msgstr ""
+
+#: templates/post.html:20
+#, python-format
+msgid ""
+"\n"
+"            <strong class=\"points\" data-type=\"post\" data-id=\"%(pid)s\">"
+"%(upvotes)s</strong> points by <a href=\"/user/%(uname)s\">%(uname)s</a> on "
+"%(timestamp)s | %(comments)s comments\n"
+"            "
+msgstr ""
+
+#: templates/post.html:28
+msgid "Add a comment"
+msgstr "نظر شما چیه ؟"
+
+#: templates/post.html:49
+#, python-format
+msgid ""
+"<a href=\"/user/%(uname)s\">%(uname)s</a> on %(timestamp)s, <strong class="
+"\"points\" data-type=\"comment\" data-id=\"%(cid)s\">%(upvotes)s</strong> "
+"points, "
+msgstr ""
+"<a href=\"/user/%(uname)s\">%(uname)s</a> در %(timestamp)s, <strong class="
+"\"points\" data-type=\"comment\" data-id=\"%(cid)s\">%(upvotes)s</strong> "
+"امتیاز "
+
+#: templates/post.html:53
+msgid "Reply"
+msgstr "جواب"
+
+#: templates/posts.html:14 templates/user/posts.html:10
+#, python-format
+msgid ""
+"<strong class=\"points\" data-type=\"post\" data-id=\"%(pid)s\">%(upvotes)s</"
+"strong> points by <a href=\"/user/%(uname)s\">%(uname)s</a> on %(timestamp)s "
+"| <a href=\"/post/%(id)s/\">%(comments)s comments </a>"
+msgstr ""
+
+#: templates/submit.html:8
+msgid "Title of this post"
+msgstr "عنوان این بحث"
+
+#: templates/submit.html:9
+msgid "URL"
+msgstr "آدرس الکترونیکی"
+
+#: templates/submit.html:10
+msgid "Write something here."
+msgstr "چیزی بنویسید"
+
+#: templates/user.html:9
+msgid "Info"
+msgstr ""
+
+#: templates/user.html:11
+#, fuzzy
+msgid "Posts"
+msgstr "تعداد پست ها"
+
+#: templates/user.html:13
+msgid "Settings"
+msgstr ""
+
+#: templates/user.html:24 templates/user.html.py:30
+msgid "About me"
+msgstr ""
+
+#: templates/user.html:35
+msgid "Karma"
+msgstr "کارنامه"
+
+#: templates/user.html:39
+msgid "Posts count"
+msgstr "تعداد پست ها"
+
+#: templates/user.html:43
+msgid "Comments count"
+msgstr "تعداد نظر ها"
+
+#: templates/user.html:53
+msgid "From"
+msgstr ""
+
+#: templates/user.html:59
+msgid "Age"
+msgstr ""
+
+#: templates/user.html:64
+msgid "Member Since"
+msgstr ""
+
+#: templates/user.html:79
+msgid "URL to your site, or anywhere you would like."
+msgstr ""
+
+#: templates/user.html:80
+msgid "Your email"
+msgstr ""
+
+#: templates/user.html:81
+msgid "<b>TIP: </b>We use gravatars!"
+msgstr ""
+
+#: templates/user.html:82
+msgid "Show my email to the public."
+msgstr ""
+
+#: templates/user.html:83
+msgid "Where are you from?"
+msgstr ""
+
+#: templates/user.html:84
+msgid "Your age?"
+msgstr ""
+
+#: templates/user.html:85
+msgid "Tell about yourself."
+msgstr ""
+
+#: templates/user.html:86
+msgid "Save"
+msgstr ""
+
+#~ msgid "ago"
+#~ msgstr "پیش"