summaryrefslogtreecommitdiffstats
path: root/locale
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'evgenyfadeev/master'Adolfo Fitoria2010-02-094-2176/+3468
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore INSTALL TODO cnprog.wsgi django_authopenid/urls.py django_authopenid/views.py drop-all-tables.sh forum/auth.py forum/managers.py forum/models.py forum/templatetags/extra_tags.py forum/views.py locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po settings.py settings_local.py.dist sql_scripts/update_2009_01_25_001.sql sql_scripts/update_2009_02_26_001.sql sql_scripts/update_2009_04_10_001.sql templates/authopenid/confirm_email.txt templates/authopenid/sendpw_email.txt templates/content/js/compress.bat templates/content/js/flot-build.bat templates/content/style/style.css templates/footer.html templates/question.html templates/user_reputation.html templates/user_stats.html templates/user_votes.html templates/users_questions.html urls.py
| * Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into ↵Adolfo Fitoria2009-12-151-309/+601
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * better selector of ignored questions, split javascript tag_selector into ↵Evgeny Fadeev2009-12-092-312/+542
| | | | | | | | | | | | separate file, fixed question counter messages in the english lang file
| | * better comments, email subscriptions, corrected view counter, some ie7 ↵root2009-11-134-1014/+1550
| | | | | | | | | | | | issues, wiki optional with settings.WIKI_ON, site can be mounted on arbitrary url prefix, english language improvements, added feedback form, versioned css and js files to force browser cache reload when settings.RESOURCE_REVISION is incremented , other fixes
| | * added Adolfos mods, django_authopeid bug, unified traditional and OpenID loginEvgeny Fadeev2009-08-194-255/+320
| | |
| | * fixing question template bug for closed questionsAdolfo Fitoria2009-08-172-115/+92
| | |
| | * Merge branch 'evgenyfadeev/master'Adolfo Fitoria2009-08-164-704/+856
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/en/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po
| | | * merged Bruno url translations, removed his local mods, added ↵Evgeny Fadeev2009-08-124-382/+505
| | | | | | | | | | | | | | | | settings.BOOKS_ON, validated more templates
| | | * Fixed voting problem. Should still work on i18n for JS voting and some urls.Bruno Sarlo2009-08-111-5/+4
| | | | | | | | | | | | | | | | Non-ascii chars in tags bring syntax error for new meta-tags parsing.
| | | * FAQ translation for Preguntalo.com.uyBruno Sarlo2009-08-111-249/+359
| | | |
| | | * Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-111-23/+21
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/views.py locale/es/LC_MESSAGES/django.mo settings_local.py templates/answer_edit_tips.html templates/book.html templates/header.html templates/index.html templates/question_edit_tips.html templates/user_stats.html templates/user_tabs.html templates/users_questions.html
| | | * | Translation.Bruno Sarlo2009-08-101-1/+1
| | | | |
| | | * | Included i18n for links site-wide. Hope there is no bit left.Bruno Sarlo2009-08-091-32/+164
| | | | |
| | | * | Added revers urls for links to work with i18n.Bruno Sarlo2009-08-091-1/+1
| | | | |
| | | * | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-085-1425/+2341
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Merge of Spanish translation, still missing some texts. * Custom colors for preguntalo project Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po templates/content/style/style.css
| | * | \ \ Fixing translations errors(adding .mo)Adolfo Fitoria2009-08-122-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.po
| | | * | | | updating some missing translationsAdolfo Fitoria2009-08-121-4/+4
| | | | |_|/ | | | |/| |
| | * / | | updating some missing translationsAdolfo Fitoria2009-08-123-4/+4
| | |/ / /
| | * | | untested commit. merged Adolfos mods, validated most of html, slugify urls, ↵Evgeny Fadeev2009-08-102-25/+23
| | | | | | | | | | | | | | | | | | | | fixed IE issues in openid signin
| | * | | fixing a translation (to fit style)Adolfo Fitoria2009-08-092-2/+2
| | | |/ | | |/|
| | * | added spanish mods by Adolfo, fix in email notification and minor template ↵Evgeny Fadeev2009-08-072-24/+3
| | | | | | | | | | | | | | | | change, removed site-specific staff from english .po file
| | * | adding some translation, fixing translation errors (Spanish)Adolfo Fitoria2009-08-072-77/+60
| | | |
| | * | added some more filesEvgeny Fadeev2009-08-053-0/+0
| | | |
| | * | added anonymous posting, per-question subscription and fixes by Pothers and ↵Evgeny Fadeev2009-08-056-1391/+1746
| | | | | | | | | | | | | | | | some more, see development.log
| | * | included changes by Adolfo and Chaitanya and found temporary fix for ↵Evgeny Fadeev2009-08-043-0/+0
| | | | | | | | | | | | | | | | languages, switched files to Unix mode
| | * | included changes by Adolfo and Chaitanya and found temporary fix for languagesEvgeny Fadeev2009-08-042-17/+0
| | | |
| | * | Merged Mikes changes again and phoenix24 fix of python2.5 problemEvgeny Fadeev2009-08-033-1687/+2043
| | |\ \
| | * | | merged in latest Mikes changesEvgeny Fadeev2009-07-261-0/+629
| | | | |
| | * | | Spanish translation.Bruno Sarlo2009-07-231-328/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Still some bits left like capital letters and maybe some errors of context of texts. * Need to fix JS to work, will do later. * Need to modify some variables
| * | | | better comments, email subscriptions, corrected view counter, some ie7 ↵root2009-11-134-1014/+1550
| | | | | | | | | | | | | | | | | | | | issues, wiki optional with settings.WIKI_ON, site can be mounted on arbitrary url prefix, english language improvements, added feedback form, versioned css and js files to force browser cache reload when settings.RESOURCE_REVISION is incremented , other fixes
* | | | | Fixing bugs, adding evgeny's changesAdolfo Fitoria2009-08-214-156/+204
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: django_authopenid/urls.py templates/authopenid/sendpw.html templates/authopenid/signin.html
| * | | | added Adolfos mods, django_authopeid bug, unified traditional and OpenID loginEvgeny Fadeev2009-08-194-255/+320
| | | | |
* | | | | fixing error with signupAdolfo Fitoria2009-08-172-104/+95
| | | | |
* | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-172-16/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po
| * | | | fixing question template bug for closed questionsAdolfo Fitoria2009-08-172-115/+92
| | | | |
* | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-164-764/+933
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po templates/footer.html templates/header.html templates/index.html urls.py
| * | | | Merge branch 'evgenyfadeev/master'Adolfo Fitoria2009-08-164-704/+856
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/en/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po
| | * | | | merged Bruno url translations, removed his local mods, added ↵Evgeny Fadeev2009-08-124-382/+505
| | | | | | | | | | | | | | | | | | | | | | | | settings.BOOKS_ON, validated more templates
| | * | | | Fixed voting problem. Should still work on i18n for JS voting and some urls.Bruno Sarlo2009-08-111-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Non-ascii chars in tags bring syntax error for new meta-tags parsing.
| | * | | | FAQ translation for Preguntalo.com.uyBruno Sarlo2009-08-111-249/+359
| | | | | |
| | * | | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-111-23/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/views.py locale/es/LC_MESSAGES/django.mo settings_local.py templates/answer_edit_tips.html templates/book.html templates/header.html templates/index.html templates/question_edit_tips.html templates/user_stats.html templates/user_tabs.html templates/users_questions.html
| | * | | | | Translation.Bruno Sarlo2009-08-101-1/+1
| | | | | | |
| | * | | | | Included i18n for links site-wide. Hope there is no bit left.Bruno Sarlo2009-08-091-32/+164
| | | | | | |
| | * | | | | Added revers urls for links to work with i18n.Bruno Sarlo2009-08-091-1/+1
| | | | | | |
| | * | | | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-085-1425/+2341
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Merge of Spanish translation, still missing some texts. * Custom colors for preguntalo project Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po templates/content/style/style.css
| | * | | | | Mas diseño, idioma, etc.Bruno Sarlo2009-08-071-1/+1
| | | | | | |
| | * | | | | Spanish translation.Bruno Sarlo2009-08-072-459/+595
| | | |_|_|/ | | |/| | |
| * | | | | Fixing translations errors(adding .mo)Adolfo Fitoria2009-08-122-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.po
* | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-123-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po
| * | | | | | updating some missing translationsAdolfo Fitoria2009-08-123-4/+4
| | |_|_|/ / | |/| | | |