summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zielinski <tomasz.zielinski@pyconsultant.eu>2012-01-24 18:29:02 +0100
committerTomasz Zielinski <tomasz.zielinski@pyconsultant.eu>2012-01-24 18:29:02 +0100
commit13405923013c07ee29cf12498be44dc19ffbc83c (patch)
tree8afa29c5afbfcbf3a6f01714070d3a626f2232b7
parent02d52a2010847db712be5d2bb684a48fe211e7c1 (diff)
parented69ce4f1a4c2f5a35f6aeefcae92b1e0889864e (diff)
downloadaskbot-13405923013c07ee29cf12498be44dc19ffbc83c.tar.gz
askbot-13405923013c07ee29cf12498be44dc19ffbc83c.tar.bz2
askbot-13405923013c07ee29cf12498be44dc19ffbc83c.zip
Merge branch 'master' into wikipost
-rw-r--r--askbot/locale/zh_TW/LC_MESSAGES/django.mo (renamed from askbot/locale/zh-tw/LC_MESSAGES/django.mo)bin32303 -> 32303 bytes
-rw-r--r--askbot/locale/zh_TW/LC_MESSAGES/django.po (renamed from askbot/locale/zh-tw/LC_MESSAGES/django.po)0
-rw-r--r--askbot/locale/zh_TW/LC_MESSAGES/djangojs.mo (renamed from askbot/locale/zh-tw/LC_MESSAGES/djangojs.mo)bin2603 -> 2603 bytes
-rw-r--r--askbot/locale/zh_TW/LC_MESSAGES/djangojs.po (renamed from askbot/locale/zh-tw/LC_MESSAGES/djangojs.po)0
4 files changed, 0 insertions, 0 deletions
diff --git a/askbot/locale/zh-tw/LC_MESSAGES/django.mo b/askbot/locale/zh_TW/LC_MESSAGES/django.mo
index f826246d..f826246d 100644
--- a/askbot/locale/zh-tw/LC_MESSAGES/django.mo
+++ b/askbot/locale/zh_TW/LC_MESSAGES/django.mo
Binary files differ
diff --git a/askbot/locale/zh-tw/LC_MESSAGES/django.po b/askbot/locale/zh_TW/LC_MESSAGES/django.po
index 8aa13932..8aa13932 100644
--- a/askbot/locale/zh-tw/LC_MESSAGES/django.po
+++ b/askbot/locale/zh_TW/LC_MESSAGES/django.po
diff --git a/askbot/locale/zh-tw/LC_MESSAGES/djangojs.mo b/askbot/locale/zh_TW/LC_MESSAGES/djangojs.mo
index ef4ebd4b..ef4ebd4b 100644
--- a/askbot/locale/zh-tw/LC_MESSAGES/djangojs.mo
+++ b/askbot/locale/zh_TW/LC_MESSAGES/djangojs.mo
Binary files differ
diff --git a/askbot/locale/zh-tw/LC_MESSAGES/djangojs.po b/askbot/locale/zh_TW/LC_MESSAGES/djangojs.po
index a8e1e67e..a8e1e67e 100644
--- a/askbot/locale/zh-tw/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/zh_TW/LC_MESSAGES/djangojs.po