summaryrefslogtreecommitdiffstats
path: root/locale/es
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-12 10:40:13 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-12 10:40:13 -0600
commit9e70d5be2571f7671c06c6960c04fff414b4d87c (patch)
tree439577b5a127699e845f668c6b5b8cef46df8516 /locale/es
parent4d5026f13cad0397e6547658f56348007f4173f4 (diff)
parentc96c664789084179e54c369406b5dfcbeadab141 (diff)
downloadaskbot-9e70d5be2571f7671c06c6960c04fff414b4d87c.tar.gz
askbot-9e70d5be2571f7671c06c6960c04fff414b4d87c.tar.bz2
askbot-9e70d5be2571f7671c06c6960c04fff414b4d87c.zip
Merge branch 'experimental' of git@github.com:fitoria/CNPROG into experimental
Conflicts: locale/es/LC_MESSAGES/django.po templates/header.html
Diffstat (limited to 'locale/es')
-rw-r--r--locale/es/LC_MESSAGES/django.po2
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 751f06f3..c3eda324 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-12 10:35-0600\n"
+"PO-Revision-Date: 2009-08-12 10:39-0600\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"