diff --git a/dpaste/locale/es/LC_MESSAGES/django.po b/dpaste/locale/es/LC_MESSAGES/django.po
new file mode 100644
index 0000000..34994ac
--- /dev/null
+++ b/dpaste/locale/es/LC_MESSAGES/django.po
@@ -0,0 +1,217 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Sergio Oliveira <seocam@seocam.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: dpaste\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-25 10:08+0000\n"
+"PO-Revision-Date: 2014-10-25 14:31+0000\n"
+"Last-Translator: Sergio Oliveira <seocam@seocam.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/dpaste/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forms.py:11
+msgid "One Time Snippet"
+msgstr "Apenas una visualización"
+
+#: forms.py:12
+msgid "In one hour"
+msgstr "Una hora"
+
+#: forms.py:13
+msgid "In one week"
+msgstr "Una semana"
+
+#: forms.py:14
+msgid "In one month"
+msgstr "Un mes"
+
+#: forms.py:15
+msgid "Never"
+msgstr "Nunca"
+
+#: forms.py:36 models.py:43
+msgid "Content"
+msgstr "Contenido"
+
+#: forms.py:37
+msgid "Awesome code goes here..."
+msgstr "Su código increíble va aquí..."
+
+#: forms.py:42 models.py:44
+msgid "Lexer"
+msgstr "Lexer"
+
+#: forms.py:49 models.py:48
+msgid "Expires"
+msgstr "Caduca"
+
+#: forms.py:57
+msgid "Title"
+msgstr "Título"
+
+#: forms.py:85
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
+
+#: highlight.py:34
+msgid "Highlighted"
+msgstr "Highlighted"
+
+#: models.py:36
+msgid "Expire by timestamp"
+msgstr "Caduca por fecha y hora"
+
+#: models.py:37
+msgid "Keep Forever"
+msgstr "Guarde por siempre"
+
+#: models.py:38
+msgid "One-Time snippet"
+msgstr "Apenas una visualización"
+
+#: models.py:41
+msgid "Secret ID"
+msgstr "ID secreto"
+
+#: models.py:45
+msgid "Published"
+msgstr "Publicado"
+
+#: models.py:46
+msgid "Expire Type"
+msgstr "Tipo de Caducación  "
+
+#: models.py:49
+msgid "View count"
+msgstr "Visualizaciones"
+
+#: views.py:200
+msgid "No changes were made between this two files."
+msgstr "No hay cambios entre estos dos archivos."
+
+#: templates/dpaste/about.html:44
+msgid "Statistics"
+msgstr " Estadísticas"
+
+#: templates/dpaste/about.html:46
+#, python-format
+msgid ""
+"There are %(total)s snippets in the database. The most popular languages "
+"are:"
+msgstr "Hay %(total)s snippets en la base de datos. Los lenguajes más populares son:"
+
+#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21
+#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7
+msgid "New snippet"
+msgstr "Nuevo snippet"
+
+#: templates/dpaste/base.html:19
+msgid "About"
+msgstr "Acerca"
+
+#: templates/dpaste/base.html:20
+msgid "History"
+msgstr "Histórico"
+
+#: templates/dpaste/snippet_details.html:8
+#: templates/dpaste/snippet_details.html:9
+msgid "Snippet"
+msgstr "Snippet"
+
+#: templates/dpaste/snippet_details.html:41
+msgid "Compare"
+msgstr "Comparar"
+
+#: templates/dpaste/snippet_details.html:55
+#, python-format
+msgid "Expires in: %(date)s"
+msgstr "Caduca en: %(date)s"
+
+#: templates/dpaste/snippet_details.html:57
+msgid "Snippet never expires"
+msgstr "Snippet nunca caduca"
+
+#: templates/dpaste/snippet_details.html:59
+msgid "One-time snippet"
+msgstr "Apenas una visualización"
+
+#: templates/dpaste/snippet_details.html:63
+msgid "Really delete this snippet?"
+msgstr "Desea remover este snippet?"
+
+#: templates/dpaste/snippet_details.html:63
+msgid "Delete Now"
+msgstr "Remover Ahora"
+
+#: templates/dpaste/snippet_details.html:66
+msgid "Compare Snippets"
+msgstr "Comparar Snippets"
+
+#: templates/dpaste/snippet_details.html:69
+msgid "View Raw"
+msgstr "Ver en Bruto"
+
+#: templates/dpaste/snippet_details.html:73
+msgid "Gist"
+msgstr "Gist"
+
+#: templates/dpaste/snippet_details.html:82
+msgid "This is a one-time snippet."
+msgstr "Este snippet podrá ser visualizado apenas sólo una vez."
+
+#: templates/dpaste/snippet_details.html:84
+#, python-format
+msgid "It is automatically removed after %(remaining)s further views."
+msgstr "Automáticamente removido después de %(remaining)s visualizaciones más."
+
+#: templates/dpaste/snippet_details.html:86
+msgid "It is automatically removed after the next view."
+msgstr "Automáticamente removido después de la próxima visualización."
+
+#: templates/dpaste/snippet_details.html:88
+msgid "It cannot be viewed again."
+msgstr "No puede más ser visualizado."
+
+#: templates/dpaste/snippet_details.html:108
+msgid "Reply to this snippet"
+msgstr "Contestar snippet"
+
+#: templates/dpaste/snippet_diff.html:5
+#, python-format
+msgid ""
+"\n"
+"    Diff between <a href=\"%(filea_url)s\">#%(filea_id)s</a> and <a href=\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
+"    "
+msgstr "\nDiff entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> e <a href=\"%(fileb_url)s\">#%(fileb_id)s</a>"
+
+#: templates/dpaste/snippet_form.html:32
+msgid "Expire in"
+msgstr "Caduca en"
+
+#: templates/dpaste/snippet_form.html:38
+msgid "Paste it"
+msgstr "Criar paste"
+
+#: templates/dpaste/snippet_list.html:16
+msgid "DATETIME_FORMAT"
+msgstr "DATETIME_FORMAT"
+
+#: templates/dpaste/snippet_list.html:17
+#, python-format
+msgid "%(since)s ago"
+msgstr "%(since)s atrás"
+
+#: templates/dpaste/snippet_list.html:23
+msgid ""
+"No snippets saved. Either all your snippets are expired or your cookie has "
+"changed."
+msgstr "No hay snippets salvados. O sus snippets han caducado o su cookie cambió."
diff --git a/dpaste/locale/pt_BR/LC_MESSAGES/django.po b/dpaste/locale/pt_BR/LC_MESSAGES/django.po
index 2ac7381..1289589 100644
--- a/dpaste/locale/pt_BR/LC_MESSAGES/django.po
+++ b/dpaste/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,21 +1,21 @@
 # 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
+# 
+# Translators:
+# Sergio Oliveira <seocam@seocam.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: dpaste\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 14:43-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"
+"POT-Creation-Date: 2014-10-25 10:08+0000\n"
+"PO-Revision-Date: 2014-10-25 14:25+0000\n"
+"Last-Translator: Sergio Oliveira <seocam@seocam.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/dpaste/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: forms.py:11
@@ -48,7 +48,7 @@ msgstr "Cole seu texto ou código aqui..."
 
 #: forms.py:42 models.py:44
 msgid "Lexer"
-msgstr ""
+msgstr "Lexer"
 
 #: forms.py:49 models.py:48
 msgid "Expires"
@@ -59,12 +59,12 @@ msgid "Title"
 msgstr "Título"
 
 #: forms.py:85
-msgid "Plesae fill out this field."
-msgstr "Por favor, preencha este campo."
+msgid "This field is required."
+msgstr "Campo obrigatório."
 
 #: highlight.py:34
 msgid "Highlighted"
-msgstr ""
+msgstr "Highlighted"
 
 #: models.py:36
 msgid "Expire by timestamp"
@@ -76,7 +76,7 @@ msgstr "Não expira"
 
 #: models.py:38
 msgid "One-Time snippet"
-msgstr "Expira após uma visualização"
+msgstr "Uma única visualização"
 
 #: models.py:41
 msgid "Secret ID"
@@ -92,16 +92,21 @@ msgstr "Tipo de validade"
 
 #: models.py:49
 msgid "View count"
-msgstr ""
+msgstr "Visualizações"
 
-#: templates/dpaste/about.html:43
+#: views.py:200
+msgid "No changes were made between this two files."
+msgstr "Nenhuma alterção feita entre esses dois arquivos."
+
+#: templates/dpaste/about.html:44
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: templates/dpaste/about.html:45
+#: templates/dpaste/about.html:46
 #, python-format
 msgid ""
-"There are %(total)s snippets in the database. The most popular languages are:"
+"There are %(total)s snippets in the database. The most popular languages "
+"are:"
 msgstr "Existem %(total)s pastes no banco de dados. A linguagem mais popular é"
 
 #: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21
@@ -137,7 +142,7 @@ msgstr "Paste nunca expira"
 
 #: templates/dpaste/snippet_details.html:59
 msgid "One-time snippet"
-msgstr "Uma visualização apenas"
+msgstr "Uma única visualização"
 
 #: templates/dpaste/snippet_details.html:63
 msgid "Really delete this snippet?"
@@ -155,28 +160,28 @@ msgstr "Comparar pastes"
 msgid "View Raw"
 msgstr "Visualizar sem formatação"
 
-#: templates/dpaste/snippet_details.html:72
+#: templates/dpaste/snippet_details.html:73
 msgid "Gist"
-msgstr ""
+msgstr "Gist"
 
-#: templates/dpaste/snippet_details.html:80
+#: templates/dpaste/snippet_details.html:82
 msgid "This is a one-time snippet."
 msgstr "Este paste só pode ser visualizado uma vez."
 
-#: templates/dpaste/snippet_details.html:82
-msgid "It will automatically get deleted after {{ remaining }} further views."
-msgstr ""
-"Ele será automaticamente deletado depois de {{ remaining }} visualizações"
-
 #: templates/dpaste/snippet_details.html:84
-msgid "It will automatically get deleted after the next view."
-msgstr "Ele será automaticamente deletado após a próxima visualização."
+#, python-format
+msgid "It is automatically removed after %(remaining)s further views."
+msgstr "Automaticamente deletado depois de %(remaining)s visualizações"
 
 #: templates/dpaste/snippet_details.html:86
+msgid "It is automatically removed after the next view."
+msgstr "Automaticamente deletado após a próxima visualização."
+
+#: templates/dpaste/snippet_details.html:88
 msgid "It cannot be viewed again."
 msgstr "Não pode ser visto novamente."
 
-#: templates/dpaste/snippet_details.html:106
+#: templates/dpaste/snippet_details.html:108
 msgid "Reply to this snippet"
 msgstr "Responder paste"
 
@@ -184,14 +189,9 @@ msgstr "Responder paste"
 #, python-format
 msgid ""
 "\n"
-"    Diff between <a href=\"%(filea_url)s\">#%(filea_id)s</a> and <a href="
-"\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
-"    "
-msgstr ""
-"\n"
-"    Diff entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> e <a href="
-"\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
+"    Diff between <a href=\"%(filea_url)s\">#%(filea_id)s</a> and <a href=\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
 "    "
+msgstr "\n    Diff entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> e <a href=\"%(fileb_url)s\">#%(fileb_id)s</a>\n    "
 
 #: templates/dpaste/snippet_form.html:32
 msgid "Expire in"
@@ -203,7 +203,7 @@ msgstr "Criar paste"
 
 #: templates/dpaste/snippet_list.html:16
 msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr "DATETIME_FORMAT"
 
 #: templates/dpaste/snippet_list.html:17
 #, python-format
@@ -214,19 +214,4 @@ msgstr "%(since)s atrás"
 msgid ""
 "No snippets saved. Either all your snippets are expired or your cookie has "
 "changed."
-msgstr ""
-"Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi "
-"alterado."
-
-#: views.py:193
-msgid "No changes were made between this two files."
-msgstr "Nenhuma alterção feita entre esses dois arquivos."
-
-#~ msgid "This snippet was identified as Spam."
-#~ msgstr "Esse paste foi identificado como Spam."
-
-#~ msgid "English"
-#~ msgstr "Inglês"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "Português Brasileiro"
+msgstr "Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi alterado."