diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-12-15 16:57:37 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-12-15 16:57:37 -0600 |
| commit | 9d1fb9890b97beb55461ca34f9757bc685461130 (patch) | |
| tree | 1f8f0552ba6f4ca092aaa5a5347f0ad07433f1de /templates/content/js/com.cnprog.i18n.js | |
| parent | ebb0f636ae8f7db4e7a2e7470e449af3d96b15c0 (diff) | |
| parent | 82d35490db90878f013523c4d1a5ec3af2df8b23 (diff) | |
| download | askbot-9d1fb9890b97beb55461ca34f9757bc685461130.tar.gz askbot-9d1fb9890b97beb55461ca34f9757bc685461130.tar.bz2 askbot-9d1fb9890b97beb55461ca34f9757bc685461130.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts:
INSTALL
LICENSE
TODO
cnprog.wsgi
context.py
development.log
forum/feed.py
forum/forms.py
forum/management/commands/send_email_alerts.py
forum/managers.py
forum/models.py
forum/templatetags/extra_filters.py
forum/templatetags/extra_tags.py
forum/urls.py
forum/views.py
locale/en/LC_MESSAGES/django.mo
locale/en/LC_MESSAGES/django.po
middleware/__init__.py
middleware/anon_user.py
settings.py
settings_local.py.dist
templates/about.html
templates/authopenid/complete.html
templates/authopenid/external_legacy_login_info.html
templates/base.html
templates/base_content.html
templates/content/js/com.cnprog.admin.js
templates/content/js/com.cnprog.i18n.js
templates/content/js/com.cnprog.post.js
templates/content/js/com.cnprog.utils.js
templates/content/js/wmd/wmd.js
templates/content/style/style.css
templates/question.html
templates/questions.html
templates/unanswered.html
templates/user_email_subscriptions.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
Diffstat (limited to 'templates/content/js/com.cnprog.i18n.js')
| -rw-r--r-- | templates/content/js/com.cnprog.i18n.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js index d2356abc..018927aa 100644 --- a/templates/content/js/com.cnprog.i18n.js +++ b/templates/content/js/com.cnprog.i18n.js @@ -57,7 +57,10 @@ var i18nZh = { }; var i18nEn = { +<<<<<<< HEAD:templates/content/js/com.cnprog.i18n.js '/':'/', +======= +>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.i18n.js 'need >15 points to report spam':'need >15 points to report spam ', '>15 points requried to upvote':'>15 points required to upvote ', 'tags cannot be empty':'please enter at least one tag', |