diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4371d836c7aee513da3eeda3e587c4e855c463cf
GIT binary patch
literal 1882
zc$|%rOKclO7{`aEiNWDnN`bZ#6GSUQv|*j_2%ET#n>fM3j@{TP0*S-M9-M90yVmZw
zNu(a~P?1ooiiavHRRxs;5;v1HB+aW5T#=ZS;EK2+ap1&>1OM6C;7ACGk#>Kx^Zmc)
z>@P<S-ym4W@tnl-JDyW`b{-(%DjXuD6Fd(d1K$Im06F*&_yKqr{0M9ZZ-9@0w+^W|
zUq|*I!4u$5k?s%hG4RjG-qA+LgJ5TyvL9_z=f@*H7oEQl@g)$hM33zKU<Wu5@hlhv
z$0GX#xPhLEZ7Odkg7knVz~{kn@KNw$yYicFSN$%6-QZ2|ZSXtrh^z}q#z75?gN+U~
zzl9EEza6pJq5Aqh;t!Gj=ji*_NcUTG{ug)@jKx&`li<U$znH3TIHq)YP+rmFMBPJN
zT~|1Jx#WzbUdB2W-LG8o?hZx!CnG*hT1(FAS)yhnS1h8eRnGM(qUw=L)-C^yXQJ;m
z`AXR~<ue{LD?T}A`c|3NOz%>~opq=`?{IUjmyE#58Fkofq$KG%vsSm6LCHAdT_jU8
ztBhn#pVLOY0xb+#%emxJ?o!k7XPM{Ivgy!iMlHu@9%mIgYw;OUaD7hBH(bvCLomte
z_Plz_U{U^}d6|(S<J@wpJ}H@1B*YtAHpfY6hSeA;S=?r1s!pa|yFx5kqE9St+E$r(
zh-cxGOP_-0USwsiWh&YQ6l%GSK?|vow^HM2dLcbo%;YEHD8Ti&mh-DtMLXB1`dY~~
zXuOawY2kF>q>YA+_vwj#O@B?(-=K-tjs91A^nP83P@80zEx)CEC!Lzqa(QhuMc>RD
zxlGTy`H6H~&QL3Pn3-*I*E8tYR5nW|Qn@r8O6O9U>~LyybTVBmo`KY<Hqew-VrI>t
z+0?}Nlq`8Dn;o{TUe~L(GzRq=@mwaCZgrUG)#D?s!<mDG^L0o#X7_U4HZ5n6mS;@Q
zXFNGo8q)?^I$7BJ%+u0N*{xvq1|68Tc)VaYJk!?3T(9OE)TxJ`ezJd%s%`Q`=Tt&Z
zCKL4ZX)3pRS2B^HXQ@t&@cT@%Z{IYOd_`_U4}B=1(<@h$3p9E+d=l{K>mG~~@ky{K
z)@iUL*2PY+Ld3_SDK^BOSPfRhJqqKd*oCzzw&Xro{O8Z^CE^Zr8{)2L21~&;Dt1G+
z<>2~$xMd=~2o?}wN2~`6_`SrZ*erDsaWl;E4UA3kEwsB3twSyLkYyVOcX70i!lX(C
z4v#~f40I=0M1k94OKi%-O$d>6RfZ2%C=%|8HI%YMkz_@cw+a{8NE8V&bR+IV33c#c
za4on_#OILQ56fCbx9}t4E4c}K{NI7Y5Ss^ri%k_eEbzcq<v@r7Bg0gKt6>Sd`z72)
zdgQ?2p13D_CgMxT*W@I^&Hl-jl&S5GXcF-mqO8GbJDlL2*usT}nHPeqBrI<`SjG)(
hBJ{4jae@K=`)Y8!g{Bw6-(i)sW-Y^#u=KTX`!|4qgU$c|

diff --git a/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po
rename from locale/ru/LC_MESSAGES/django.po
rename to boards/locale/ru/LC_MESSAGES/django.po
--- a/locale/ru/LC_MESSAGES/django.po
+++ b/boards/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-13 22:07+0300\n"
+"POT-Creation-Date: 2013-06-09 17:35+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"
@@ -18,55 +18,124 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/base.html:22
+#: templates/base.html:27
 msgid "All threads"
-msgstr "Все ники"
+msgstr "Все темы"
+
+#: templates/base.html:33
+msgid "Settings"
+msgstr "Настройки"
+
+#: templates/base.html:40
+msgid "Up"
+msgstr "Вверх"
 
-#: templates/posting_general.html:26
-msgid "View"
-msgstr "Просмотр"
+#: templates/posting_general.html:18
+msgid "Tag: "
+msgstr "Тег: "
 
-#: templates/posting_general.html:31
+#: templates/posting_general.html:35 templates/posting_general.html.py:79
+#: templates/thread.html:27
+#, fuzzy
+msgid "Post image"
+msgstr "Изображение сообщения"
+
+#: templates/posting_general.html:46
+msgid "Reply"
+msgstr "Ответ"
+
+#: templates/posting_general.html:53 templates/thread.html:107
 msgid "replies"
 msgstr "ответов"
 
-#: templates/posting_general.html:32
+#: templates/posting_general.html:54 templates/thread.html:108
 msgid "images"
 msgstr "изображений"
 
-#: templates/posting_general.html:33
-msgid "gets"
-msgstr "геты"
-
-#: templates/posting_general.html:35 templates/posting_general.html.py:67
-#: templates/thread.html:31
+#: templates/posting_general.html:56 templates/posting_general.html.py:127
+#: templates/thread.html:49
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/posting_general.html:52
+#: templates/posting_general.html:109
 msgid "Create new thread"
-msgstr "Создать новую нить"
+msgstr "Создать новую тему"
 
-#: templates/posting_general.html:55 templates/thread.html:50
+#: templates/posting_general.html:112 templates/thread.html:71
 msgid "Title"
 msgstr "Заголовок"
 
-#: templates/posting_general.html:59 templates/thread.html:54
+#: templates/posting_general.html:117 templates/thread.html:76
 msgid "Text"
 msgstr "Текст"
 
-#: templates/posting_general.html:63 templates/thread.html:58
+#: templates/posting_general.html:122 templates/thread.html:81
 msgid "Image"
-msgstr "Картинка"
+msgstr "Изображение"
 
-#: templates/posting_general.html:70 templates/thread.html:61
+#: templates/posting_general.html:136 templates/thread.html:91
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/posting_general.html:72
-msgid "Tags must be delimited by spaces. Text or image is required."
-msgstr "Теги должны быть разделены пробелами. Текст или изображение обязательны."
+#: templates/posting_general.html:152
+#, fuzzy
+msgid "Pages:"
+msgstr "Страницы: "
+
+#: templates/settings.html:13
+msgid "Theme"
+msgstr "Тема"
+
+#: templates/settings.html:29
+msgid "Save"
+msgstr "Сохранить"
+
+#: templates/tags.html:7
+msgid "tags"
+msgstr "тегов"
+
+#: templates/thread.html:39
+msgid "Get!"
+msgstr "Гет!"
+
+#: templates/thread.html:68
+msgid "Reply to thread"
+msgstr "Ответить в тему"
+
+#: templates/thread.html:93
+msgid "Basic markdown syntax."
+msgstr "Базовый синтаксис markdown."
 
-#: templates/thread.html:47
-msgid "Reply to the thread"
-msgstr "Ответить в нить"
+#: templates/thread.html:94
+msgid "Example: "
+msgstr "Пример: "
+
+#: templates/thread.html:94
+msgid "italic"
+msgstr "курсив"
+
+#: templates/thread.html:95
+msgid "bold"
+msgstr "полужирный"
+
+#: templates/thread.html:96
+msgid "Quotes can be inserted with"
+msgstr "Цитаты могут быть вставлены при помощи"
+
+#: templates/thread.html:97
+msgid "Links to answers can be inserted with"
+msgstr "Ссылки на ответы могут быть вставлены с помощью"
+
+#: templates/thread.html:109
+msgid "Last update: "
+msgstr "Последнее обновление: "
+
+#~ msgid "View"
+#~ msgstr "Просмотр"
+
+#~ msgid "gets"
+#~ msgstr "гетов"
+
+#~ msgid "Tags must be delimited by spaces. Text or image is required."
+#~ msgstr ""
+#~ "Теги должны быть разделены пробелами. Текст или изображение обязательны."
diff --git a/templates/base.html b/boards/templates/base.html
rename from templates/base.html
rename to boards/templates/base.html
diff --git a/templates/login.html b/boards/templates/login.html
rename from templates/login.html
rename to boards/templates/login.html
diff --git a/templates/posting_general.html b/boards/templates/posting_general.html
rename from templates/posting_general.html
rename to boards/templates/posting_general.html
diff --git a/templates/settings.html b/boards/templates/settings.html
rename from templates/settings.html
rename to boards/templates/settings.html
diff --git a/templates/tags.html b/boards/templates/tags.html
rename from templates/tags.html
rename to boards/templates/tags.html
diff --git a/templates/thread.html b/boards/templates/thread.html
rename from templates/thread.html
rename to boards/templates/thread.html
--- a/templates/thread.html
+++ b/boards/templates/thread.html
@@ -89,11 +89,13 @@
 
             <div class="form-submit"><input type="submit"
                                             value="{% trans "Post" %}"/></div>
-            <div>Use <a
-                    href="http://daringfireball.net/projects/markdown/basics">
-                markdown</a> syntax for posting.</div>
-            <div>Example: *<i>italic</i>*, **<b>bold</b>**</div>
-            <div>Insert quotes with "&gt;"</div>
+            <div><a href="http://daringfireball.net/projects/markdown/basics">
+                {% trans 'Basic markdown syntax.' %}</a></div>
+            <div>{% trans 'Example: ' %}*<i>{% trans 'italic' %}</i>*,
+                **<b>{% trans 'bold' %}</b>**</div>
+            <div>{% trans 'Quotes can be inserted with' %} "&gt;"</div>
+            <div>{% trans 'Links to answers can be inserted with' %} "&gt;&gt;
+                123"</div>
         </div>
     </form>
 
diff --git a/neboard/settings.py b/neboard/settings.py
--- a/neboard/settings.py
+++ b/neboard/settings.py
@@ -32,7 +32,7 @@ TIME_ZONE = 'Europe/Kiev'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'ru'
+LANGUAGE_CODE = 'ru-RU'
 
 SITE_ID = 1