diff --git a/dbtemplates/__init__.py b/dbtemplates/__init__.py
index fcc819f..5a7cfda 100644
--- a/dbtemplates/__init__.py
+++ b/dbtemplates/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 1, 1, "f", 0)  # following PEP 386
+VERSION = (1, 2, 0, "f", 0)  # following PEP 386
 DEV_N = None
 
 
diff --git a/dbtemplates/locale/da/LC_MESSAGES/django.mo b/dbtemplates/locale/da/LC_MESSAGES/django.mo
index 8acc570..115a1f0 100644
Binary files a/dbtemplates/locale/da/LC_MESSAGES/django.mo and b/dbtemplates/locale/da/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/da/LC_MESSAGES/django.po b/dbtemplates/locale/da/LC_MESSAGES/django.po
index e8e4e24..0a7cb9d 100644
--- a/dbtemplates/locale/da/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/da/LC_MESSAGES/django.po
@@ -1,15 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Michael Lind Mortensen <illio@cs.au.dk>, 2009.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 13:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,72 +16,93 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr ""
-"Hvis du efterlader dette felt tomt, så vil Django søge efter en template med "
-"det givne navn og udfylde dette felt med dets indhold."
+"Hvis du efterlader dette felt tomt, så vil Django søge efter en template med"
+" det givne navn og udfylde dette felt med dets indhold."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Dato/tid"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "websider"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "navn"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Eksempel: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "indhold"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "oprettelsesdato"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "sidst ændret"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "skabelon"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "skabeloner"
+
+
diff --git a/dbtemplates/locale/de/LC_MESSAGES/django.mo b/dbtemplates/locale/de/LC_MESSAGES/django.mo
index cfc7ba0..50f7fd5 100644
Binary files a/dbtemplates/locale/de/LC_MESSAGES/django.mo and b/dbtemplates/locale/de/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/de/LC_MESSAGES/django.po b/dbtemplates/locale/de/LC_MESSAGES/django.po
index f41a7d7..f146836 100644
--- a/dbtemplates/locale/de/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/de/LC_MESSAGES/django.po
@@ -1,19 +1,23 @@
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-07 00:01+0100\n"
-"PO-Revision-Date: 2008-08-19 17:11+0100\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Jannis Leidel <jannis@leidel.info>\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -21,66 +25,86 @@ msgstr ""
 "Wenn Sie dieses Feld leer lassen, wird Django versuchen, das Template mit "
 "dem angegebenen Namen zu finden und mit dessen Inhalt das Feld zu füllen."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr "Erweiterte Einstellungen"
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Datum/Uhrzeit"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] "Der Cache eines Templates wurde erfolgreich geleert."
 msgstr[1] "Der Cache von %(count)d Templates wurde erfolgreich geleert."
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr "Cache der ausgewählten Templates leeren"
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
-msgstr[0] ""
-"Der Cache eines Templates wurde erfolgreich geleert und neu gefüllt."
+msgstr[0] "Der Cache eines Templates wurde erfolgreich geleert und neu gefüllt."
 msgstr[1] ""
 "Der Cache von %(count)d Templates wurde erfolgreich geleert und neu gefüllt."
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr "Cache der ausgewählten Templates neu füllen"
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] "Template-Syntax von %(names)s ist FEHLERHAFT."
+msgstr[1] "Template-Syntax von %(count)d Templates (%(names)s) ist FEHLERHAFT."
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] "Template-Syntax ist OK."
+msgstr[1] "Template-Syntax von %(count)d Templates ist OK."
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr "Template-Syntax überprüfen"
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "Seiten"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "Name"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Zum Beispiel: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "Inhalt"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "Erstellt"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "Geändert"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "Template"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "Templates"
+
+
diff --git a/dbtemplates/locale/en/LC_MESSAGES/django.mo b/dbtemplates/locale/en/LC_MESSAGES/django.mo
index 503ba62..da3c06a 100644
Binary files a/dbtemplates/locale/en/LC_MESSAGES/django.mo and b/dbtemplates/locale/en/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/en/LC_MESSAGES/django.po b/dbtemplates/locale/en/LC_MESSAGES/django.po
index f06abb9..351a27a 100644
--- a/dbtemplates/locale/en/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/en/LC_MESSAGES/django.po
@@ -8,51 +8,70 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-06 21:19+0200\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\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"
 
-#: admin.py:55
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr ""
 
-#: admin.py:81
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:84
+#: admin.py:85
 msgid "Date/time"
 msgstr ""
 
-#: admin.py:100
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:104
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:120 models.py:25
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural "Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr ""
 
diff --git a/dbtemplates/locale/fi/LC_MESSAGES/django.mo b/dbtemplates/locale/fi/LC_MESSAGES/django.mo
index 9b0d192..cf23e9a 100644
Binary files a/dbtemplates/locale/fi/LC_MESSAGES/django.mo and b/dbtemplates/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/fi/LC_MESSAGES/django.po b/dbtemplates/locale/fi/LC_MESSAGES/django.po
index 40378a2..2a486b4 100644
--- a/dbtemplates/locale/fi/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/fi/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
 "Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
-"POT-Creation-Date: 2010-11-07 00:02+0100\n"
-"PO-Revision-Date: 2011-06-19 11:22+0000\n"
-"Last-Translator: Uninen <ville@syneus.fi>\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -25,65 +25,84 @@ msgstr ""
 "Jos tämä jätetään tyhjäksi, Django etsiin annetulla nimellä olevan "
 "mallipohjan ja täyttää tähän kenttään sen sisällön."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Päiväys/aika"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] "Yhden mallipohjan välimuisti on onnistuneesti tyhjennetty."
 msgstr[1] "%(count)d mallipohjan välimusti on onnistuneesti tyhjennetty."
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr "Tyhjennä valittujen mallipohjien välimuisti."
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] "Yhden mallipohjan välimuisti on täytetty onnistuneesti."
 msgstr[1] "%(count)d mallipohjan välimuisti on täytetty onnistuneesti."
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr "Täytä valittujen mallipohjien välimuisti."
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "sivustot"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "nimi"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Esimerkiksi: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "sisätö"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "luontipäivä"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "viimeksi muutettu"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "mallipohja"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "mallipohjat"
 
diff --git a/dbtemplates/locale/fr/LC_MESSAGES/django.mo b/dbtemplates/locale/fr/LC_MESSAGES/django.mo
index 5b975da..c52b05e 100644
Binary files a/dbtemplates/locale/fr/LC_MESSAGES/django.mo and b/dbtemplates/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/fr/LC_MESSAGES/django.po b/dbtemplates/locale/fr/LC_MESSAGES/django.po
index b2b23f7..d177520 100644
--- a/dbtemplates/locale/fr/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/fr/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
-# Roland Frédéric <frederic.roland@creativeconvergence.be>, 2009.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: David Paccoud <dpaccoud@gmail.com>\n"
-"Language-Team: French\n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -23,64 +24,85 @@ msgstr ""
 "Si vous laissez ceci vide , Django recherchera un modèle avec le nom donné "
 "et remplira ce champ avec son contenu."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Date/heure"
 
-#: admin.py:98
-#, python-format
+#: admin.py:102
+#, fuzzy, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] "Le cache d'un modèle a été invalidé avec succès."
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr "Invalidation du cache des modèles sélectionnés"
 
-#: admin.py:111
-#, python-format
+#: admin.py:114
+#, fuzzy, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] "Le cache d'un modèle a été rechargé avec succès."
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr "Rechargement du cache des modèles sélectionnés"
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "sites"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "nom"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Exemple : 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "contenu"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "date de création"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "dernier changement"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "modèle"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "modèles"
+
+
diff --git a/dbtemplates/locale/he/LC_MESSAGES/django.mo b/dbtemplates/locale/he/LC_MESSAGES/django.mo
index 857a7df..7bf392c 100644
Binary files a/dbtemplates/locale/he/LC_MESSAGES/django.mo and b/dbtemplates/locale/he/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/he/LC_MESSAGES/django.po b/dbtemplates/locale/he/LC_MESSAGES/django.po
index 273a20d..cfab377 100644
--- a/dbtemplates/locale/he/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/he/LC_MESSAGES/django.po
@@ -1,86 +1,106 @@
 # 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.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr "אם זה ריק אז ג'נגו מחפש תבנית עם שם סיפק וממלא את השדה עם תוכנו"
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "תאריך / זמן"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "אתרים"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "שם"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "דוגמא: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "תוכן"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "נוצר ב"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "שונה ב"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "תבנית"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "תבניות"
+
+
diff --git a/dbtemplates/locale/it/LC_MESSAGES/django.mo b/dbtemplates/locale/it/LC_MESSAGES/django.mo
index 4070434..a3534ee 100644
Binary files a/dbtemplates/locale/it/LC_MESSAGES/django.mo and b/dbtemplates/locale/it/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/it/LC_MESSAGES/django.po b/dbtemplates/locale/it/LC_MESSAGES/django.po
index fb58eaf..37effcb 100644
--- a/dbtemplates/locale/it/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/it/LC_MESSAGES/django.po
@@ -1,18 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: Marco Beri <marcoberi@gmail.com>\n"
-"Language-Team: Jannis Leidel <jannis@leidel.info>\n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -20,64 +24,85 @@ msgstr ""
 "Lasciandolo vuoto, Django cercherà un template con lo stesso nome che avete "
 "indicato sopra e userà il suo contenuto per riempire questo campo."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr ""
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr ""
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "nome"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Esempio: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "contenuto"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "data di creazione"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "ultimo cambiamento"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "template"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "template"
+
+
diff --git a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo
index b01f0bc..335fbb6 100644
Binary files a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo and b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po
index 9a7107f..230d88f 100644
--- a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
 "Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
-"POT-Creation-Date: 2010-11-07 00:02+0100\n"
-"PO-Revision-Date: 2011-06-01 18:11+0000\n"
-"Last-Translator: hersonls <hersonls@gmail.com>\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/django-dbtemplates/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -25,65 +25,84 @@ msgstr ""
 "Manter isto vazio faz com que o Django procure por um modelo (template) com "
 "o dado nome e preencha este campo com o seu conteúdo"
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr "Avançado"
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Data/hora"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "sites"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "Name"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Exemplo: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "conteúdo"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "Data de criação"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "ultima modificação"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "modelo"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "modelos"
 
diff --git a/dbtemplates/locale/zh_CN/LC_MESSAGES/django.mo b/dbtemplates/locale/zh_CN/LC_MESSAGES/django.mo
index 0745c6f..e510bcc 100644
Binary files a/dbtemplates/locale/zh_CN/LC_MESSAGES/django.mo and b/dbtemplates/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/dbtemplates/locale/zh_CN/LC_MESSAGES/django.po b/dbtemplates/locale/zh_CN/LC_MESSAGES/django.po
index 4d5e93d..f46a6d2 100644
--- a/dbtemplates/locale/zh_CN/LC_MESSAGES/django.po
+++ b/dbtemplates/locale/zh_CN/LC_MESSAGES/django.po
@@ -1,15 +1,14 @@
 # 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.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: 张昆 <zhangkun@web916.com>\n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,68 +16,87 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr "此项目留空将使系统用指定的名称寻找模板并应用到该项目。"
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "日期/时间"
 
-#: admin.py:98
+#: admin.py:102
 #, fuzzy, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] "该模板的缓存已经成功撤销。"
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr "撤销选中模板的缓存"
 
-#: admin.py:111
+#: admin.py:114
 #, fuzzy, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] "该模板的缓存已经成功启用。"
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr "重新启用选中模板的缓存"
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "站点"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "名称"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "例如： 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "内容"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "创建日期"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "最新变更"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "模板"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "模板"
+
+
diff --git a/docs/conf.py b/docs/conf.py
index 9aa6f16..0364d2b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -38,16 +38,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'django-dbtemplates'
-copyright = u'2007-2011, Jannis Leidel'
+copyright = u'2007-2011, Jannis Leidel and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -173,7 +173,7 @@ htmlhelp_basename = 'django-dbtemplatesdoc'
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'django-dbtemplates.tex', u'django-dbtemplates Documentation',
-   u'Jannis Leidel', 'manual'),
+   u'Jannis Leidel and contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/setup.py b/setup.py
index 6a82ee7..7ecb97b 100644
--- a/setup.py
+++ b/setup.py
@@ -18,12 +18,16 @@ setup(
         ],
     },
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Framework :: Django',
     ],
 )