diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-02-22 23:02:11 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-02-22 23:02:11 -0500 |
| commit | d18148e7fe39fed1e5f46f4d65af83229ed009bb (patch) | |
| tree | f629303c98761ad5ea1830abfbe8af7e7eda49bb | |
| parent | 2390d0191c52ae585cda3f1ae6f884cc58639025 (diff) | |
| parent | 7b447646ba1867c67edaa1c2df0074f0d6d05b2c (diff) | |
| download | askbot-d18148e7fe39fed1e5f46f4d65af83229ed009bb.tar.gz askbot-d18148e7fe39fed1e5f46f4d65af83229ed009bb.tar.bz2 askbot-d18148e7fe39fed1e5f46f4d65af83229ed009bb.zip | |
merged joseph's branch
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | INSTALL.pip | 31 | ||||
| -rw-r--r-- | INSTALL.webfaction | 346 | ||||
| -rw-r--r-- | WISH_LIST | 14 | ||||
| -rw-r--r-- | context.py | 2 | ||||
| -rwxr-xr-x | cron/multi_award_badges | 10 | ||||
| -rwxr-xr-x | cron/once_award_badges | 10 | ||||
| -rw-r--r-- | cron/send_email_alerts_virtualenv | 10 | ||||
| -rw-r--r-- | django_authopenid/util.py | 1 | ||||
| -rwxr-xr-x | fbconnect/pjson.py | 4 | ||||
| -rw-r--r-- | forum/admin.py | 1 | ||||
| -rw-r--r-- | forum/forms.py | 1 | ||||
| -rw-r--r-- | forum/management/commands/send_email_alerts.py | 1 | ||||
| -rw-r--r-- | locale/en/LC_MESSAGES/django.mo | bin | 26986 -> 26986 bytes | |||
| -rw-r--r-- | locale/en/LC_MESSAGES/django.po | 1880 | ||||
| -rw-r--r-- | middleware/__init__.py~HEAD | 0 | ||||
| -rw-r--r-- | osqa-requirements.txt | 9 | ||||
| -rwxr-xr-x | settings.py | 3 | ||||
| -rwxr-xr-x | settings_local.py.dist | 2 |
19 files changed, 1458 insertions, 870 deletions
@@ -6,3 +6,6 @@ nbproject settings_local.py .idea *.iml +env +nbproject +pip-log.txt diff --git a/INSTALL.pip b/INSTALL.pip new file mode 100644 index 00000000..92b1c7fa --- /dev/null +++ b/INSTALL.pip @@ -0,0 +1,31 @@ +* Install virtualenv and pip: + easy_install virtualenv + easy_install pip + +* Install MySQL: + sudo apt-get install mysql-client mysql-server + +* Install sphinxsearch. See: + [optional] + http://sphinxsearch.com/downloads.html + http://www.hackido.com/2009/01/install-sphinx-search-on-ubuntu.html + git://github.com/johnl/deb-sphinx-search.git + +* Install a virtual environment OUTSIDE of this directory: + pip install -E ~/env -r osqa-requirements.txt +[there is discussion on the pinax forums about what it should be outside +the source directory] + +* Notice that you will need to register with recaptcha.net and receive + recaptcha public and private keys that need to be saved in your + settings_local.py file + +* Start your environment: + source ~/env/bin/activate + +* Install mysql-python into your virtualenv, because we can't +automagically install it with pip: + easy_install --prefix ~/env/ mysql-python + +For more information about why pip can't automatically install the +MySQL driver, see this message: http://groups.google.com/group/python-virtualenv/msg/ea988085951c92b3 diff --git a/INSTALL.webfaction b/INSTALL.webfaction new file mode 100644 index 00000000..401971a0 --- /dev/null +++ b/INSTALL.webfaction @@ -0,0 +1,346 @@ +Detailed instructions for installing OSQA on WebFaction + +Adapted from http://code.pinaxproject.com/wiki/DetailedPinaxWebfaction/ + +Please email turian at gmail with any updates or corrections. + + +Installing OSQA on Webfaction +------------------------------------ + +Details the steps for setting up OSQA on a Webfaction shared-hosting +account, including email setup, using Apache2, mod_wsgi, psycopg2. + +If you want to search-and-replace through this file, you will need to replace: + osqa_server [name of Webfaction application, which will be in ~/webapps/] + osqa_static [name of Webfaction application for static media serving] + DOMAIN.com [domain name for OSQA site] + PORT [port number assigned by WebFaction to your mod_wsgi application] + SITENAME [name you give the OSQA site, which will contain the apache logs] + MYOSQA [name of the OSQA project] + MAILBOX_USERNAME [username you give the email address] + MAILBOX_PASSWORD [password that webfaction gives to this email username] + OSQADATABASE_NAME [username you give the database] + OSQADATABASE_PASSWORD [password that webfaction gives to this database] + ~/envs/osqa [directory for the OSQA python environment, grep for 'env'] + USERNAME [your WebFaction username] + +Some things I'm not sure about: + +Here's what I don't know how to do: + * Set up a nginx server for static media. + * Configure sphinx search + * Use PostgreSQL, not MySQL: http://osqa.net/question/13/can-i-use-osqa-with-postgresql + + +Webfaction Control Panel +-------------------------- + +(Note: if you sign up and pick django it will create the application +for you, website/subdomain and associate the two for you.) + + If necessary, add or create any domains or subdomains you may need. + + https://panel.webfaction.com/domain/list/ + + Let's call the domain DOMAIN.com. + + Create a new Webfaction application with a "Type:" of "mod_wsgi + 2.5/Python2.5", naming it "osqa_server". (These instructions + might also work with mod_wsgi 2.0, if you like.) + + https://panel.webfaction.com/app_/list + + Note the port number assigned to the mod_wsgi application. Call + it PORT. + + Create a new Webfaction website which will associate the subdomain + with the new osqa_server application. Give it name SITENAME, at least one + domain, and set it to use the osqa_server application for the site's + root location, "/". + + https://panel.webfaction.com/site/list + + You will need to create a database, typically one for each project + you create. Change the type to PostgreSql and modify the name (it + defaults to your webfaction account name) by adding an underscore + and a project-specific identifier such as "_osqa". Before + leaving this section of the control panel, you may wish to change + the password. + + https://panel.webfaction.com/database/create + + Call these OSQADATABASE_NAME and OSQADATABASE_PASSWORD. + + Save the database password for later. + + [The following I haven't figured out yet] + You will probably want to add a static media server. This is a + Webfaction application. I created one of type "Static only (no + .htaccess)" and with the name of "osqa_static". + + https://panel.webfaction.com/app_/create + + To configure email, you need an email mailbox. Add one here. Note + that your mailbox password shouldn't be the same password you use + to SSH to webfaction. + + https://panel.webfaction.com/mailbox/list + + Save the mail password for later. + We will call the username and password MAILBOX_USERNAME and + MAILBOX_PASSWORD, respectively. + You might also consider adding an email address like admin@DOMAIN.com, + here: + + https://panel.webfaction.com/email/list + + +OSQA Software +-------------- + + Log onto webfaction and get the code. I use my fork because I have + a simple pip installation: + git://github.com/turian/osqa.git + In my situation, I keep source code in ~/utils/src, create + virtual environments in ~/envs/osqa, and create Pinax projects in + ~/webapps/osqa_server/projects. + + You will need pip + virtualenv installed: + + easy_install --prefix=~/utils/ pip + easy_install --prefix=~/utils/ virtualenv + + cd ~/utils/src/ + git clone git://github.com/turian/osqa.git + cd osqa + + # We need python2.5 to be compatible with WSGI + python2.5 ~/utils/bin/pip install -E ~/envs/osqa -r osqa-requirements.txt + source ~/envs/osqa/bin/activate + + # [Optional] If you want a MySQL database + easy_install-2.5 --prefix ~/envs/osqa/ mysql-python + +Additional Software +------------------- + + [Note that PostgreSQL installation doesn't work for me.] + + You will need to install psycopg2 separately for PostgreSQL. + Psycopg2 requires a little fiddling. Continuing to + work in the ~/utils/src/ directory: + + cd ~/utils/src/ + wget http://initd.org/pub/software/psycopg/psycopg2-2.0.13.tar.gz + tar zxf psycopg2-2.0.13.tar.gz + cd psycopg2-2.0.13 + nano setup.cfg + + # edit the line reading "#pg_config=" so that it reads: + "pg_config=/usr/local/pgsql/bin/pg_config" + + python2.5 setup.py build + python2.5 setup.py install + + +Create a Project +---------------- + + In Pinax, you clone a project from OSQA. + However, OSQA we just copy it. + + cd ~/webapps/osqa_server + mkdir projects + cd projects + cp -R ~/utils/src/osqa MYOSQA + cd MYOSQA + export OSQAPROJECT=`pwd` + + Make some directories, as described in the OSQA INSTALL file: + [okay I haven't actually done this yet] + +# mkdir -p $OSQASITE/upfiles/ +# mkdir -p $OSQALOG +# sudo chown -R `whoami`:www-data $OSQASITE +# sudo chown -R `whoami`:www-data $OSQALOG +# chmod -R g+w $OSQASITE/upfiles +# chmod -R g+w $OSQALOG + + + Edit the settings files: + + cd $OSQAPROJECT + cp settings_local.py.dist settings_local.py + vi settings_local.py settings.py + + Pay attention to the following settings: + + DATABASE_ENGINE = 'mysql' + DATABASE_NAME = 'OSQADATABASE_NAME' + DATABASE_USER = 'OSQADATABASE_NAME' + DATABASE_PASSWORD = 'OSQADATABASE_PASSWORD' + + EMAIL_HOST='smtp.webfaction.com' + EMAIL_HOST_USER='MAILBOX_USERNAME' + EMAIL_HOST_PASSWORD='MAILBOX_PASSWORD' + EMAIL_PORT='25' + DEFAULT_FROM_EMAIL = 'MAILBOX_USERNAME@DOMAIN.com' + SERVER_EMAIL = 'MAILBOX_USERNAME@DOMAIN.com' + # The following setting might not be necessary, it's used in Pinax tho + CONTACT_EMAIL = "MAILBOX_USERNAME@DOMAIN.com" + + APP_URL = 'http://DOMAIN.com' #used by email notif system and RSS + + [Later on, the install instructions should talk about] + SERVE_MEDIA = False # [Not present, not ready yet] + + Create a directory for logs: + + cd $OSQAPROJECT + mkdir log + + Modify mail cron scripts "cron/send_email_alerts" as follows: + [Pinax has cron/emit_notices.sh, cron/retry_deferred.sh, + cron/send_mail.sh, are these also necessary?] + + #!/bin/sh + + WORKON_HOME=~/envs/osqa + PROJECT_ROOT=~/webapps/osqa_server/projects/MYOSQA/ + + # activate virtual environment + . $WORKON_HOME/bin/activate + + cd $PROJECT_ROOT + python manage.py send_email_alerts >> $PROJECT_ROOT/log/cron_mail.log 2>&1 + + Use command "crontab -e" to add this script to your cron file, to run twice a day:: + + 1 0,12 * * * ~/webapps/osqa_server/projects/MYOSQA/cron/send_email_alerts + + [Configure sphinx] + + Create the database tables, indices, and so forth: + + python manage.py syncdb + + [Ignore the following static media steps, I haven't tried them] + Build media directory links within the project and create symbolic + links on the static media server. + python manage.py build_media -all + mkdir ~/webapps/OSQA_STATIC/MYOSQA + ln -sd ~/webapps/osqa_server/projects/MYOSQA/site_media ~/webapps/OSQA_STATIC/MYOSQA/site_media + + + Set up the badges: + + 1. You should run the SQL commands in: + + sql_scripts/badges.sql + + 2. Edit paths in the file `cron/multi_award_badges`. (This + file doesn't yet exist in the git repositories, so just + copy `cron/send_email_alerts` and make sure the command + `multi_award_badges` is executed.) + + 3. Run `cron/multi_award_badges` to make sure it works okay. + + 4. Use `crontab -e` to call `cron/multi_award_badges` maybe + four times an hour. + + 4,19,34,49 * * * * ~/webapps/osqa_server/projects/MYOSQA/cron/multi_award_badges + + 5. Repeat steps 1-4 for `cron/once_award_badges`. + + +Configure Apache2 +---------------- + + Edit ~/webapps/osqa_server/apache2/conf/httpd.conf as follows:: + + ServerAdmin "MAILBOX_USERNAME@DOMAIN.com" + ServerRoot "/home/USERNAME/webapps/osqa_server/apache2" + ServerName DOMAIN.com + + LoadModule dir_module modules/mod_dir.so + LoadModule env_module modules/mod_env.so + #LoadModule setenvif_module modules/mod_setenvif.so + LoadModule log_config_module modules/mod_log_config.so + LoadModule mime_module modules/mod_mime.so + LoadModule rewrite_module modules/mod_rewrite.so + LoadModule wsgi_module modules/mod_wsgi.so + + KeepAlive Off + Listen PORT + LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + CustomLog /home/USERNAME/logs/user/access_osqa_server_log combined + ErrorLog /home/USERNAME/logs/user/error_osqa_server_log + ServerLimit 2 + + #SetEnvIf X-Forwarded-SSL on HTTPS=1 + + WSGIPythonPath /home/USERNAME/envs/osqa/lib/python2.5/site-packages/ + WSGIScriptAlias / /home/USERNAME/webapps/osqa_server/projects/MYOSQA/osqa.wsgi + + LoadModule alias_module modules/mod_alias.so + WSGIDaemonProcess osqaWSGI user=USERNAME group=USERNAME threads=25 python-path=/home/USERNAME/envs/osqa/lib/python2.5/site-packages + WSGIProcessGroup osqaWSGI + + NameVirtualHost 127.0.0.1:PORT + + #ErrorLog "logs/MYOSQA_2009_05_06.log" + SetHandler none + #Alias /site_media /home/USERNAME/webapps/static/MYOSQA/site_media + + #force all content to be served as static files + #otherwise django will be crunching images through itself wasting time + Alias /content/ /home/USERNAME/webapps/osqa_server/projects/MYOSQA/templates/content/ + Alias /forum/admin/media/ /home/turian/envs/osqa/lib/python2.5/site-packages/django/contrib/admin/media/ + #AliasMatch /([^/]*\.css) /home/USERNAME/webapps/osqa_server/projects/MYOSQA/templates/content/style/$1 + <Directory "/home/USERNAME/webapps/osqa_server/projects/MYOSQA/templates/content"> + # Order deny,allow + # Allow from all + </Directory> + + If you want virtual hosts of the admin interface under HTTPS, please + look at OSQA's install file. + + Create osqa.wsgi and edit it: + cp osqa.wsgi.dist osqa.wsgi + + Edit ~/webapps/osqa_server/projects/MYOSQA/deploy/osqa.wsgi as follows:: + + import os + import sys + + # redirect sys.stdout to sys.stderr for bad libraries like geopy that uses + # print statements for optional import exceptions. + sys.stdout = sys.stderr + + from os.path import abspath, dirname, join + from site import addsitedir + + # add the virtual environment site-packages to the path + from site import addsitedir + addsitedir('/home/USERNAME/envs/osqa/lib/python2.5/site-packages') + + sys.path.insert(0, abspath(join(dirname(__file__), "../"))) + sys.path.append(abspath(dirname(__file__))) + + from django.conf import settings + os.environ["DJANGO_SETTINGS_MODULE"] = "MYOSQA.settings" + + #print sys.path + + from django.core.handlers.wsgi import WSGIHandler + application = WSGIHandler() + +And then you're up and running with: + + ~/webapps/osqa_server/apache2/bin/stop + ~/webapps/osqa_server/apache2/bin/start + +You should log in to the admin interface (http://DOMAIN.com/admin/), +and go to "Sites > Sites", and change the domain name that is used in +all emails. @@ -1,5 +1,6 @@ * The wonder bar (integrated the search / ask functionality)
* The authentication system ???
+* allow multiple logins to the same account * allow multiple logins to the same account
* more advanced templating/skinning system
* per-tag email subscriptions
@@ -8,3 +9,16 @@ * drill-down mode for navigation by tags
* improved admin console
* sort out mess with profile - currently we patch django User
+ +* Some functionality should be moved out of the forums app, in the case +that the forum app is restricted only to authenticated users: + + (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'), + url(r'^%s$' % _('about/'), app.about, name='about'), + url(r'^%s$' % _('faq/'), app.faq, name='faq'), + url(r'^%s$' % _('privacy/'), app.privacy, name='privacy'), + url(r'^%s$' % _('logout/'), app.logout, name='logout'), + url(r'^%s$' % _('feedback/'), app.feedback, name='feedback'), + (r'^%sfb/' % _('account/'), include('fbconnect.urls')), + (r'^%s' % _('account/'), include('django_authopenid.urls')), + @@ -8,6 +8,8 @@ def application_settings(context): 'APP_DESCRIPTION' : settings.APP_DESCRIPTION, 'APP_INTRO' : settings.APP_INTRO, 'EMAIL_VALIDATION': settings.EMAIL_VALIDATION, + 'FEEDBACK_SITE_URL': settings.FEEDBACK_SITE_URL, + 'FORUM_SCRIPT_ALIAS': settings.FORUM_SCRIPT_ALIAS, 'LANGUAGE_CODE': settings.LANGUAGE_CODE, 'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE, 'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY, diff --git a/cron/multi_award_badges b/cron/multi_award_badges new file mode 100755 index 00000000..df58155a --- /dev/null +++ b/cron/multi_award_badges @@ -0,0 +1,10 @@ +#!/bin/sh + +WORKON_HOME=~/envs/osqa +PROJECT_ROOT=~/webapps/osqa_server/projects/osqa/ + +# activate virtual environment +. $WORKON_HOME/bin/activate + +cd $PROJECT_ROOT +python manage.py multi_award_badges >> $PROJECT_ROOT/log/cron_badges.log 2>&1 diff --git a/cron/once_award_badges b/cron/once_award_badges new file mode 100755 index 00000000..12414969 --- /dev/null +++ b/cron/once_award_badges @@ -0,0 +1,10 @@ +#!/bin/sh + +WORKON_HOME=~/envs/osqa +PROJECT_ROOT=~/webapps/osqa_server/projects/osqa/ + +# activate virtual environment +. $WORKON_HOME/bin/activate + +cd $PROJECT_ROOT +python manage.py once_award_badges >> $PROJECT_ROOT/log/cron_badges.log 2>&1 diff --git a/cron/send_email_alerts_virtualenv b/cron/send_email_alerts_virtualenv new file mode 100644 index 00000000..6c9e154d --- /dev/null +++ b/cron/send_email_alerts_virtualenv @@ -0,0 +1,10 @@ +#!/bin/sh + +WORKON_HOME=~/envs/osqa +PROJECT_ROOT=~/webapps/osqa_server/projects/osqa/ + +# activate virtual environment +. $WORKON_HOME/bin/activate + +cd $PROJECT_ROOT +python manage.py send_email_alerts >> $PROJECT_ROOT/log/cron_mail.log 2>&1 diff --git a/django_authopenid/util.py b/django_authopenid/util.py index 1d60d50a..cd2c2e2c 100644 --- a/django_authopenid/util.py +++ b/django_authopenid/util.py @@ -21,7 +21,6 @@ from models import Association, Nonce __all__ = ['OpenID', 'DjangoOpenIDStore', 'from_openid_response', 'clean_next'] - class OpenID: def __init__(self, openid_, issued, attrs=None, sreg_=None): logging.debug('init janrain openid object') diff --git a/fbconnect/pjson.py b/fbconnect/pjson.py index 6a395b97..273b684e 100755 --- a/fbconnect/pjson.py +++ b/fbconnect/pjson.py @@ -155,8 +155,8 @@ class JsonReader(object): except KeyError: try: result = int(ch) - except ValueError: - raise ReadException, "The character %s is not a hex digit." % ch + except ValueError: + raise ReadException, "The character %s is not a hex digit." % ch return result def _readComment(self): diff --git a/forum/admin.py b/forum/admin.py index 9d81450a..3afa2241 100644 --- a/forum/admin.py +++ b/forum/admin.py @@ -3,7 +3,6 @@ from django.contrib import admin from models import * - class AnonymousQuestionAdmin(admin.ModelAdmin): """AnonymousQuestion admin class""" diff --git a/forum/forms.py b/forum/forms.py index 5d70fcff..f22763f7 100644 --- a/forum/forms.py +++ b/forum/forms.py @@ -182,7 +182,6 @@ class EditQuestionForm(forms.Form): tags = TagNamesField() summary = SummaryField() - def __init__(self, question, revision, *args, **kwargs): super(EditQuestionForm, self).__init__(*args, **kwargs) self.fields['title'].initial = revision.title diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py index db6c00ac..ab318e50 100644 --- a/forum/management/commands/send_email_alerts.py +++ b/forum/management/commands/send_email_alerts.py @@ -57,7 +57,6 @@ class Command(NoArgsCommand): q_ans = Q_set.filter(answers__author=user) q_ans.cutoff_time = cutoff_time elif feed.feed_type == 'q_all': - if user.tag_filter_setting == 'ignored': ignored_tags = Tag.objects.filter(user_selections__reason='bad',user_selections__user=user) q_all = Q_set.exclude( tags__in=ignored_tags ) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo Binary files differindex 38120e49..20813cb3 100644 --- a/locale/en/LC_MESSAGES/django.mo +++ b/locale/en/LC_MESSAGES/django.mo diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index bfec60c0..3f53e36d 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-08 18:43-0500\n" +"POT-Creation-Date: 2010-02-22 22:59-0500\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" @@ -79,7 +79,7 @@ msgstr "sorry, there is no such user name" #: django_authopenid/urls.py:23 django_authopenid/urls.py:24 #: django_authopenid/urls.py:25 django_authopenid/urls.py:27 #: fbconnect/urls.py:12 fbconnect/urls.py:13 fbconnect/urls.py:14 -#: forum/urls.py:29 +#: forum/urls.py:32 msgid "signin/" msgstr "" @@ -149,7 +149,7 @@ msgstr "" msgid "openid/" msgstr "" -#: django_authopenid/urls.py:43 forum/urls.py:49 forum/urls.py:53 +#: django_authopenid/urls.py:43 forum/urls.py:52 forum/urls.py:56 msgid "delete/" msgstr "" @@ -294,7 +294,7 @@ msgstr "" msgid "question" msgstr "" -#: forum/const.py:58 templates/book.html:110 +#: forum/const.py:58 forum/skins/default/templates/book.html:110 msgid "answer" msgstr "" @@ -370,7 +370,7 @@ msgstr "" msgid "[deleted]" msgstr "" -#: forum/const.py:87 forum/views.py:796 forum/views.py:815 +#: forum/const.py:87 forum/views/readers.py:564 forum/views/readers.py:583 msgid "initial version" msgstr "" @@ -394,375 +394,302 @@ msgstr "" msgid "latest questions" msgstr "" -#: forum/forms.py:18 templates/answer_edit_tips.html:35 -#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:32 -#: templates/question_edit_tips.html:37 +#: forum/forms.py:19 forum/skins/default/templates/answer_edit_tips.html:35 +#: forum/skins/default/templates/answer_edit_tips.html:39 +#: forum/skins/default/templates/question_edit_tips.html:32 +#: forum/skins/default/templates/question_edit_tips.html:37 msgid "title" msgstr "" -#: forum/forms.py:19 +#: forum/forms.py:20 msgid "please enter a descriptive title for your question" msgstr "" -#: forum/forms.py:24 +#: forum/forms.py:25 msgid "title must be > 10 characters" msgstr "" -#: forum/forms.py:33 +#: forum/forms.py:34 msgid "content" msgstr "" -#: forum/forms.py:39 +#: forum/forms.py:40 msgid "question content must be > 10 characters" msgstr "" -#: forum/forms.py:49 templates/header.html:28 templates/header.html.py:56 +#: forum/forms.py:50 forum/skins/default/templates/header.html:28 +#: forum/skins/default/templates/header.html:56 msgid "tags" msgstr "" -#: forum/forms.py:51 +#: forum/forms.py:52 msgid "" "Tags are short keywords, with no spaces within. Up to five tags can be used." msgstr "" -#: forum/forms.py:58 templates/question_retag.html:39 +#: forum/forms.py:59 forum/skins/default/templates/question_retag.html:39 msgid "tags are required" msgstr "" -#: forum/forms.py:64 +#: forum/forms.py:65 msgid "please use 5 tags or less" msgstr "" -#: forum/forms.py:67 +#: forum/forms.py:68 msgid "tags must be shorter than 20 characters" msgstr "" -#: forum/forms.py:71 +#: forum/forms.py:72 msgid "" "please use following characters in tags: letters 'a-z', numbers, and " "characters '.-_#'" msgstr "" -#: forum/forms.py:81 templates/index.html:61 templates/index.html.py:73 -#: templates/post_contributor_info.html:7 -#: templates/question_summary_list_roll.html:26 -#: templates/question_summary_list_roll.html:38 templates/questions.html:92 -#: templates/questions.html.py:104 +#: forum/forms.py:82 +#: forum/skins/default/templates/post_contributor_info.html:7 +#: forum/skins/default/templates/question_summary_list_roll.html:26 +#: forum/skins/default/templates/question_summary_list_roll.html:38 +#: forum/skins/default/templates/questions.html:92 +#: forum/skins/default/templates/questions.html:104 msgid "community wiki" msgstr "" -#: forum/forms.py:82 +#: forum/forms.py:83 msgid "" "if you choose community wiki option, the question and answer do not generate " "points and name of author will not be shown" msgstr "" -#: forum/forms.py:98 +#: forum/forms.py:99 msgid "update summary:" msgstr "" -#: forum/forms.py:99 +#: forum/forms.py:100 msgid "" "enter a brief summary of your revision (e.g. fixed spelling, grammar, " "improved style, this field is optional)" msgstr "" -#: forum/forms.py:102 +#: forum/forms.py:103 msgid "Automatically accept user's contributions for the email updates" msgstr "" -#: forum/forms.py:118 +#: forum/forms.py:119 msgid "Your name:" msgstr "" -#: forum/forms.py:119 +#: forum/forms.py:120 msgid "Email (not shared with anyone):" msgstr "" -#: forum/forms.py:120 +#: forum/forms.py:121 msgid "Your message:" msgstr "" -#: forum/forms.py:202 +#: forum/forms.py:203 msgid "this email does not have to be linked to gravatar" msgstr "" -#: forum/forms.py:204 +#: forum/forms.py:205 msgid "Screen name" msgstr "" -#: forum/forms.py:205 +#: forum/forms.py:206 msgid "Real name" msgstr "" -#: forum/forms.py:206 +#: forum/forms.py:207 msgid "Website" msgstr "" -#: forum/forms.py:207 +#: forum/forms.py:208 msgid "Location" msgstr "" -#: forum/forms.py:208 +#: forum/forms.py:209 msgid "Date of birth" msgstr "" -#: forum/forms.py:208 +#: forum/forms.py:209 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD" msgstr "" -#: forum/forms.py:209 templates/authopenid/settings.html:21 +#: forum/forms.py:210 +#: forum/skins/default/templates/authopenid/settings.html:21 msgid "Profile" msgstr "" -#: forum/forms.py:240 forum/forms.py:241 +#: forum/forms.py:241 forum/forms.py:242 msgid "this email has already been registered, please use another one" msgstr "" -#: forum/forms.py:247 +#: forum/forms.py:248 msgid "Choose email tag filter" msgstr "" -#: forum/forms.py:262 forum/forms.py:263 +#: forum/forms.py:263 forum/forms.py:264 msgid "weekly" msgstr "" -#: forum/forms.py:262 forum/forms.py:263 +#: forum/forms.py:263 forum/forms.py:264 msgid "no email" msgstr "" -#: forum/forms.py:263 +#: forum/forms.py:264 msgid "daily" msgstr "" -#: forum/forms.py:278 +#: forum/forms.py:279 msgid "Asked by me" msgstr "" -#: forum/forms.py:281 +#: forum/forms.py:282 msgid "Answered by me" msgstr "" -#: forum/forms.py:284 +#: forum/forms.py:285 msgid "Individually selected" msgstr "" -#: forum/forms.py:287 +#: forum/forms.py:288 msgid "Entire forum (tag filtered)" msgstr "" -#: forum/forms.py:341 +#: forum/forms.py:342 msgid "okay, let's try!" msgstr "" -#: forum/forms.py:342 +#: forum/forms.py:343 msgid "no OSQA community email please, thanks" msgstr "" -#: forum/forms.py:345 +#: forum/forms.py:346 msgid "please choose one of the options above" msgstr "" -#: forum/models.py:52 -msgid "Entire forum" -msgstr "" - -#: forum/models.py:53 -msgid "Questions that I asked" -msgstr "" - -#: forum/models.py:54 -msgid "Questions that I answered" -msgstr "" - -#: forum/models.py:55 -msgid "Individually selected questions" -msgstr "" - -#: forum/models.py:58 -msgid "Weekly" -msgstr "" - -#: forum/models.py:59 -msgid "Daily" -msgstr "" - -#: forum/models.py:60 -msgid "No email" -msgstr "" - -#: forum/models.py:321 -#, python-format -msgid "%(author)s modified the question" -msgstr "" - -#: forum/models.py:325 -#, python-format -msgid "%(people)s posted %(new_answer_count)s new answers" -msgstr "" - -#: forum/models.py:330 -#, python-format -msgid "%(people)s commented the question" -msgstr "" - -#: forum/models.py:335 -#, python-format -msgid "%(people)s commented answers" -msgstr "" - -#: forum/models.py:337 -#, python-format -msgid "%(people)s commented an answer" -msgstr "" - -#: forum/models.py:368 -msgid "interesting" -msgstr "" - -#: forum/models.py:368 -msgid "ignored" -msgstr "" - -#: forum/models.py:541 templates/badges.html:53 -msgid "gold" -msgstr "" - -#: forum/models.py:542 templates/badges.html:61 -msgid "silver" -msgstr "" - -#: forum/models.py:543 templates/badges.html:68 -msgid "bronze" -msgstr "" - -#: forum/urls.py:26 +#: forum/urls.py:28 msgid "upfiles/" msgstr "" -#: forum/urls.py:30 +#: forum/urls.py:33 msgid "about/" msgstr "" -#: forum/urls.py:31 +#: forum/urls.py:34 msgid "faq/" msgstr "" -#: forum/urls.py:32 +#: forum/urls.py:35 msgid "privacy/" msgstr "" -#: forum/urls.py:33 +#: forum/urls.py:36 msgid "logout/" msgstr "" -#: forum/urls.py:34 forum/urls.py:35 forum/urls.py:36 forum/urls.py:53 +#: forum/urls.py:37 forum/urls.py:38 forum/urls.py:39 forum/urls.py:56 msgid "answers/" msgstr "" -#: forum/urls.py:34 forum/urls.py:46 forum/urls.py:49 forum/urls.py:53 +#: forum/urls.py:37 forum/urls.py:49 forum/urls.py:52 forum/urls.py:56 msgid "comments/" msgstr "" -#: forum/urls.py:35 forum/urls.py:40 forum/urls.py:75 -#: templates/user_info.html:45 +#: forum/urls.py:38 forum/urls.py:43 forum/urls.py:78 +#: forum/skins/default/templates/user_info.html:45 msgid "edit/" msgstr "" -#: forum/urls.py:36 forum/urls.py:45 +#: forum/urls.py:39 forum/urls.py:48 msgid "revisions/" msgstr "" -#: forum/urls.py:37 forum/urls.py:38 forum/urls.py:39 forum/urls.py:40 -#: forum/urls.py:41 forum/urls.py:42 forum/urls.py:43 forum/urls.py:44 -#: forum/urls.py:45 forum/urls.py:46 forum/urls.py:49 +#: forum/urls.py:40 forum/urls.py:41 forum/urls.py:42 forum/urls.py:43 +#: forum/urls.py:44 forum/urls.py:45 forum/urls.py:46 forum/urls.py:47 +#: forum/urls.py:48 forum/urls.py:49 forum/urls.py:52 msgid "questions/" msgstr "" -#: forum/urls.py:38 forum/urls.py:85 +#: forum/urls.py:41 forum_modules/books/urls.py:8 msgid "ask/" msgstr "" -#: forum/urls.py:39 +#: forum/urls.py:42 msgid "unanswered/" msgstr "" -#: forum/urls.py:41 +#: forum/urls.py:44 msgid "close/" msgstr "" -#: forum/urls.py:42 +#: forum/urls.py:45 msgid "reopen/" msgstr "" -#: forum/urls.py:43 +#: forum/urls.py:46 msgid "answer/" msgstr "" -#: forum/urls.py:44 +#: forum/urls.py:47 msgid "vote/" msgstr "" -#: forum/urls.py:47 +#: forum/urls.py:50 msgid "command/" msgstr "" -#: forum/urls.py:57 forum/views.py:440 +#: forum/urls.py:60 forum/views/readers.py:435 msgid "question/" msgstr "" -#: forum/urls.py:58 forum/urls.py:59 +#: forum/urls.py:61 forum/urls.py:62 msgid "tags/" msgstr "" -#: forum/urls.py:61 forum/urls.py:65 +#: forum/urls.py:64 forum/urls.py:68 msgid "mark-tag/" msgstr "" -#: forum/urls.py:61 +#: forum/urls.py:64 msgid "interesting/" msgstr "" -#: forum/urls.py:65 +#: forum/urls.py:68 msgid "ignored/" msgstr "" -#: forum/urls.py:69 +#: forum/urls.py:72 msgid "unmark-tag/" msgstr "" -#: forum/urls.py:73 forum/urls.py:75 forum/urls.py:76 +#: forum/urls.py:76 forum/urls.py:78 forum/urls.py:79 msgid "users/" msgstr "" -#: forum/urls.py:74 +#: forum/urls.py:77 msgid "moderate-user/" msgstr "" -#: forum/urls.py:77 forum/urls.py:78 +#: forum/urls.py:80 forum/urls.py:81 msgid "badges/" msgstr "" -#: forum/urls.py:79 +#: forum/urls.py:82 msgid "messages/" msgstr "" -#: forum/urls.py:79 +#: forum/urls.py:82 msgid "markread/" msgstr "" -#: forum/urls.py:81 +#: forum/urls.py:84 msgid "nimda/" msgstr "" -#: forum/urls.py:83 +#: forum/urls.py:86 msgid "upload/" msgstr "" -#: forum/urls.py:84 forum/urls.py:85 forum/urls.py:86 -msgid "books/" -msgstr "" - #: forum/urls.py:87 msgid "search/" msgstr "" @@ -775,145 +702,11 @@ msgstr "" msgid "account/" msgstr "" -#: forum/user.py:16 templates/user_tabs.html:7 -msgid "overview" -msgstr "" - -#: forum/user.py:17 -msgid "user profile" -msgstr "" - -#: forum/user.py:18 -msgid "user profile overview" -msgstr "" - -#: forum/user.py:24 templates/user_tabs.html:9 -msgid "recent activity" -msgstr "" - -#: forum/user.py:25 -msgid "recent user activity" -msgstr "" - -#: forum/user.py:26 -msgid "profile - recent activity" -msgstr "" - -#: forum/user.py:33 templates/user_tabs.html:13 -msgid "responses" -msgstr "" - -#: forum/user.py:34 templates/user_tabs.html:12 -msgid "comments and answers to others questions" -msgstr "" - -#: forum/user.py:35 -msgid "profile - responses" -msgstr "" - -#: forum/user.py:42 templates/user_info.html:22 templates/users.html:26 -msgid "reputation" -msgstr "karma" - -#: forum/user.py:43 -msgid "user reputation in the community" -msgstr "user karma" - -#: forum/user.py:44 -msgid "profile - user reputation" -msgstr "Profile - User's Karma" - -#: forum/user.py:50 -msgid "favorite questions" -msgstr "" - -#: forum/user.py:51 -msgid "users favorite questions" -msgstr "" - -#: forum/user.py:52 -msgid "profile - favorite questions" -msgstr "" - -#: forum/user.py:59 templates/user_tabs.html:20 -msgid "casted votes" -msgstr "votes" - -#: forum/user.py:60 templates/user_tabs.html:20 -msgid "user vote record" -msgstr "" - -#: forum/user.py:61 -msgid "profile - votes" -msgstr "" - -#: forum/user.py:68 templates/user_tabs.html:28 -msgid "email subscriptions" -msgstr "" - -#: forum/user.py:69 templates/user_tabs.html:27 -msgid "email subscription settings" -msgstr "" - -#: forum/user.py:70 -msgid "profile - email subscriptions" -msgstr "" - -#: forum/views.py:141 -msgid "Q&A forum feedback" -msgstr "" - -#: forum/views.py:142 -msgid "Thanks for the feedback!" -msgstr "" - -#: forum/views.py:150 -msgid "We look forward to hearing your feedback! Please, give it next time :)" -msgstr "" - -#: forum/views.py:1098 -#, python-format -msgid "subscription saved, %(email)s needs validation, see %(details_url)s" -msgstr "" -"Your subscription is saved, but email address %(email)s needs to be " -"validated, please see <a href='%(details_url)s'>more details here</a>" - -#: forum/views.py:1106 -msgid "email update frequency has been set to daily" -msgstr "" - -#: forum/views.py:1982 forum/views.py:1986 -msgid "changes saved" -msgstr "" - -#: forum/views.py:1992 -msgid "email updates canceled" -msgstr "" - -#: forum/views.py:2159 -msgid "uploading images is limited to users with >60 reputation points" -msgstr "sorry, file uploading requires karma >60" - -#: forum/views.py:2161 -msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" -msgstr "" - -#: forum/views.py:2163 -#, python-format -msgid "maximum upload file size is %sK" -msgstr "" - -#: forum/views.py:2165 -#, python-format -msgid "" -"Error uploading file. Please contact the site administrator. Thank you. %s" -msgstr "" - -#: forum/management/commands/send_email_alerts.py:156 +#: forum/management/commands/send_email_alerts.py:155 msgid "email update message subject" msgstr "news from Q&A forum" -#: forum/management/commands/send_email_alerts.py:158 +#: forum/management/commands/send_email_alerts.py:157 #, python-format msgid "%(name)s, this is an update message header for a question" msgid_plural "%(name)s, this is an update message header for %(num)d questions" @@ -924,11 +717,11 @@ msgstr[1] "" "<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on " "the Q&A forum:</p>" -#: forum/management/commands/send_email_alerts.py:169 +#: forum/management/commands/send_email_alerts.py:168 msgid "new question" msgstr "" -#: forum/management/commands/send_email_alerts.py:179 +#: forum/management/commands/send_email_alerts.py:178 #, python-format msgid "There is also one question which was recently " msgid_plural "" @@ -936,12 +729,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forum/management/commands/send_email_alerts.py:184 +#: forum/management/commands/send_email_alerts.py:183 msgid "" "Perhaps you could look up previously sent forum reminders in your mailbox." msgstr "" -#: forum/management/commands/send_email_alerts.py:188 +#: forum/management/commands/send_email_alerts.py:187 #, python-format msgid "" "go to %(link)s to change frequency of email updates or %(email)s " @@ -953,227 +746,305 @@ msgstr "" "administrator at %(email)s.</p><p>Sincerely,</p><p>Your friendly Q&A forum " "server.</p>" -#: forum/templatetags/extra_tags.py:164 forum/templatetags/extra_tags.py:193 -#: templates/header.html:33 -msgid "badges" +#: forum/middleware/anon_user.py:33 +#, python-format +msgid "first time greeting with %(url)s" msgstr "" -#: forum/templatetags/extra_tags.py:165 forum/templatetags/extra_tags.py:192 -msgid "reputation points" -msgstr "karma" - -#: forum/templatetags/extra_tags.py:252 -msgid "2 days ago" +#: forum/models/question.py:247 +#, python-format +msgid "%(author)s modified the question" msgstr "" -#: forum/templatetags/extra_tags.py:254 -msgid "yesterday" +#: forum/models/question.py:251 +#, python-format +msgid "%(people)s posted %(new_answer_count)s new answers" msgstr "" -#: forum/templatetags/extra_tags.py:256 +#: forum/models/question.py:256 #, python-format -msgid "%(hr)d hour ago" -msgid_plural "%(hr)d hours ago" -msgstr[0] "" -msgstr[1] "" +msgid "%(people)s commented the question" +msgstr "" -#: forum/templatetags/extra_tags.py:258 +#: forum/models/question.py:261 #, python-format -msgid "%(min)d min ago" -msgid_plural "%(min)d mins ago" -msgstr[0] "" -msgstr[1] "" +msgid "%(people)s commented answers" +msgstr "" -#: middleware/anon_user.py:33 +#: forum/models/question.py:263 #, python-format -msgid "first time greeting with %(url)s" +msgid "%(people)s commented an answer" msgstr "" -#: templates/404.html:24 +#: forum/models/repute.py:11 forum/skins/default/templates/badges.html:53 +msgid "gold" +msgstr "" + +#: forum/models/repute.py:12 forum/skins/default/templates/badges.html:61 +msgid "silver" +msgstr "" + +#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:68 +msgid "bronze" +msgstr "" + +#: forum/models/tag.py:79 +msgid "interesting" +msgstr "" + +#: forum/models/tag.py:79 +msgid "ignored" +msgstr "" + +#: forum/models/user.py:31 +msgid "Entire forum" +msgstr "" + +#: forum/models/user.py:32 +msgid "Questions that I asked" +msgstr "" + +#: forum/models/user.py:33 +msgid "Questions that I answered" +msgstr "" + +#: forum/models/user.py:34 +msgid "Individually selected questions" +msgstr "" + +#: forum/models/user.py:37 +msgid "Weekly" +msgstr "" + +#: forum/models/user.py:38 +msgid "Daily" +msgstr "" + +#: forum/models/user.py:39 +msgid "No email" +msgstr "" + +#: forum/skins/default/templates/404.html:24 msgid "Sorry, could not find the page you requested." msgstr "" -#: templates/404.html:26 +#: forum/skins/default/templates/404.html:26 msgid "This might have happened for the following reasons:" msgstr "" -#: templates/404.html:28 +#: forum/skins/default/templates/404.html:28 msgid "this question or answer has been deleted;" msgstr "" -#: templates/404.html:29 +#: forum/skins/default/templates/404.html:29 msgid "url has error - please check it;" msgstr "" -#: templates/404.html:30 +#: forum/skins/default/templates/404.html:30 msgid "" "the page you tried to visit is protected or you don't have sufficient " "points, see" msgstr "" -#: templates/404.html:31 +#: forum/skins/default/templates/404.html:31 msgid "if you believe this error 404 should not have occured, please" msgstr "" -#: templates/404.html:32 +#: forum/skins/default/templates/404.html:32 msgid "report this problem" msgstr "" -#: templates/404.html:41 templates/500.html:27 +#: forum/skins/default/templates/404.html:41 +#: forum/skins/default/templates/500.html:27 msgid "back to previous page" msgstr "" -#: templates/404.html:42 +#: forum/skins/default/templates/404.html:42 msgid "see all questions" msgstr "" -#: templates/404.html:43 +#: forum/skins/default/templates/404.html:43 msgid "see all tags" msgstr "" -#: templates/500.html:22 +#: forum/skins/default/templates/500.html:22 msgid "sorry, system error" msgstr "" -#: templates/500.html:24 +#: forum/skins/default/templates/500.html:24 msgid "system error log is recorded, error will be fixed as soon as possible" msgstr "" -#: templates/500.html:25 +#: forum/skins/default/templates/500.html:25 msgid "please report the error to the site administrators if you wish" msgstr "" -#: templates/500.html:28 +#: forum/skins/default/templates/500.html:28 msgid "see latest questions" msgstr "" -#: templates/500.html:29 +#: forum/skins/default/templates/500.html:29 msgid "see tags" msgstr "" -#: templates/about.html:6 templates/about.html.py:11 +#: forum/skins/default/templates/about.html:6 +#: forum/skins/default/templates/about.html:11 msgid "About" msgstr "" -#: templates/answer_edit.html:5 templates/answer_edit.html.py:48 +#: forum/skins/default/templates/answer_edit.html:5 +#: forum/skins/default/templates/answer_edit.html:48 msgid "Edit answer" msgstr "" -#: templates/answer_edit.html:25 templates/answer_edit.html.py:28 -#: templates/ask.html:26 templates/ask.html.py:29 templates/question.html:45 -#: templates/question.html.py:48 templates/question_edit.html:25 -#: templates/question_edit.html.py:28 +#: forum/skins/default/templates/answer_edit.html:25 +#: forum/skins/default/templates/answer_edit.html:28 +#: forum/skins/default/templates/ask.html:26 +#: forum/skins/default/templates/ask.html:29 +#: forum/skins/default/templates/question.html:45 +#: forum/skins/default/templates/question.html:48 +#: forum/skins/default/templates/question_edit.html:25 +#: forum/skins/default/templates/question_edit.html:28 msgid "hide preview" msgstr "" -#: templates/answer_edit.html:28 templates/ask.html:29 -#: templates/question.html:48 templates/question_edit.html:28 +#: forum/skins/default/templates/answer_edit.html:28 +#: forum/skins/default/templates/ask.html:29 +#: forum/skins/default/templates/question.html:48 +#: forum/skins/default/templates/question_edit.html:28 msgid "show preview" msgstr "" -#: templates/answer_edit.html:48 templates/question_edit.html:66 -#: templates/question_retag.html:53 templates/revisions_answer.html:38 -#: templates/revisions_question.html:38 +#: forum/skins/default/templates/answer_edit.html:48 +#: forum/skins/default/templates/question_edit.html:66 +#: forum/skins/default/templates/question_retag.html:53 +#: forum/skins/default/templates/revisions_answer.html:38 +#: forum/skins/default/templates/revisions_question.html:38 msgid "back" msgstr "" -#: templates/answer_edit.html:53 templates/question_edit.html:71 -#: templates/revisions_answer.html:52 templates/revisions_question.html:52 +#: forum/skins/default/templates/answer_edit.html:53 +#: forum/skins/default/templates/question_edit.html:71 +#: forum/skins/default/templates/revisions_answer.html:52 +#: forum/skins/default/templates/revisions_question.html:52 msgid "revision" msgstr "" -#: templates/answer_edit.html:56 templates/question_edit.html:75 +#: forum/skins/default/templates/answer_edit.html:56 +#: forum/skins/default/templates/question_edit.html:75 msgid "select revision" msgstr "" -#: templates/answer_edit.html:63 templates/ask.html:97 -#: templates/question.html:434 templates/question_edit.html:92 +#: forum/skins/default/templates/answer_edit.html:63 +#: forum/skins/default/templates/ask.html:97 +#: forum/skins/default/templates/question.html:432 +#: forum/skins/default/templates/question_edit.html:92 msgid "Toggle the real time Markdown editor preview" msgstr "" -#: templates/answer_edit.html:63 templates/ask.html:97 -#: templates/question.html:435 templates/question_edit.html:92 +#: forum/skins/default/templates/answer_edit.html:63 +#: forum/skins/default/templates/ask.html:97 +#: forum/skins/default/templates/question.html:433 +#: forum/skins/default/templates/question_edit.html:92 msgid "toggle preview" msgstr "" -#: templates/answer_edit.html:72 templates/question_edit.html:118 -#: templates/question_retag.html:74 +#: forum/skins/default/templates/answer_edit.html:72 +#: forum/skins/default/templates/question_edit.html:118 +#: forum/skins/default/templates/question_retag.html:74 msgid "Save edit" msgstr "" -#: templates/answer_edit.html:73 templates/close.html:29 -#: templates/feedback.html:50 templates/question_edit.html:119 -#: templates/question_retag.html:75 templates/reopen.html:30 -#: templates/user_edit.html:87 templates/authopenid/changeemail.html:40 +#: forum/skins/default/templates/answer_edit.html:73 +#: forum/skins/default/templates/close.html:29 +#: forum/skins/default/templates/feedback.html:50 +#: forum/skins/default/templates/question_edit.html:119 +#: forum/skins/default/templates/question_retag.html:75 +#: forum/skins/default/templates/reopen.html:30 +#: forum/skins/default/templates/user_edit.html:87 +#: forum/skins/default/templates/authopenid/changeemail.html:40 msgid "Cancel" msgstr "" -#: templates/answer_edit_tips.html:4 +#: forum/skins/default/templates/answer_edit_tips.html:4 msgid "answer tips" msgstr "Tips" -#: templates/answer_edit_tips.html:7 +#: forum/skins/default/templates/answer_edit_tips.html:7 msgid "please make your answer relevant to this community" msgstr "" -#: templates/answer_edit_tips.html:10 +#: forum/skins/default/templates/answer_edit_tips.html:10 msgid "try to give an answer, rather than engage into a discussion" msgstr "" -#: templates/answer_edit_tips.html:13 +#: forum/skins/default/templates/answer_edit_tips.html:13 msgid "please try to provide details" msgstr "" -#: templates/answer_edit_tips.html:16 templates/question_edit_tips.html:13 +#: forum/skins/default/templates/answer_edit_tips.html:16 +#: forum/skins/default/templates/question_edit_tips.html:13 msgid "be clear and concise" msgstr "" -#: templates/answer_edit_tips.html:20 templates/question_edit_tips.html:17 +#: forum/skins/default/templates/answer_edit_tips.html:20 +#: forum/skins/default/templates/question_edit_tips.html:17 msgid "see frequently asked questions" msgstr "" -#: templates/answer_edit_tips.html:26 templates/question_edit_tips.html:23 +#: forum/skins/default/templates/answer_edit_tips.html:26 +#: forum/skins/default/templates/question_edit_tips.html:23 msgid "Markdown tips" msgstr "Markdown basics" -#: templates/answer_edit_tips.html:29 templates/question_edit_tips.html:26 +#: forum/skins/default/templates/answer_edit_tips.html:29 +#: forum/skins/default/templates/question_edit_tips.html:26 msgid "*italic* or __italic__" msgstr "" -#: templates/answer_edit_tips.html:32 templates/question_edit_tips.html:29 +#: forum/skins/default/templates/answer_edit_tips.html:32 +#: forum/skins/default/templates/question_edit_tips.html:29 msgid "**bold** or __bold__" msgstr "" -#: templates/answer_edit_tips.html:35 templates/question_edit_tips.html:32 +#: forum/skins/default/templates/answer_edit_tips.html:35 +#: forum/skins/default/templates/question_edit_tips.html:32 msgid "link" msgstr "" -#: templates/answer_edit_tips.html:35 templates/answer_edit_tips.html.py:39 -#: templates/question_edit_tips.html:32 templates/question_edit_tips.html:37 +#: forum/skins/default/templates/answer_edit_tips.html:35 +#: forum/skins/default/templates/answer_edit_tips.html:39 +#: forum/skins/default/templates/question_edit_tips.html:32 +#: forum/skins/default/templates/question_edit_tips.html:37 msgid "text" msgstr "" -#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:37 +#: forum/skins/default/templates/answer_edit_tips.html:39 +#: forum/skins/default/templates/question_edit_tips.html:37 msgid "image" msgstr "" -#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:41 +#: forum/skins/default/templates/answer_edit_tips.html:43 +#: forum/skins/default/templates/question_edit_tips.html:41 msgid "numbered list:" msgstr "" -#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:46 +#: forum/skins/default/templates/answer_edit_tips.html:48 +#: forum/skins/default/templates/question_edit_tips.html:46 msgid "basic HTML tags are also supported" msgstr "" -#: templates/answer_edit_tips.html:52 templates/question_edit_tips.html:50 +#: forum/skins/default/templates/answer_edit_tips.html:52 +#: forum/skins/default/templates/question_edit_tips.html:50 msgid "learn more about Markdown" msgstr "" -#: templates/ask.html:5 templates/ask.html.py:61 +#: forum/skins/default/templates/ask.html:5 +#: forum/skins/default/templates/ask.html:61 msgid "Ask a question" msgstr "" -#: templates/ask.html:68 +#: forum/skins/default/templates/ask.html:68 msgid "login to post question info" msgstr "" "<span class=\"strong big\">You are welcome to start submitting your question " @@ -1182,7 +1053,7 @@ msgstr "" "will be published after you log in. Login/signup process is very simple. " "Login takes about 30 seconds, initial signup takes a minute or less." -#: templates/ask.html:74 +#: forum/skins/default/templates/ask.html:74 #, python-format msgid "" "must have valid %(email)s to post, \n" @@ -1195,41 +1066,42 @@ msgstr "" "<br>You can submit your question now and validate email after that. Your " "question will saved as pending meanwhile. " -#: templates/ask.html:112 +#: forum/skins/default/templates/ask.html:112 msgid "(required)" msgstr "" -#: templates/ask.html:119 +#: forum/skins/default/templates/ask.html:119 msgid "Login/signup to post your question" msgstr "Login/Signup to Post" -#: templates/ask.html:121 +#: forum/skins/default/templates/ask.html:121 msgid "Ask your question" msgstr "Ask Your Question" -#: templates/badge.html:6 templates/badge.html.py:17 +#: forum/skins/default/templates/badge.html:6 +#: forum/skins/default/templates/badge.html:17 msgid "Badge" msgstr "" -#: templates/badge.html:26 +#: forum/skins/default/templates/badge.html:26 msgid "The users have been awarded with badges:" msgstr "" -#: templates/badges.html:6 +#: forum/skins/default/templates/badges.html:6 msgid "Badges summary" msgstr "" -#: templates/badges.html:17 +#: forum/skins/default/templates/badges.html:17 msgid "Badges" msgstr "" -#: templates/badges.html:21 +#: forum/skins/default/templates/badges.html:21 msgid "Community gives you awards for your questions, answers and votes." msgstr "" "If your questions and answers are highly voted, your contribution to this " "Q&A community will be recognized with the variety of badges." -#: templates/badges.html:22 +#: forum/skins/default/templates/badges.html:22 #, python-format msgid "" "Below is the list of available badges and number \n" @@ -1244,160 +1116,176 @@ msgstr "" "s'>feedback</a></strong> - what kinds of badges would you like to see and " "suggest the activity for which those badges might be awarded." -#: templates/badges.html:50 +#: forum/skins/default/templates/badges.html:50 msgid "Community badges" msgstr "Badge levels" -#: templates/badges.html:56 +#: forum/skins/default/templates/badges.html:56 msgid "gold badge description" msgstr "" "Gold badge is the highest award in this community. To obtain it have to show " "profound knowledge and ability in addition to your active participation." -#: templates/badges.html:64 +#: forum/skins/default/templates/badges.html:64 msgid "silver badge description" msgstr "" "Obtaining silver badge requires significant patience. If you have received " "one, that means you have greatly contributed to this community." -#: templates/badges.html:67 +#: forum/skins/default/templates/badges.html:67 msgid "bronze badge: often given as a special honor" msgstr "" -#: templates/badges.html:71 +#: forum/skins/default/templates/badges.html:71 msgid "bronze badge description" msgstr "" "If you are an active participant in this community, you will be recognized " "with this badge." -#: templates/book.html:7 +#: forum/skins/default/templates/book.html:7 msgid "reading channel" msgstr "" -#: templates/book.html:26 +#: forum/skins/default/templates/book.html:26 msgid "[author]" msgstr "" -#: templates/book.html:30 +#: forum/skins/default/templates/book.html:30 msgid "[publisher]" msgstr "" -#: templates/book.html:34 +#: forum/skins/default/templates/book.html:34 msgid "[publication date]" msgstr "" -#: templates/book.html:38 +#: forum/skins/default/templates/book.html:38 msgid "[price]" msgstr "" -#: templates/book.html:39 +#: forum/skins/default/templates/book.html:39 msgid "currency unit" msgstr "" -#: templates/book.html:42 +#: forum/skins/default/templates/book.html:42 msgid "[pages]" msgstr "" -#: templates/book.html:43 +#: forum/skins/default/templates/book.html:43 msgid "pages abbreviation" msgstr "" -#: templates/book.html:46 +#: forum/skins/default/templates/book.html:46 msgid "[tags]" msgstr "" -#: templates/book.html:56 +#: forum/skins/default/templates/book.html:56 msgid "author blog" msgstr "" -#: templates/book.html:62 +#: forum/skins/default/templates/book.html:62 msgid "book directory" msgstr "" -#: templates/book.html:66 +#: forum/skins/default/templates/book.html:66 msgid "buy online" msgstr "" -#: templates/book.html:79 +#: forum/skins/default/templates/book.html:79 msgid "reader questions" msgstr "" -#: templates/book.html:82 +#: forum/skins/default/templates/book.html:82 msgid "ask the author" msgstr "" -#: templates/book.html:88 templates/book.html.py:93 -#: templates/users_questions.html:18 +#: forum/skins/default/templates/book.html:88 +#: forum/skins/default/templates/book.html:93 +#: forum/skins/default/templates/users_questions.html:18 msgid "this question was selected as favorite" msgstr "" -#: templates/book.html:88 templates/book.html.py:93 -#: templates/users_questions.html:11 templates/users_questions.html.py:18 +#: forum/skins/default/templates/book.html:88 +#: forum/skins/default/templates/book.html:93 +#: forum/skins/default/templates/users_questions.html:11 +#: forum/skins/default/templates/users_questions.html:18 msgid "number of times" msgstr "" -#: templates/book.html:105 templates/index.html:49 -#: templates/question_summary_list_roll.html:14 templates/questions.html:80 -#: templates/users_questions.html:32 +#: forum/skins/default/templates/book.html:105 +#: forum/skins/default/templates/index.html:40 +#: forum/skins/default/templates/index_.html:40 +#: forum/skins/default/templates/question_summary_list_roll.html:14 +#: forum/skins/default/templates/questions.html:80 +#: forum/skins/default/templates/users_questions.html:32 msgid "votes" msgstr "" -#: templates/book.html:108 +#: forum/skins/default/templates/book.html:108 msgid "the answer has been accepted to be correct" msgstr "" -#: templates/book.html:115 templates/index.html:50 -#: templates/question_summary_list_roll.html:15 templates/questions.html:81 -#: templates/users_questions.html:40 +#: forum/skins/default/templates/book.html:115 +#: forum/skins/default/templates/index.html:48 +#: forum/skins/default/templates/index_.html:48 +#: forum/skins/default/templates/question_summary_list_roll.html:15 +#: forum/skins/default/templates/questions.html:81 +#: forum/skins/default/templates/users_questions.html:40 msgid "views" msgstr "" -#: templates/book.html:125 templates/index.html:105 -#: templates/question.html:480 templates/question_summary_list_roll.html:52 -#: templates/questions.html:136 templates/tags.html:49 -#: templates/users_questions.html:52 +#: forum/skins/default/templates/book.html:125 +#: forum/skins/default/templates/index.html:63 +#: forum/skins/default/templates/index_.html:63 +#: forum/skins/default/templates/question.html:478 +#: forum/skins/default/templates/question_summary_list_roll.html:52 +#: forum/skins/default/templates/questions.html:136 +#: forum/skins/default/templates/tags.html:49 +#: forum/skins/default/templates/users_questions.html:52 msgid "using tags" msgstr "" -#: templates/book.html:147 +#: forum/skins/default/templates/book.html:147 msgid "subscribe to book RSS feed" msgstr "" -#: templates/book.html:147 templates/index.html:156 +#: forum/skins/default/templates/book.html:147 +#: forum/skins/default/templates/index.html:114 +#: forum/skins/default/templates/index_.html:114 msgid "subscribe to the questions feed" msgstr "" -#: templates/close.html:6 templates/close.html.py:16 +#: forum/skins/default/templates/close.html:6 +#: forum/skins/default/templates/close.html:16 msgid "Close question" msgstr "" -#: templates/close.html:19 +#: forum/skins/default/templates/close.html:19 msgid "Close the question" msgstr "" -#: templates/close.html:25 +#: forum/skins/default/templates/close.html:25 msgid "Reasons" msgstr "" -#: templates/close.html:28 +#: forum/skins/default/templates/close.html:28 msgid "OK to close" msgstr "" -#: templates/faq.html:11 +#: forum/skins/default/templates/faq.html:11 msgid "Frequently Asked Questions " msgstr "" -#: templates/faq.html:16 +#: forum/skins/default/templates/faq.html:16 msgid "What kinds of questions can I ask here?" msgstr "" -#: templates/faq.html:17 +#: forum/skins/default/templates/faq.html:17 msgid "" "Most importanly - questions should be <strong>relevant</strong> to this " "community." msgstr "" -#: templates/faq.html:18 +#: forum/skins/default/templates/faq.html:18 msgid "" "Before asking the question - please make sure to use search to see whether " "your question has alredy been answered." @@ -1405,21 +1293,21 @@ msgstr "" "Before you ask - please make sure to search for a similar question. You can " "search questions by their title or tags." -#: templates/faq.html:21 +#: forum/skins/default/templates/faq.html:21 msgid "What questions should I avoid asking?" msgstr "What kinds of questions should be avoided?" -#: templates/faq.html:22 +#: forum/skins/default/templates/faq.html:22 msgid "" "Please avoid asking questions that are not relevant to this community, too " "subjective and argumentative." msgstr "" -#: templates/faq.html:27 +#: forum/skins/default/templates/faq.html:27 msgid "What should I avoid in my answers?" msgstr "" -#: templates/faq.html:28 +#: forum/skins/default/templates/faq.html:28 msgid "" "is a Q&A site, not a discussion group. Therefore - please avoid having " "discussions in your answers, comment facility allows some space for brief " @@ -1430,19 +1318,19 @@ msgstr "" "they tend to dilute the essense of questions and answers. For the brief " "discussions please use commenting facility." -#: templates/faq.html:32 +#: forum/skins/default/templates/faq.html:32 msgid "Who moderates this community?" msgstr "" -#: templates/faq.html:33 +#: forum/skins/default/templates/faq.html:33 msgid "The short answer is: <strong>you</strong>." msgstr "" -#: templates/faq.html:34 +#: forum/skins/default/templates/faq.html:34 msgid "This website is moderated by the users." msgstr "" -#: templates/faq.html:35 +#: forum/skins/default/templates/faq.html:35 msgid "" "The reputation system allows users earn the authorization to perform a " "variety of moderation tasks." @@ -1450,11 +1338,11 @@ msgstr "" "Karma system allows users to earn rights to perform a variety of moderation " "tasks" -#: templates/faq.html:40 +#: forum/skins/default/templates/faq.html:40 msgid "How does reputation system work?" msgstr "How does karma system work?" -#: templates/faq.html:41 +#: forum/skins/default/templates/faq.html:41 msgid "Rep system summary" msgstr "" "When a question or answer is upvoted, the user who posted them will gain " @@ -1462,7 +1350,7 @@ msgstr "" "rough measure of the community trust to him/her. Various moderation tasks " "are gradually assigned to the users based on those points." -#: templates/faq.html:42 +#: forum/skins/default/templates/faq.html:42 msgid "" "For example, if you ask an interesting question or give a helpful answer, " "your input will be upvoted. On the other hand if the answer is misleading - " @@ -1473,55 +1361,57 @@ msgid "" "type of moderation task." msgstr "" -#: templates/faq.html:53 templates/user_votes.html:15 +#: forum/skins/default/templates/faq.html:53 +#: forum/skins/default/templates/user_votes.html:15 msgid "upvote" msgstr "" -#: templates/faq.html:57 +#: forum/skins/default/templates/faq.html:57 msgid "use tags" msgstr "" -#: templates/faq.html:62 +#: forum/skins/default/templates/faq.html:62 msgid "add comments" msgstr "" -#: templates/faq.html:66 templates/user_votes.html:17 +#: forum/skins/default/templates/faq.html:66 +#: forum/skins/default/templates/user_votes.html:17 msgid "downvote" msgstr "" -#: templates/faq.html:69 +#: forum/skins/default/templates/faq.html:69 msgid "open and close own questions" msgstr "" -#: templates/faq.html:73 +#: forum/skins/default/templates/faq.html:73 msgid "retag questions" msgstr "" -#: templates/faq.html:78 +#: forum/skins/default/templates/faq.html:78 msgid "edit community wiki questions" msgstr "" -#: templates/faq.html:83 +#: forum/skins/default/templates/faq.html:83 msgid "edit any answer" msgstr "" -#: templates/faq.html:87 +#: forum/skins/default/templates/faq.html:87 msgid "open any closed question" msgstr "" -#: templates/faq.html:91 +#: forum/skins/default/templates/faq.html:91 msgid "delete any comment" msgstr "" -#: templates/faq.html:95 +#: forum/skins/default/templates/faq.html:95 msgid "delete any questions and answers and perform other moderation tasks" msgstr "" -#: templates/faq.html:102 +#: forum/skins/default/templates/faq.html:102 msgid "how to validate email title" msgstr "How to validate email and why?" -#: templates/faq.html:104 +#: forum/skins/default/templates/faq.html:104 #, python-format msgid "" "how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s" @@ -1539,11 +1429,11 @@ msgstr "" "Also, when you sign up for the first time - create a unique <a href='%" "(gravatar_faq_url)s'><strong>gravatar</strong></a> personal image.</p>" -#: templates/faq.html:108 +#: forum/skins/default/templates/faq.html:108 msgid "what is gravatar" msgstr "What is gravatar?" -#: templates/faq.html:109 +#: forum/skins/default/templates/faq.html:109 msgid "gravatar faq info" msgstr "" "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</" @@ -1554,44 +1444,44 @@ msgstr "" "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</" "strong></a>" -#: templates/faq.html:112 +#: forum/skins/default/templates/faq.html:112 msgid "To register, do I need to create new password?" msgstr "" -#: templates/faq.html:113 +#: forum/skins/default/templates/faq.html:113 msgid "" "No, you don't have to. You can login through any service that supports " "OpenID, e.g. Google, Yahoo, AOL, etc." msgstr "" -#: templates/faq.html:114 +#: forum/skins/default/templates/faq.html:114 msgid "Login now!" msgstr "" -#: templates/faq.html:119 +#: forum/skins/default/templates/faq.html:119 msgid "Why other people can edit my questions/answers?" msgstr "" -#: templates/faq.html:120 +#: forum/skins/default/templates/faq.html:120 msgid "Goal of this site is..." msgstr "" -#: templates/faq.html:120 +#: forum/skins/default/templates/faq.html:120 msgid "" "So questions and answers can be edited like wiki pages by experienced users " "of this site and this improves the overall quality of the knowledge base " "content." msgstr "" -#: templates/faq.html:121 +#: forum/skins/default/templates/faq.html:121 msgid "If this approach is not for you, we respect your choice." msgstr "" -#: templates/faq.html:125 +#: forum/skins/default/templates/faq.html:125 msgid "Still have questions?" msgstr "" -#: templates/faq.html:126 +#: forum/skins/default/templates/faq.html:126 #, python-format msgid "" "Please ask your question at %(ask_question_url)s, help make our community " @@ -1600,23 +1490,27 @@ msgstr "" "Please <a href='%(ask_question_url)s'>ask</a> your question, help make our " "community better!" -#: templates/faq.html:128 templates/header.html:27 templates/header.html.py:55 +#: forum/skins/default/templates/faq.html:128 +#: forum/skins/default/templates/header.html:27 +#: forum/skins/default/templates/header.html:55 msgid "questions" msgstr "" -#: templates/faq.html:128 templates/index.html:161 +#: forum/skins/default/templates/faq.html:128 +#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index_.html:121 msgid "." msgstr "" -#: templates/feedback.html:6 +#: forum/skins/default/templates/feedback.html:6 msgid "Feedback" msgstr "" -#: templates/feedback.html:11 +#: forum/skins/default/templates/feedback.html:11 msgid "Give us your feedback!" msgstr "" -#: templates/feedback.html:17 +#: forum/skins/default/templates/feedback.html:17 #, python-format msgid "" "\n" @@ -1626,7 +1520,7 @@ msgid "" " " msgstr "" -#: templates/feedback.html:24 +#: forum/skins/default/templates/feedback.html:24 msgid "" "\n" " <span class='big strong'>Dear visitor</span>, we look forward to " @@ -1635,201 +1529,249 @@ msgid "" " " msgstr "" -#: templates/feedback.html:41 +#: forum/skins/default/templates/feedback.html:41 msgid "(this field is required)" msgstr "" -#: templates/feedback.html:49 +#: forum/skins/default/templates/feedback.html:49 msgid "Send Feedback" msgstr "" -#: templates/feedback_email.txt:3 +#: forum/skins/default/templates/feedback_email.txt:3 #, python-format msgid "" "\n" "Hello, this is a %(site_title)s forum feedback message\n" msgstr "" -#: templates/feedback_email.txt:9 +#: forum/skins/default/templates/feedback_email.txt:9 msgid "Sender is" msgstr "" -#: templates/feedback_email.txt:11 templates/feedback_email.txt.py:14 +#: forum/skins/default/templates/feedback_email.txt:11 +#: forum/skins/default/templates/feedback_email.txt:14 msgid "email" msgstr "" -#: templates/feedback_email.txt:13 +#: forum/skins/default/templates/feedback_email.txt:13 msgid "anonymous" msgstr "" -#: templates/feedback_email.txt:19 +#: forum/skins/default/templates/feedback_email.txt:19 msgid "Message body:" msgstr "" -#: templates/footer.html:8 templates/header.html:13 templates/index.html:119 +#: forum/skins/default/templates/footer.html:8 +#: forum/skins/default/templates/header.html:13 +#: forum/skins/default/templates/index.html:77 +#: forum/skins/default/templates/index_.html:77 msgid "about" msgstr "" -#: templates/footer.html:9 templates/header.html:14 templates/index.html:120 -#: templates/question_edit_tips.html:17 +#: forum/skins/default/templates/footer.html:9 +#: forum/skins/default/templates/header.html:14 +#: forum/skins/default/templates/index.html:78 +#: forum/skins/default/templates/index_.html:78 +#: forum/skins/default/templates/question_edit_tips.html:17 msgid "faq" msgstr "" -#: templates/footer.html:10 +#: forum/skins/default/templates/footer.html:10 msgid "privacy policy" msgstr "" -#: templates/footer.html:19 +#: forum/skins/default/templates/footer.html:19 msgid "give feedback" msgstr "" -#: templates/header.html:9 +#: forum/skins/default/templates/header.html:9 msgid "logout" msgstr "" -#: templates/header.html:11 +#: forum/skins/default/templates/header.html:11 msgid "login" msgstr "" -#: templates/header.html:21 +#: forum/skins/default/templates/header.html:21 msgid "back to home page" msgstr "" -#: templates/header.html:29 templates/header.html.py:57 +#: forum/skins/default/templates/header.html:29 +#: forum/skins/default/templates/header.html:57 msgid "users" msgstr "" -#: templates/header.html:31 +#: forum/skins/default/templates/header.html:31 msgid "books" msgstr "" -#: templates/header.html:34 +#: forum/skins/default/templates/header.html:33 +#: forum/templatetags/extra_tags.py:165 forum/templatetags/extra_tags.py:194 +msgid "badges" +msgstr "" + +#: forum/skins/default/templates/header.html:34 msgid "unanswered questions" msgstr "unanswered" -#: templates/header.html:36 +#: forum/skins/default/templates/header.html:36 msgid "ask a question" msgstr "" -#: templates/header.html:51 +#: forum/skins/default/templates/header.html:51 msgid "search" msgstr "" -#: templates/index.html:8 +#: forum/skins/default/templates/index.html:8 +#: forum/skins/default/templates/index_.html:8 msgid "Home" msgstr "" -#: templates/index.html:25 templates/questions.html:8 +#: forum/skins/default/templates/index.html:25 +#: forum/skins/default/templates/index_.html:25 +#: forum/skins/default/templates/questions.html:8 msgid "Questions" msgstr "" -#: templates/index.html:27 +#: forum/skins/default/templates/index.html:27 +#: forum/skins/default/templates/index_.html:27 msgid "last updated questions" msgstr "" -#: templates/index.html:27 templates/questions.html:47 +#: forum/skins/default/templates/index.html:27 +#: forum/skins/default/templates/index_.html:27 +#: forum/skins/default/templates/questions.html:47 msgid "newest" msgstr "" -#: templates/index.html:28 templates/questions.html:49 +#: forum/skins/default/templates/index.html:28 +#: forum/skins/default/templates/index_.html:28 +#: forum/skins/default/templates/questions.html:49 msgid "hottest questions" msgstr "" -#: templates/index.html:28 templates/questions.html:49 +#: forum/skins/default/templates/index.html:28 +#: forum/skins/default/templates/index_.html:28 +#: forum/skins/default/templates/questions.html:49 msgid "hottest" msgstr "" -#: templates/index.html:29 templates/questions.html:50 +#: forum/skins/default/templates/index.html:29 +#: forum/skins/default/templates/index_.html:29 +#: forum/skins/default/templates/questions.html:50 msgid "most voted questions" msgstr "" -#: templates/index.html:29 templates/questions.html:50 +#: forum/skins/default/templates/index.html:29 +#: forum/skins/default/templates/index_.html:29 +#: forum/skins/default/templates/questions.html:50 msgid "most voted" msgstr "" -#: templates/index.html:30 +#: forum/skins/default/templates/index.html:30 +#: forum/skins/default/templates/index_.html:30 msgid "all questions" msgstr "" -#: templates/index.html:48 templates/question_summary_list_roll.html:13 -#: templates/questions.html:79 templates/users_questions.html:36 -msgid "answers" -msgstr "" - -#: templates/index.html:80 templates/index.html.py:94 -#: templates/questions.html:111 templates/questions.html.py:125 -msgid "Posted:" +#: forum/skins/default/templates/index.html:42 +#: forum/skins/default/templates/index_.html:42 +#: forum/skins/default/templates/users_questions.html:34 +msgid "this answer has been accepted to be correct" msgstr "" -#: templates/index.html:83 templates/index.html.py:88 -#: templates/questions.html:114 templates/questions.html.py:119 -msgid "Updated:" +#: forum/skins/default/templates/index.html:44 +#: forum/skins/default/templates/index_.html:44 +#: forum/skins/default/templates/question_summary_list_roll.html:13 +#: forum/skins/default/templates/questions.html:79 +#: forum/skins/default/templates/users_questions.html:36 +msgid "answers" msgstr "" -#: templates/index.html:105 templates/question.html:480 -#: templates/question_summary_list_roll.html:52 templates/questions.html:136 -#: templates/tags.html:49 templates/users_questions.html:52 +#: forum/skins/default/templates/index.html:63 +#: forum/skins/default/templates/index_.html:63 +#: forum/skins/default/templates/question.html:478 +#: forum/skins/default/templates/question_summary_list_roll.html:52 +#: forum/skins/default/templates/questions.html:136 +#: forum/skins/default/templates/tags.html:49 +#: forum/skins/default/templates/users_questions.html:52 msgid "see questions tagged" msgstr "" -#: templates/index.html:116 +#: forum/skins/default/templates/index.html:74 +#: forum/skins/default/templates/index_.html:74 msgid "welcome to website" msgstr "Welcome to Q&A forum" -#: templates/index.html:127 +#: forum/skins/default/templates/index.html:85 +#: forum/skins/default/templates/index_.html:85 msgid "Recent tags" msgstr "" -#: templates/index.html:132 templates/question.html:135 +#: forum/skins/default/templates/index.html:90 +#: forum/skins/default/templates/index_.html:90 +#: forum/skins/default/templates/question.html:133 #, python-format msgid "see questions tagged '%(tagname)s'" msgstr "" -#: templates/index.html:135 templates/index.html.py:161 +#: forum/skins/default/templates/index.html:93 +#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index_.html:93 +#: forum/skins/default/templates/index_.html:121 msgid "popular tags" msgstr "tags" -#: templates/index.html:140 +#: forum/skins/default/templates/index.html:98 +#: forum/skins/default/templates/index_.html:98 msgid "Recent awards" msgstr "Recent badges" -#: templates/index.html:146 +#: forum/skins/default/templates/index.html:104 msgid "given to" msgstr "" -#: templates/index.html:151 +#: forum/skins/default/templates/index.html:109 +#: forum/skins/default/templates/index_.html:109 msgid "all awards" msgstr "all badges" -#: templates/index.html:156 +#: forum/skins/default/templates/index.html:114 +#: forum/skins/default/templates/index_.html:114 msgid "subscribe to last 30 questions by RSS" msgstr "" -#: templates/index.html:161 +#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index_.html:121 msgid "Still looking for more? See" msgstr "" -#: templates/index.html:161 +#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index_.html:121 msgid "complete list of questions" msgstr "list of all questions" -#: templates/index.html:161 templates/authopenid/signup.html:26 +#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index_.html:121 +#: forum/skins/default/templates/authopenid/signup.html:28 msgid "or" msgstr "" -#: templates/index.html:161 +#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index_.html:121 msgid "Please help us answer" msgstr "" -#: templates/index.html:161 +#: forum/skins/default/templates/index.html:121 +#: forum/skins/default/templates/index_.html:121 msgid "list of unanswered questions" msgstr "unanswered questions" -#: templates/logout.html:6 templates/logout.html.py:16 +#: forum/skins/default/templates/logout.html:6 +#: forum/skins/default/templates/logout.html:16 msgid "Logout" msgstr "" -#: templates/logout.html:19 +#: forum/skins/default/templates/logout.html:19 msgid "" "As a registered user you can login with your OpenID, log out of the site or " "permanently remove your account." @@ -1838,43 +1780,46 @@ msgstr "" "sign you off from your OpenID provider.</p><p>If you wish to sign off " "completely - please make sure to log out from your OpenID provider as well." -#: templates/logout.html:20 +#: forum/skins/default/templates/logout.html:20 msgid "Logout now" msgstr "Logout Now" -#: templates/notarobot.html:3 +#: forum/skins/default/templates/notarobot.html:3 msgid "Please prove that you are a Human Being" msgstr "" -#: templates/notarobot.html:10 +#: forum/skins/default/templates/notarobot.html:10 msgid "I am a Human Being" msgstr "" -#: templates/pagesize.html:6 +#: forum/skins/default/templates/pagesize.html:6 msgid "posts per page" msgstr "" -#: templates/paginator.html:6 templates/paginator.html.py:7 +#: forum/skins/default/templates/paginator.html:6 +#: forum/skins/default/templates/paginator.html:7 msgid "previous" msgstr "" -#: templates/paginator.html:19 +#: forum/skins/default/templates/paginator.html:19 msgid "current page" msgstr "" -#: templates/paginator.html:22 templates/paginator.html.py:29 +#: forum/skins/default/templates/paginator.html:22 +#: forum/skins/default/templates/paginator.html:29 msgid "page number " msgstr "" -#: templates/paginator.html:22 templates/paginator.html.py:29 +#: forum/skins/default/templates/paginator.html:22 +#: forum/skins/default/templates/paginator.html:29 msgid "number - make blank in english" msgstr "" -#: templates/paginator.html:33 +#: forum/skins/default/templates/paginator.html:33 msgid "next page" msgstr "" -#: templates/post_contributor_info.html:9 +#: forum/skins/default/templates/post_contributor_info.html:9 #, python-format msgid "" "\n" @@ -1887,141 +1832,156 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/post_contributor_info.html:19 +#: forum/skins/default/templates/post_contributor_info.html:19 msgid "asked" msgstr "" -#: templates/post_contributor_info.html:22 +#: forum/skins/default/templates/post_contributor_info.html:22 msgid "answered" msgstr "" -#: templates/post_contributor_info.html:24 +#: forum/skins/default/templates/post_contributor_info.html:24 msgid "posted" msgstr "" -#: templates/post_contributor_info.html:45 +#: forum/skins/default/templates/post_contributor_info.html:45 msgid "updated" msgstr "" -#: templates/privacy.html:6 templates/privacy.html.py:11 +#: forum/skins/default/templates/privacy.html:6 +#: forum/skins/default/templates/privacy.html:11 msgid "Privacy policy" msgstr "" -#: templates/privacy.html:15 +#: forum/skins/default/templates/privacy.html:15 msgid "general message about privacy" msgstr "" "Respecting users privacy is an important core principle of this Q&A " "forum. Information on this page details how this forum protects your " "privacy, and what type of information is collected." -#: templates/privacy.html:18 +#: forum/skins/default/templates/privacy.html:18 msgid "Site Visitors" msgstr "" -#: templates/privacy.html:20 +#: forum/skins/default/templates/privacy.html:20 msgid "what technical information is collected about visitors" msgstr "" "Information on question views, revisions of questions and answers - both " "times and content are recorded for each user in order to correctly count " "number of views, maintain data integrity and report relevant updates." -#: templates/privacy.html:23 +#: forum/skins/default/templates/privacy.html:23 msgid "Personal Information" msgstr "" -#: templates/privacy.html:25 +#: forum/skins/default/templates/privacy.html:25 msgid "details on personal information policies" msgstr "" "Members of this community may choose to display personally identifiable " "information in their profiles. Forum will never display such information " "without a request from the user." -#: templates/privacy.html:28 +#: forum/skins/default/templates/privacy.html:28 msgid "Other Services" msgstr "" -#: templates/privacy.html:30 +#: forum/skins/default/templates/privacy.html:30 msgid "details on sharing data with third parties" msgstr "" "None of the data that is not openly shown on the forum by the choice of the " "user is shared with any third party." -#: templates/privacy.html:35 +#: forum/skins/default/templates/privacy.html:35 msgid "cookie policy details" msgstr "" "Forum software relies on the internet cookie technology to keep track of " "user sessions. Cookies must be enabled in your browser so that forum can " "work for you." -#: templates/privacy.html:37 +#: forum/skins/default/templates/privacy.html:37 msgid "Policy Changes" msgstr "" -#: templates/privacy.html:38 +#: forum/skins/default/templates/privacy.html:38 msgid "how privacy policies can be changed" msgstr "" "These policies may be adjusted to improve protection of user's privacy. " "Whenever such changes occur, users will be notified via the internal " "messaging system. " -#: templates/question.html:77 templates/question.html.py:78 -#: templates/question.html:94 templates/question.html.py:96 +#: forum/skins/default/templates/question.html:77 +#: forum/skins/default/templates/question.html:78 +#: forum/skins/default/templates/question.html:94 +#: forum/skins/default/templates/question.html:96 msgid "i like this post (click again to cancel)" msgstr "" -#: templates/question.html:80 templates/question.html.py:98 -#: templates/question.html:257 +#: forum/skins/default/templates/question.html:80 +#: forum/skins/default/templates/question.html:98 +#: forum/skins/default/templates/question.html:255 msgid "current number of votes" msgstr "" -#: templates/question.html:89 templates/question.html.py:90 -#: templates/question.html:103 templates/question.html.py:104 +#: forum/skins/default/templates/question.html:89 +#: forum/skins/default/templates/question.html:90 +#: forum/skins/default/templates/question.html:103 +#: forum/skins/default/templates/question.html:104 msgid "i dont like this post (click again to cancel)" msgstr "" -#: templates/question.html:109 templates/question.html.py:110 +#: forum/skins/default/templates/question.html:108 +#: forum/skins/default/templates/question.html:109 msgid "mark this question as favorite (click again to cancel)" msgstr "" -#: templates/question.html:116 templates/question.html.py:117 +#: forum/skins/default/templates/question.html:115 +#: forum/skins/default/templates/question.html:116 msgid "remove favorite mark from this question (click again to restore mark)" msgstr "" -#: templates/question.html:140 templates/question.html.py:294 -#: templates/revisions_answer.html:58 templates/revisions_question.html:58 +#: forum/skins/default/templates/question.html:138 +#: forum/skins/default/templates/question.html:292 +#: forum/skins/default/templates/revisions_answer.html:58 +#: forum/skins/default/templates/revisions_question.html:58 msgid "edit" msgstr "" -#: templates/question.html:145 +#: forum/skins/default/templates/question.html:143 msgid "reopen" msgstr "" -#: templates/question.html:149 +#: forum/skins/default/templates/question.html:147 msgid "close" msgstr "" -#: templates/question.html:155 templates/question.html.py:299 +#: forum/skins/default/templates/question.html:153 +#: forum/skins/default/templates/question.html:297 msgid "" "report as offensive (i.e containing spam, advertising, malicious text, etc.)" msgstr "" -#: templates/question.html:156 templates/question.html.py:300 +#: forum/skins/default/templates/question.html:154 +#: forum/skins/default/templates/question.html:298 msgid "flag offensive" msgstr "" -#: templates/question.html:164 templates/question.html.py:311 +#: forum/skins/default/templates/question.html:162 +#: forum/skins/default/templates/question.html:309 msgid "delete" msgstr "" -#: templates/question.html:182 templates/question.html.py:331 +#: forum/skins/default/templates/question.html:180 +#: forum/skins/default/templates/question.html:329 msgid "delete this comment" msgstr "" -#: templates/question.html:193 templates/question.html.py:342 +#: forum/skins/default/templates/question.html:191 +#: forum/skins/default/templates/question.html:340 msgid "add comment" msgstr "post a comment" -#: templates/question.html:197 +#: forum/skins/default/templates/question.html:195 #, python-format msgid "" "\n" @@ -2035,7 +1995,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/question.html:203 +#: forum/skins/default/templates/question.html:201 #, python-format msgid "" "\n" @@ -2050,18 +2010,18 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/question.html:219 +#: forum/skins/default/templates/question.html:217 #, python-format msgid "" "The question has been closed for the following reason \"%(close_reason)s\" by" msgstr "" -#: templates/question.html:221 +#: forum/skins/default/templates/question.html:219 #, python-format msgid "close date %(closed_at)s" msgstr "" -#: templates/question.html:229 +#: forum/skins/default/templates/question.html:227 #, python-format msgid "" "\n" @@ -2074,59 +2034,63 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/question.html:237 +#: forum/skins/default/templates/question.html:235 msgid "oldest answers will be shown first" msgstr "" -#: templates/question.html:237 +#: forum/skins/default/templates/question.html:235 msgid "oldest answers" msgstr "oldest" -#: templates/question.html:239 +#: forum/skins/default/templates/question.html:237 msgid "newest answers will be shown first" msgstr "" -#: templates/question.html:239 +#: forum/skins/default/templates/question.html:237 msgid "newest answers" msgstr "newest" -#: templates/question.html:241 +#: forum/skins/default/templates/question.html:239 msgid "most voted answers will be shown first" msgstr "" -#: templates/question.html:241 +#: forum/skins/default/templates/question.html:239 msgid "popular answers" msgstr "most voted" -#: templates/question.html:255 templates/question.html.py:256 +#: forum/skins/default/templates/question.html:253 +#: forum/skins/default/templates/question.html:254 msgid "i like this answer (click again to cancel)" msgstr "" -#: templates/question.html:262 templates/question.html.py:263 +#: forum/skins/default/templates/question.html:260 +#: forum/skins/default/templates/question.html:261 msgid "i dont like this answer (click again to cancel)" msgstr "" -#: templates/question.html:268 templates/question.html.py:269 +#: forum/skins/default/templates/question.html:266 +#: forum/skins/default/templates/question.html:267 msgid "mark this answer as favorite (click again to undo)" msgstr "" -#: templates/question.html:274 templates/question.html.py:275 +#: forum/skins/default/templates/question.html:272 +#: forum/skins/default/templates/question.html:273 msgid "the author of the question has selected this answer as correct" msgstr "" -#: templates/question.html:288 +#: forum/skins/default/templates/question.html:286 msgid "answer permanent link" msgstr "" -#: templates/question.html:289 +#: forum/skins/default/templates/question.html:287 msgid "permanent link" msgstr "link" -#: templates/question.html:311 +#: forum/skins/default/templates/question.html:309 msgid "undelete" msgstr "" -#: templates/question.html:346 +#: forum/skins/default/templates/question.html:344 #, python-format msgid "" "\n" @@ -2141,7 +2105,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/question.html:352 +#: forum/skins/default/templates/question.html:350 #, python-format msgid "" "\n" @@ -2156,18 +2120,19 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/question.html:378 templates/question.html.py:381 +#: forum/skins/default/templates/question.html:376 +#: forum/skins/default/templates/question.html:379 msgid "Notify me once a day when there are any new answers" msgstr "" "<strong>Notify me</strong> once a day by email when there are any new " "answers or updates" -#: templates/question.html:384 +#: forum/skins/default/templates/question.html:382 msgid "Notify me weekly when there are any new answers" msgstr "" "<strong>Notify me</strong> weekly when there are any new answers or updates" -#: templates/question.html:389 +#: forum/skins/default/templates/question.html:387 #, python-format msgid "" "\n" @@ -2179,21 +2144,21 @@ msgstr "" "(note: you can always <a href='%(profile_url)s?" "sort=email_subscriptions'>adjust frequency</a> of email updates)" -#: templates/question.html:396 +#: forum/skins/default/templates/question.html:394 msgid "once you sign in you will be able to subscribe for any updates here" msgstr "" "<span class='strong'>Here</span> (once you log in) you will be able to sign " "up for the periodic email updates about this question." -#: templates/question.html:407 +#: forum/skins/default/templates/question.html:405 msgid "Your answer" msgstr "" -#: templates/question.html:409 +#: forum/skins/default/templates/question.html:407 msgid "Be the first one to answer this question!" msgstr "" -#: templates/question.html:415 +#: forum/skins/default/templates/question.html:413 msgid "you can answer anonymously and then login" msgstr "" "<span class='strong big'>Please start posting your answer anonymously</span> " @@ -2202,7 +2167,7 @@ msgstr "" "answer</strong>, for discussions, <strong>please use comments</strong> and " "<strong>please do remember to vote</strong> (after you log in)!" -#: templates/question.html:419 +#: forum/skins/default/templates/question.html:417 msgid "answer your own question only to give an answer" msgstr "" "<span class='big strong'>You are welcome to answer your own question</span>, " @@ -2212,7 +2177,7 @@ msgstr "" "forget to vote :)</strong> for the answers that you liked (or perhaps did " "not like)! " -#: templates/question.html:421 +#: forum/skins/default/templates/question.html:419 msgid "please only give an answer, no discussions" msgstr "" "<span class='big strong'>Please try to give a substantial answer</span>. If " @@ -2222,123 +2187,135 @@ msgstr "" "please <strong>don't forget to vote</strong> - it really helps to select the " "best questions and answers!" -#: templates/question.html:457 +#: forum/skins/default/templates/question.html:455 msgid "Login/Signup to Post Your Answer" msgstr "" -#: templates/question.html:460 +#: forum/skins/default/templates/question.html:458 msgid "Answer Your Own Question" msgstr "" -#: templates/question.html:462 +#: forum/skins/default/templates/question.html:460 msgid "Answer the question" msgstr "Post Your Answer" -#: templates/question.html:475 +#: forum/skins/default/templates/question.html:473 msgid "Question tags" msgstr "Tags" -#: templates/question.html:485 +#: forum/skins/default/templates/question.html:483 msgid "question asked" msgstr "Asked" -#: templates/question.html:488 +#: forum/skins/default/templates/question.html:486 msgid "question was seen" msgstr "Seen" -#: templates/question.html:488 +#: forum/skins/default/templates/question.html:486 msgid "times" msgstr "" -#: templates/question.html:491 +#: forum/skins/default/templates/question.html:489 msgid "last updated" msgstr "Last updated" -#: templates/question.html:496 +#: forum/skins/default/templates/question.html:494 msgid "Related questions" msgstr "" -#: templates/question_edit.html:5 templates/question_edit.html.py:66 +#: forum/skins/default/templates/question_edit.html:5 +#: forum/skins/default/templates/question_edit.html:66 msgid "Edit question" msgstr "" -#: templates/question_edit_tips.html:4 +#: forum/skins/default/templates/question_edit_tips.html:4 msgid "question tips" msgstr "Tips" -#: templates/question_edit_tips.html:7 +#: forum/skins/default/templates/question_edit_tips.html:7 msgid "please ask a relevant question" msgstr "ask a question relevant to the CNPROG community" -#: templates/question_edit_tips.html:10 +#: forum/skins/default/templates/question_edit_tips.html:10 msgid "please try provide enough details" msgstr "provide enough details" -#: templates/question_retag.html:4 templates/question_retag.html.py:53 +#: forum/skins/default/templates/question_retag.html:4 +#: forum/skins/default/templates/question_retag.html:53 msgid "Change tags" msgstr "" -#: templates/question_retag.html:40 +#: forum/skins/default/templates/question_retag.html:40 msgid "up to 5 tags, less than 20 characters each" msgstr "" -#: templates/question_retag.html:83 +#: forum/skins/default/templates/question_retag.html:83 msgid "Why use and modify tags?" msgstr "" -#: templates/question_retag.html:86 +#: forum/skins/default/templates/question_retag.html:86 msgid "tags help us keep Questions organized" msgstr "" -#: templates/question_retag.html:94 +#: forum/skins/default/templates/question_retag.html:94 msgid "tag editors receive special awards from the community" msgstr "" -#: templates/questions.html:29 +#: forum/skins/default/templates/questions.html:29 msgid "Found by tags" msgstr "Tagged questions" -#: templates/questions.html:33 +#: forum/skins/default/templates/questions.html:33 msgid "Search results" msgstr "" -#: templates/questions.html:35 +#: forum/skins/default/templates/questions.html:35 msgid "Found by title" msgstr "" -#: templates/questions.html:39 +#: forum/skins/default/templates/questions.html:39 msgid "Unanswered questions" msgstr "" -#: templates/questions.html:41 +#: forum/skins/default/templates/questions.html:41 msgid "All questions" msgstr "" -#: templates/questions.html:47 +#: forum/skins/default/templates/questions.html:47 msgid "most recently asked questions" msgstr "" -#: templates/questions.html:48 +#: forum/skins/default/templates/questions.html:48 msgid "most recently updated questions" msgstr "" -#: templates/questions.html:48 +#: forum/skins/default/templates/questions.html:48 msgid "active" msgstr "" -#: templates/questions.html:144 +#: forum/skins/default/templates/questions.html:111 +#: forum/skins/default/templates/questions.html:125 +msgid "Posted:" +msgstr "" + +#: forum/skins/default/templates/questions.html:114 +#: forum/skins/default/templates/questions.html:119 +msgid "Updated:" +msgstr "" + +#: forum/skins/default/templates/questions.html:144 msgid "Did not find anything?" msgstr "" -#: templates/questions.html:147 +#: forum/skins/default/templates/questions.html:147 msgid "Did not find what you were looking for?" msgstr "" -#: templates/questions.html:149 +#: forum/skins/default/templates/questions.html:149 msgid "Please, post your question!" msgstr "" -#: templates/questions.html:163 +#: forum/skins/default/templates/questions.html:163 #, python-format msgid "" "\n" @@ -2357,7 +2334,7 @@ msgstr[1] "" "<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div " "class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>" -#: templates/questions.html:171 +#: forum/skins/default/templates/questions.html:171 #, python-format msgid "" "\n" @@ -2378,7 +2355,7 @@ msgstr[1] "" "<div class=\"questions-count\">%(q_num)s</div><p>questions containing " "<strong><span class=\"darkred\">%(searchtitle)s</span></strong></p>" -#: templates/questions.html:177 +#: forum/skins/default/templates/questions.html:177 #, python-format msgid "" "\n" @@ -2401,7 +2378,7 @@ msgstr[1] "" "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></" "p>" -#: templates/questions.html:185 +#: forum/skins/default/templates/questions.html:185 #, python-format msgid "" "\n" @@ -2420,7 +2397,7 @@ msgstr[1] "" "<div class=\"questions-count\">%(q_num)s</div><p>questions without an " "accepted answer</p>" -#: templates/questions.html:191 +#: forum/skins/default/templates/questions.html:191 #, python-format msgid "" "\n" @@ -2437,173 +2414,182 @@ msgstr[1] "" "\n" "<div class=\"questions-count\">%(q_num)s</div><p>questions<p>" -#: templates/questions.html:201 +#: forum/skins/default/templates/questions.html:201 msgid "latest questions info" msgstr "<strong>Newest</strong> questions are shown first." -#: templates/questions.html:205 +#: forum/skins/default/templates/questions.html:205 msgid "Questions are sorted by the <strong>time of last update</strong>." msgstr "" -#: templates/questions.html:206 +#: forum/skins/default/templates/questions.html:206 msgid "Most recently answered ones are shown first." msgstr "<strong>Most recently answered</strong> questions are shown first." -#: templates/questions.html:210 +#: forum/skins/default/templates/questions.html:210 msgid "Questions sorted by <strong>number of responses</strong>." msgstr "Questions sorted by the <strong>number of answers</strong>." -#: templates/questions.html:211 +#: forum/skins/default/templates/questions.html:211 msgid "Most answered questions are shown first." msgstr " " -#: templates/questions.html:215 +#: forum/skins/default/templates/questions.html:215 msgid "Questions are sorted by the <strong>number of votes</strong>." msgstr "" -#: templates/questions.html:216 +#: forum/skins/default/templates/questions.html:216 msgid "Most voted questions are shown first." msgstr "" -#: templates/questions.html:224 +#: forum/skins/default/templates/questions.html:224 msgid "Related tags" msgstr "Tags" -#: templates/questions.html:227 templates/tag_selector.html:10 -#: templates/tag_selector.html.py:27 +#: forum/skins/default/templates/questions.html:227 +#: forum/skins/default/templates/tag_selector.html:10 +#: forum/skins/default/templates/tag_selector.html:27 #, python-format msgid "see questions tagged '%(tag_name)s'" msgstr "" -#: templates/reopen.html:6 templates/reopen.html.py:16 +#: forum/skins/default/templates/reopen.html:6 +#: forum/skins/default/templates/reopen.html:16 msgid "Reopen question" msgstr "" -#: templates/reopen.html:19 +#: forum/skins/default/templates/reopen.html:19 msgid "Open the previously closed question" msgstr "" -#: templates/reopen.html:22 +#: forum/skins/default/templates/reopen.html:22 msgid "The question was closed for the following reason " msgstr "" -#: templates/reopen.html:22 +#: forum/skins/default/templates/reopen.html:22 msgid "reason - leave blank in english" msgstr "" -#: templates/reopen.html:22 +#: forum/skins/default/templates/reopen.html:22 msgid "on " msgstr "" -#: templates/reopen.html:22 +#: forum/skins/default/templates/reopen.html:22 msgid "date closed" msgstr "" -#: templates/reopen.html:29 +#: forum/skins/default/templates/reopen.html:29 msgid "Reopen this question" msgstr "" -#: templates/revisions_answer.html:7 templates/revisions_answer.html.py:38 -#: templates/revisions_question.html:8 templates/revisions_question.html:38 +#: forum/skins/default/templates/revisions_answer.html:7 +#: forum/skins/default/templates/revisions_answer.html:38 +#: forum/skins/default/templates/revisions_question.html:8 +#: forum/skins/default/templates/revisions_question.html:38 msgid "Revision history" msgstr "" -#: templates/revisions_answer.html:50 templates/revisions_question.html:50 +#: forum/skins/default/templates/revisions_answer.html:50 +#: forum/skins/default/templates/revisions_question.html:50 msgid "click to hide/show revision" msgstr "" -#: templates/tag_selector.html:4 +#: forum/skins/default/templates/tag_selector.html:4 msgid "Interesting tags" msgstr "" -#: templates/tag_selector.html:14 +#: forum/skins/default/templates/tag_selector.html:14 #, python-format msgid "remove '%(tag_name)s' from the list of interesting tags" msgstr "" -#: templates/tag_selector.html:20 templates/tag_selector.html.py:37 +#: forum/skins/default/templates/tag_selector.html:20 +#: forum/skins/default/templates/tag_selector.html:37 msgid "Add" msgstr "" -#: templates/tag_selector.html:21 +#: forum/skins/default/templates/tag_selector.html:21 msgid "Ignored tags" msgstr "" -#: templates/tag_selector.html:31 +#: forum/skins/default/templates/tag_selector.html:31 #, python-format msgid "remove '%(tag_name)s' from the list of ignored tags" msgstr "" -#: templates/tag_selector.html:40 +#: forum/skins/default/templates/tag_selector.html:40 msgid "keep ingored questions hidden" msgstr "" -#: templates/tags.html:6 templates/tags.html.py:30 +#: forum/skins/default/templates/tags.html:6 +#: forum/skins/default/templates/tags.html:30 msgid "Tag list" msgstr "" -#: templates/tags.html:32 +#: forum/skins/default/templates/tags.html:32 msgid "sorted alphabetically" msgstr "" -#: templates/tags.html:32 +#: forum/skins/default/templates/tags.html:32 msgid "by name" msgstr "" -#: templates/tags.html:33 +#: forum/skins/default/templates/tags.html:33 msgid "sorted by frequency of tag use" msgstr "" -#: templates/tags.html:33 +#: forum/skins/default/templates/tags.html:33 msgid "by popularity" msgstr "" -#: templates/tags.html:39 +#: forum/skins/default/templates/tags.html:39 msgid "All tags matching query" msgstr "" -#: templates/tags.html:39 +#: forum/skins/default/templates/tags.html:39 msgid "all tags - make this empty in english" msgstr "" -#: templates/tags.html:42 +#: forum/skins/default/templates/tags.html:42 msgid "Nothing found" msgstr "" -#: templates/user_edit.html:6 +#: forum/skins/default/templates/user_edit.html:6 msgid "Edit user profile" msgstr "" -#: templates/user_edit.html:19 +#: forum/skins/default/templates/user_edit.html:19 msgid "edit profile" msgstr "" -#: templates/user_edit.html:31 +#: forum/skins/default/templates/user_edit.html:31 msgid "image associated with your email address" msgstr "" -#: templates/user_edit.html:31 +#: forum/skins/default/templates/user_edit.html:31 #, python-format msgid "avatar, see %(gravatar_faq_url)s" msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>" -#: templates/user_edit.html:36 templates/user_info.html:56 +#: forum/skins/default/templates/user_edit.html:36 +#: forum/skins/default/templates/user_info.html:56 msgid "Registered user" msgstr "" -#: templates/user_edit.html:43 +#: forum/skins/default/templates/user_edit.html:43 msgid "Screen Name" msgstr "" -#: templates/user_edit.html:86 templates/user_email_subscriptions.html:20 +#: forum/skins/default/templates/user_edit.html:86 +#: forum/skins/default/templates/user_email_subscriptions.html:20 msgid "Update" msgstr "" -#: templates/user_email_subscriptions.html:8 +#: forum/skins/default/templates/user_email_subscriptions.html:8 msgid "Email subscription settings" msgstr "" -#: templates/user_email_subscriptions.html:9 +#: forum/skins/default/templates/user_email_subscriptions.html:9 msgid "email subscription settings info" msgstr "" "<span class='big strong'>Adjust frequency of email updates.</span> Receive " @@ -2612,55 +2598,60 @@ msgstr "" "receive emails - select 'no email' on all items below.<br/>Updates are only " "sent when there is any new activity on selected items." -#: templates/user_email_subscriptions.html:21 +#: forum/skins/default/templates/user_email_subscriptions.html:21 msgid "Stop sending email" msgstr "Stop Email" -#: templates/user_info.html:32 +#: forum/skins/default/templates/user_info.html:22 +#: forum/skins/default/templates/users.html:26 forum/views/users.py:907 +msgid "reputation" +msgstr "karma" + +#: forum/skins/default/templates/user_info.html:32 msgid "Moderate this user" msgstr "" -#: templates/user_info.html:45 +#: forum/skins/default/templates/user_info.html:45 msgid "update profile" msgstr "" -#: templates/user_info.html:60 +#: forum/skins/default/templates/user_info.html:60 msgid "real name" msgstr "" -#: templates/user_info.html:65 +#: forum/skins/default/templates/user_info.html:65 msgid "member for" msgstr "member since" -#: templates/user_info.html:70 +#: forum/skins/default/templates/user_info.html:70 msgid "last seen" msgstr "" -#: templates/user_info.html:76 +#: forum/skins/default/templates/user_info.html:76 msgid "user website" msgstr "" -#: templates/user_info.html:82 +#: forum/skins/default/templates/user_info.html:82 msgid "location" msgstr "" -#: templates/user_info.html:89 +#: forum/skins/default/templates/user_info.html:89 msgid "age" msgstr "" -#: templates/user_info.html:90 +#: forum/skins/default/templates/user_info.html:90 msgid "age unit" msgstr "years old" -#: templates/user_info.html:96 +#: forum/skins/default/templates/user_info.html:96 msgid "todays unused votes" msgstr "" -#: templates/user_info.html:97 +#: forum/skins/default/templates/user_info.html:97 msgid "votes left" msgstr "" -#: templates/user_stats.html:12 +#: forum/skins/default/templates/user_stats.html:12 #, python-format msgid "" "\n" @@ -2673,7 +2664,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/user_stats.html:23 +#: forum/skins/default/templates/user_stats.html:23 #, python-format msgid "" "\n" @@ -2686,16 +2677,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/user_stats.html:36 +#: forum/skins/default/templates/user_stats.html:36 #, python-format msgid "the answer has been voted for %(vote_count)s times" msgstr "" -#: templates/user_stats.html:36 +#: forum/skins/default/templates/user_stats.html:36 msgid "this answer has been selected as correct" msgstr "" -#: templates/user_stats.html:46 +#: forum/skins/default/templates/user_stats.html:46 #, python-format msgid "" "\n" @@ -2712,7 +2703,7 @@ msgstr[1] "" "\n" "(%(comment_count)s comments)" -#: templates/user_stats.html:61 +#: forum/skins/default/templates/user_stats.html:61 #, python-format msgid "" "\n" @@ -2725,23 +2716,23 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/user_stats.html:72 +#: forum/skins/default/templates/user_stats.html:72 msgid "thumb up" msgstr "" -#: templates/user_stats.html:73 +#: forum/skins/default/templates/user_stats.html:73 msgid "user has voted up this many times" msgstr "" -#: templates/user_stats.html:77 +#: forum/skins/default/templates/user_stats.html:77 msgid "thumb down" msgstr "" -#: templates/user_stats.html:78 +#: forum/skins/default/templates/user_stats.html:78 msgid "user voted down this many times" msgstr "" -#: templates/user_stats.html:87 +#: forum/skins/default/templates/user_stats.html:87 #, python-format msgid "" "\n" @@ -2754,13 +2745,13 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/user_stats.html:100 +#: forum/skins/default/templates/user_stats.html:100 #, python-format msgid "" "see other questions with %(view_user)s's contributions tagged '%(tag_name)s' " msgstr "" -#: templates/user_stats.html:115 +#: forum/skins/default/templates/user_stats.html:115 #, python-format msgid "" "\n" @@ -2773,78 +2764,107 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/user_tabs.html:7 +#: forum/skins/default/templates/user_tabs.html:7 msgid "User profile" msgstr "" -#: templates/user_tabs.html:16 +#: forum/skins/default/templates/user_tabs.html:7 forum/views/users.py:881 +msgid "overview" +msgstr "" + +#: forum/skins/default/templates/user_tabs.html:9 forum/views/users.py:889 +msgid "recent activity" +msgstr "" + +#: forum/skins/default/templates/user_tabs.html:12 forum/views/users.py:899 +msgid "comments and answers to others questions" +msgstr "" + +#: forum/skins/default/templates/user_tabs.html:13 forum/views/users.py:898 +msgid "responses" +msgstr "" + +#: forum/skins/default/templates/user_tabs.html:16 msgid "graph of user reputation" msgstr "Graph of user karma" -#: templates/user_tabs.html:17 +#: forum/skins/default/templates/user_tabs.html:17 msgid "reputation history" msgstr "karma history" -#: templates/user_tabs.html:23 +#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:925 +msgid "user vote record" +msgstr "" + +#: forum/skins/default/templates/user_tabs.html:20 forum/views/users.py:924 +msgid "casted votes" +msgstr "votes" + +#: forum/skins/default/templates/user_tabs.html:23 msgid "questions that user selected as his/her favorite" msgstr "" -#: templates/user_tabs.html:24 +#: forum/skins/default/templates/user_tabs.html:24 msgid "favorites" msgstr "" -#: templates/users.html:6 templates/users.html.py:24 +#: forum/skins/default/templates/user_tabs.html:27 forum/views/users.py:934 +msgid "email subscription settings" +msgstr "" + +#: forum/skins/default/templates/user_tabs.html:28 forum/views/users.py:933 +msgid "email subscriptions" +msgstr "" + +#: forum/skins/default/templates/users.html:6 +#: forum/skins/default/templates/users.html:24 msgid "Users" msgstr "" -#: templates/users.html:27 +#: forum/skins/default/templates/users.html:27 msgid "recent" msgstr "" -#: templates/users.html:28 +#: forum/skins/default/templates/users.html:28 msgid "oldest" msgstr "" -#: templates/users.html:29 +#: forum/skins/default/templates/users.html:29 msgid "by username" msgstr "" -#: templates/users.html:35 +#: forum/skins/default/templates/users.html:35 #, python-format msgid "users matching query %(suser)s:" msgstr "" -#: templates/users.html:39 +#: forum/skins/default/templates/users.html:39 msgid "Nothing found." msgstr "" -#: templates/users_questions.html:11 +#: forum/skins/default/templates/users_questions.html:11 msgid "this questions was selected as favorite" msgstr "" -#: templates/users_questions.html:12 +#: forum/skins/default/templates/users_questions.html:12 msgid "thumb-up on" msgstr "" -#: templates/users_questions.html:19 +#: forum/skins/default/templates/users_questions.html:19 msgid "thumb-up off" msgstr "" -#: templates/users_questions.html:34 -msgid "this answer has been accepted to be correct" -msgstr "" - -#: templates/authopenid/changeemail.html:3 -#: templates/authopenid/changeemail.html:9 -#: templates/authopenid/changeemail.html:38 +#: forum/skins/default/templates/authopenid/changeemail.html:3 +#: forum/skins/default/templates/authopenid/changeemail.html:9 +#: forum/skins/default/templates/authopenid/changeemail.html:38 msgid "Change email" msgstr "Change Email" -#: templates/authopenid/changeemail.html:11 +#: forum/skins/default/templates/authopenid/changeemail.html:11 msgid "Save your email address" msgstr "" -#: templates/authopenid/changeemail.html:16 +#: forum/skins/default/templates/authopenid/changeemail.html:16 #, python-format msgid "change %(email)s info" msgstr "" @@ -2852,7 +2872,7 @@ msgstr "" "you'd like to use another email for <strong>update subscriptions</strong>." "<br>Currently you are using <strong>%(email)s</strong>" -#: templates/authopenid/changeemail.html:18 +#: forum/skins/default/templates/authopenid/changeemail.html:18 #, python-format msgid "here is why email is required, see %(gravatar_faq_url)s" msgstr "" @@ -2863,26 +2883,26 @@ msgstr "" "(gravatar_faq_url)s'><strong>gravatar</strong></a> image for your account. " "Email addresses are never shown or otherwise shared with anybody else." -#: templates/authopenid/changeemail.html:31 +#: forum/skins/default/templates/authopenid/changeemail.html:31 msgid "Your new Email" msgstr "" "<strong>Your new Email:</strong> (will <strong>not</strong> be shown to " "anyone, must be valid)" -#: templates/authopenid/changeemail.html:31 +#: forum/skins/default/templates/authopenid/changeemail.html:31 msgid "Your Email" msgstr "" "<strong>Your Email</strong> (<i>must be valid, never shown to others</i>)" -#: templates/authopenid/changeemail.html:38 +#: forum/skins/default/templates/authopenid/changeemail.html:38 msgid "Save Email" msgstr "" -#: templates/authopenid/changeemail.html:49 +#: forum/skins/default/templates/authopenid/changeemail.html:49 msgid "Validate email" msgstr "" -#: templates/authopenid/changeemail.html:52 +#: forum/skins/default/templates/authopenid/changeemail.html:52 #, python-format msgid "validate %(email)s info or go to %(change_email_url)s" msgstr "" @@ -2893,11 +2913,11 @@ msgstr "" "<strong>another email</strong>, please <a href='%(change_email_url)" "s'><strong>change it again</strong></a>." -#: templates/authopenid/changeemail.html:57 +#: forum/skins/default/templates/authopenid/changeemail.html:57 msgid "Email not changed" msgstr "" -#: templates/authopenid/changeemail.html:60 +#: forum/skins/default/templates/authopenid/changeemail.html:60 #, python-format msgid "old %(email)s kept, if you like go to %(change_email_url)s" msgstr "" @@ -2906,11 +2926,11 @@ msgstr "" "it in your user profile or by using the <a href='%(change_email_url)" "s'><strong>previous form</strong></a> again." -#: templates/authopenid/changeemail.html:65 +#: forum/skins/default/templates/authopenid/changeemail.html:65 msgid "Email changed" msgstr "" -#: templates/authopenid/changeemail.html:68 +#: forum/skins/default/templates/authopenid/changeemail.html:68 #, python-format msgid "your current %(email)s can be used for this" msgstr "" @@ -2919,11 +2939,11 @@ msgstr "" "Email notifications are sent once a day or less frequently - only when there " "are any news." -#: templates/authopenid/changeemail.html:73 +#: forum/skins/default/templates/authopenid/changeemail.html:73 msgid "Email verified" msgstr "" -#: templates/authopenid/changeemail.html:76 +#: forum/skins/default/templates/authopenid/changeemail.html:76 msgid "thanks for verifying email" msgstr "" "<span class=\"big strong\">Thank you for verifying your email!</span> Now " @@ -2932,11 +2952,11 @@ msgstr "" "updates</strong> - then will be notified about changes <strong>once a day</" "strong> or less frequently." -#: templates/authopenid/changeemail.html:81 +#: forum/skins/default/templates/authopenid/changeemail.html:81 msgid "email key not sent" msgstr "Validation email not sent" -#: templates/authopenid/changeemail.html:84 +#: forum/skins/default/templates/authopenid/changeemail.html:84 #, python-format msgid "email key not sent %(email)s change email here %(change_link)s" msgstr "" @@ -2944,54 +2964,56 @@ msgstr "" "validated before</span> so the new key was not sent. You can <a href='%" "(change_link)s'>change</a> email used for update subscriptions if necessary." -#: templates/authopenid/changeopenid.html:4 -#: templates/authopenid/changeopenid.html:30 -#: templates/authopenid/settings.html:34 +#: forum/skins/default/templates/authopenid/changeopenid.html:4 +#: forum/skins/default/templates/authopenid/changeopenid.html:30 +#: forum/skins/default/templates/authopenid/settings.html:34 msgid "Change OpenID" msgstr "" -#: templates/authopenid/changeopenid.html:8 +#: forum/skins/default/templates/authopenid/changeopenid.html:8 msgid "Account: change OpenID URL" msgstr "" -#: templates/authopenid/changeopenid.html:12 +#: forum/skins/default/templates/authopenid/changeopenid.html:12 msgid "" "This is where you can change your OpenID URL. Make sure you remember it!" msgstr "" -#: templates/authopenid/changeopenid.html:14 -#: templates/authopenid/delete.html:14 templates/authopenid/delete.html:24 +#: forum/skins/default/templates/authopenid/changeopenid.html:14 +#: forum/skins/default/templates/authopenid/delete.html:14 +#: forum/skins/default/templates/authopenid/delete.html:24 msgid "Please correct errors below:" msgstr "" -#: templates/authopenid/changeopenid.html:29 +#: forum/skins/default/templates/authopenid/changeopenid.html:29 msgid "OpenID URL:" msgstr "" -#: templates/authopenid/changepw.html:5 templates/authopenid/changepw.html:14 -#: templates/authopenid/settings.html:29 +#: forum/skins/default/templates/authopenid/changepw.html:5 +#: forum/skins/default/templates/authopenid/changepw.html:14 +#: forum/skins/default/templates/authopenid/settings.html:29 msgid "Change password" msgstr "" -#: templates/authopenid/changepw.html:7 +#: forum/skins/default/templates/authopenid/changepw.html:7 msgid "Account: change password" msgstr "Change your password" -#: templates/authopenid/changepw.html:8 +#: forum/skins/default/templates/authopenid/changepw.html:8 msgid "This is where you can change your password. Make sure you remember it!" msgstr "" "<span class='strong'>To change your password</span> please fill out and " "submit this form" -#: templates/authopenid/complete.html:19 +#: forum/skins/default/templates/authopenid/complete.html:19 msgid "Connect your OpenID with this site" msgstr "New user signup" -#: templates/authopenid/complete.html:22 +#: forum/skins/default/templates/authopenid/complete.html:22 msgid "Connect your OpenID with your account on this site" msgstr "New user signup" -#: templates/authopenid/complete.html:27 +#: forum/skins/default/templates/authopenid/complete.html:27 #, python-format msgid "register new %(provider)s account info, see %(gravatar_faq_url)s" msgstr "" @@ -3002,7 +3024,7 @@ msgstr "" "questions and will be used to create and retrieve your unique avatar image - " "<a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" -#: templates/authopenid/complete.html:31 +#: forum/skins/default/templates/authopenid/complete.html:31 #, python-format msgid "" "%(username)s already exists, choose another name for \n" @@ -3019,7 +3041,7 @@ msgstr "" "updates</strong> on the interesting questions or entire forum by email. " "Email addresses are never shown or otherwise shared with anybody else.</p>" -#: templates/authopenid/complete.html:35 +#: forum/skins/default/templates/authopenid/complete.html:35 #, python-format msgid "" "register new external %(provider)s account info, see %(gravatar_faq_url)s" @@ -3033,36 +3055,37 @@ msgstr "" "retrieve your unique avatar image - <a href='%(gravatar_faq_url)" "s'><strong>gravatar</strong></a>.</p>" -#: templates/authopenid/complete.html:38 +#: forum/skins/default/templates/authopenid/complete.html:38 #, python-format msgid "register new Facebook connect account info, see %(gravatar_faq_url)s" msgstr "" "<p><span class=\"big strong\">You are here for the first time with your " -"Facebook login.</span> Please create your <strong>screen name</strong> " -"and save your <strong>email</strong> address. Saved email address will let " -"you <strong>subscribe for the updates</strong> on the most interesting " -"questions and will be used to create and retrieve your unique avatar image - " -"<a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" +"Facebook login.</span> Please create your <strong>screen name</strong> and " +"save your <strong>email</strong> address. Saved email address will let you " +"<strong>subscribe for the updates</strong> on the most interesting questions " +"and will be used to create and retrieve your unique avatar image - <a href='%" +"(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>" -#: templates/authopenid/complete.html:42 +#: forum/skins/default/templates/authopenid/complete.html:42 msgid "This account already exists, please use another." msgstr "" -#: templates/authopenid/complete.html:57 +#: forum/skins/default/templates/authopenid/complete.html:57 msgid "Sorry, looks like we have some errors:" msgstr "" -#: templates/authopenid/complete.html:82 +#: forum/skins/default/templates/authopenid/complete.html:82 msgid "Screen name label" msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)" -#: templates/authopenid/complete.html:89 +#: forum/skins/default/templates/authopenid/complete.html:89 msgid "Email address label" msgstr "" "<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with " "anyone, must be valid</i>)" -#: templates/authopenid/complete.html:95 templates/authopenid/signup.html:18 +#: forum/skins/default/templates/authopenid/complete.html:95 +#: forum/skins/default/templates/authopenid/signup.html:18 msgid "receive updates motivational blurb" msgstr "" "<strong>Receive forum updates by email</strong> - this will help our " @@ -3071,58 +3094,64 @@ msgstr "" "week</strong> - only when there is anything new.<br/>If you like, please " "adjust this now or any time later from your user account." -#: templates/authopenid/complete.html:99 +#: forum/skins/default/templates/authopenid/complete.html:99 +#: forum/skins/default/templates/authopenid/signup.html:22 +msgid "please select one of the options above" +msgstr "" + +#: forum/skins/default/templates/authopenid/complete.html:102 msgid "Tag filter tool will be your right panel, once you log in." msgstr "" -#: templates/authopenid/complete.html:100 +#: forum/skins/default/templates/authopenid/complete.html:103 msgid "create account" msgstr "Signup" -#: templates/authopenid/complete.html:109 +#: forum/skins/default/templates/authopenid/complete.html:112 msgid "Existing account" msgstr "" -#: templates/authopenid/complete.html:110 +#: forum/skins/default/templates/authopenid/complete.html:113 msgid "user name" msgstr "" -#: templates/authopenid/complete.html:111 +#: forum/skins/default/templates/authopenid/complete.html:114 msgid "password" msgstr "" -#: templates/authopenid/complete.html:118 +#: forum/skins/default/templates/authopenid/complete.html:121 msgid "Register" msgstr "" -#: templates/authopenid/complete.html:119 templates/authopenid/signin.html:151 +#: forum/skins/default/templates/authopenid/complete.html:122 +#: forum/skins/default/templates/authopenid/signin.html:151 msgid "Forgot your password?" msgstr "" -#: templates/authopenid/confirm_email.txt:2 +#: forum/skins/default/templates/authopenid/confirm_email.txt:2 msgid "Thank you for registering at our Q&A forum!" msgstr "" -#: templates/authopenid/confirm_email.txt:4 +#: forum/skins/default/templates/authopenid/confirm_email.txt:4 msgid "Your account details are:" msgstr "" -#: templates/authopenid/confirm_email.txt:6 +#: forum/skins/default/templates/authopenid/confirm_email.txt:6 msgid "Username:" msgstr "" -#: templates/authopenid/confirm_email.txt:7 -#: templates/authopenid/delete.html:19 +#: forum/skins/default/templates/authopenid/confirm_email.txt:7 +#: forum/skins/default/templates/authopenid/delete.html:19 msgid "Password:" msgstr "" -#: templates/authopenid/confirm_email.txt:9 +#: forum/skins/default/templates/authopenid/confirm_email.txt:9 msgid "Please sign in here:" msgstr "" -#: templates/authopenid/confirm_email.txt:12 -#: templates/authopenid/email_validation.txt:14 -#: templates/authopenid/sendpw_email.txt:8 +#: forum/skins/default/templates/authopenid/confirm_email.txt:12 +#: forum/skins/default/templates/authopenid/email_validation.txt:14 +#: forum/skins/default/templates/authopenid/sendpw_email.txt:8 msgid "" "Sincerely,\n" "Forum Administrator" @@ -3130,76 +3159,78 @@ msgstr "" "Sincerely,\n" "Q&A Forum Administrator" -#: templates/authopenid/delete.html:4 templates/authopenid/settings.html:38 +#: forum/skins/default/templates/authopenid/delete.html:4 +#: forum/skins/default/templates/authopenid/settings.html:38 msgid "Delete account" msgstr "" -#: templates/authopenid/delete.html:8 +#: forum/skins/default/templates/authopenid/delete.html:8 msgid "Account: delete account" msgstr "" -#: templates/authopenid/delete.html:12 +#: forum/skins/default/templates/authopenid/delete.html:12 msgid "" "Note: After deleting your account, anyone will be able to register this " "username." msgstr "" -#: templates/authopenid/delete.html:16 +#: forum/skins/default/templates/authopenid/delete.html:16 msgid "Check confirm box, if you want delete your account." msgstr "" -#: templates/authopenid/delete.html:31 +#: forum/skins/default/templates/authopenid/delete.html:31 msgid "I am sure I want to delete my account." msgstr "" -#: templates/authopenid/delete.html:32 +#: forum/skins/default/templates/authopenid/delete.html:32 msgid "Password/OpenID URL" msgstr "" -#: templates/authopenid/delete.html:32 +#: forum/skins/default/templates/authopenid/delete.html:32 msgid "(required for your security)" msgstr "" -#: templates/authopenid/delete.html:34 +#: forum/skins/default/templates/authopenid/delete.html:34 msgid "Delete account permanently" msgstr "" -#: templates/authopenid/email_validation.txt:2 +#: forum/skins/default/templates/authopenid/email_validation.txt:2 msgid "Greetings from the Q&A forum" msgstr "" -#: templates/authopenid/email_validation.txt:4 +#: forum/skins/default/templates/authopenid/email_validation.txt:4 msgid "To make use of the Forum, please follow the link below:" msgstr "" -#: templates/authopenid/email_validation.txt:8 +#: forum/skins/default/templates/authopenid/email_validation.txt:8 msgid "Following the link above will help us verify your email address." msgstr "" -#: templates/authopenid/email_validation.txt:10 +#: forum/skins/default/templates/authopenid/email_validation.txt:10 msgid "" "If you beleive that this message was sent in mistake - \n" "no further action is needed. Just ingore this email, we apologize\n" "for any inconvenience" msgstr "" -#: templates/authopenid/external_legacy_login_info.html:4 -#: templates/authopenid/external_legacy_login_info.html:7 +#: forum/skins/default/templates/authopenid/external_legacy_login_info.html:4 +#: forum/skins/default/templates/authopenid/external_legacy_login_info.html:7 msgid "Traditional login information" msgstr "" -#: templates/authopenid/external_legacy_login_info.html:12 +#: forum/skins/default/templates/authopenid/external_legacy_login_info.html:12 #, python-format msgid "" "how to login with password through external login website or use %" "(feedback_url)s" msgstr "" -#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:7 +#: forum/skins/default/templates/authopenid/sendpw.html:4 +#: forum/skins/default/templates/authopenid/sendpw.html:7 msgid "Send new password" msgstr "Recover password" -#: templates/authopenid/sendpw.html:10 +#: forum/skins/default/templates/authopenid/sendpw.html:10 msgid "password recovery information" msgstr "" "<span class='big strong'>Forgot you password? No problems - just get a new " @@ -3209,22 +3240,22 @@ msgstr "" "login with the suggested password<br/>• at this you might want to " "change your password to something you can remember better" -#: templates/authopenid/sendpw.html:21 +#: forum/skins/default/templates/authopenid/sendpw.html:21 msgid "Reset password" msgstr "Send me a new password" -#: templates/authopenid/sendpw.html:22 +#: forum/skins/default/templates/authopenid/sendpw.html:22 msgid "return to login" msgstr "" -#: templates/authopenid/sendpw_email.txt:2 +#: forum/skins/default/templates/authopenid/sendpw_email.txt:2 #, python-format msgid "" "Someone has requested to reset your password on %(site_url)s.\n" "If it were not you, it is safe to ignore this email." msgstr "" -#: templates/authopenid/sendpw_email.txt:5 +#: forum/skins/default/templates/authopenid/sendpw_email.txt:5 #, python-format msgid "" "email explanation how to use new %(password)s for %(username)s\n" @@ -3235,35 +3266,36 @@ msgstr "" "* login with user name %(username)s and password %(password)s\n" "* go to your user profile and set the password to something you can remember" -#: templates/authopenid/settings.html:4 +#: forum/skins/default/templates/authopenid/settings.html:4 msgid "Account functions" msgstr "" -#: templates/authopenid/settings.html:30 +#: forum/skins/default/templates/authopenid/settings.html:30 msgid "Give your account a new password." msgstr "" -#: templates/authopenid/settings.html:31 +#: forum/skins/default/templates/authopenid/settings.html:31 msgid "Change email " msgstr "" -#: templates/authopenid/settings.html:32 +#: forum/skins/default/templates/authopenid/settings.html:32 msgid "Add or update the email address associated with your account." msgstr "" -#: templates/authopenid/settings.html:35 +#: forum/skins/default/templates/authopenid/settings.html:35 msgid "Change openid associated to your account" msgstr "" -#: templates/authopenid/settings.html:39 +#: forum/skins/default/templates/authopenid/settings.html:39 msgid "Erase your username and all your data from website" msgstr "" -#: templates/authopenid/signin.html:5 templates/authopenid/signin.html:21 +#: forum/skins/default/templates/authopenid/signin.html:5 +#: forum/skins/default/templates/authopenid/signin.html:21 msgid "User login" msgstr "User login" -#: templates/authopenid/signin.html:28 +#: forum/skins/default/templates/authopenid/signin.html:28 #, python-format msgid "" "\n" @@ -3276,7 +3308,7 @@ msgstr "" "strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be " "posted once you log in.</span>" -#: templates/authopenid/signin.html:35 +#: forum/skins/default/templates/authopenid/signin.html:35 #, python-format msgid "" "Your question \n" @@ -3287,7 +3319,7 @@ msgstr "" "strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be " "posted once you log in.</span>" -#: templates/authopenid/signin.html:42 +#: forum/skins/default/templates/authopenid/signin.html:42 msgid "Click to sign in through any of these services." msgstr "" "<p><span class=\"big strong\">Please select your favorite login method below." @@ -3297,14 +3329,14 @@ msgstr "" "have to remember another one. CNPROG option requires your login name and " "password entered here.</font></p>" -#: templates/authopenid/signin.html:128 +#: forum/skins/default/templates/authopenid/signin.html:128 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>" msgstr "" "<span class=\"big strong\">Enter your </span><span id=\"enter_your_what\" " "class='big strong'>Provider user name</span><br/><span class='grey'>(or " "select another login method above)</span>" -#: templates/authopenid/signin.html:135 +#: forum/skins/default/templates/authopenid/signin.html:135 msgid "" "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> " "web address" @@ -3313,67 +3345,68 @@ msgstr "" "openid.net\">OpenID</a> web address</span><br/><span class='grey'>(or choose " "another login method above)</span>" -#: templates/authopenid/signin.html:137 templates/authopenid/signin.html:149 +#: forum/skins/default/templates/authopenid/signin.html:137 +#: forum/skins/default/templates/authopenid/signin.html:149 msgid "Login" msgstr "" -#: templates/authopenid/signin.html:140 +#: forum/skins/default/templates/authopenid/signin.html:140 msgid "Enter your login name and password" msgstr "" "<span class='big strong'>Enter your CNPROG login and password</span><br/" "><span class='grey'>(or select your OpenID provider above)</span>" -#: templates/authopenid/signin.html:144 +#: forum/skins/default/templates/authopenid/signin.html:144 msgid "Login name" msgstr "" -#: templates/authopenid/signin.html:146 +#: forum/skins/default/templates/authopenid/signin.html:146 msgid "Password" msgstr "" -#: templates/authopenid/signin.html:150 +#: forum/skins/default/templates/authopenid/signin.html:150 msgid "Create account" msgstr "" -#: templates/authopenid/signin.html:160 +#: forum/skins/default/templates/authopenid/signin.html:160 msgid "Why use OpenID?" msgstr "" -#: templates/authopenid/signin.html:163 +#: forum/skins/default/templates/authopenid/signin.html:163 msgid "with openid it is easier" msgstr "With the OpenID you don't need to create new username and password." -#: templates/authopenid/signin.html:166 +#: forum/skins/default/templates/authopenid/signin.html:166 msgid "reuse openid" msgstr "You can safely re-use the same login for all OpenID-enabled websites." -#: templates/authopenid/signin.html:169 +#: forum/skins/default/templates/authopenid/signin.html:169 msgid "openid is widely adopted" msgstr "" "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-" "enabled." -#: templates/authopenid/signin.html:172 +#: forum/skins/default/templates/authopenid/signin.html:172 msgid "openid is supported open standard" msgstr "OpenID is based on an open standard, supported by many organizations." -#: templates/authopenid/signin.html:177 +#: forum/skins/default/templates/authopenid/signin.html:177 msgid "Find out more" msgstr "" -#: templates/authopenid/signin.html:178 +#: forum/skins/default/templates/authopenid/signin.html:178 msgid "Get OpenID" msgstr "" -#: templates/authopenid/signup.html:4 +#: forum/skins/default/templates/authopenid/signup.html:4 msgid "Signup" msgstr "" -#: templates/authopenid/signup.html:8 +#: forum/skins/default/templates/authopenid/signup.html:8 msgid "Create login name and password" msgstr "" -#: templates/authopenid/signup.html:10 +#: forum/skins/default/templates/authopenid/signup.html:10 msgid "Traditional signup info" msgstr "" "<span class='strong big'>If you prefer, create your forum login name and " @@ -3382,99 +3415,222 @@ msgstr "" "simply reuse your external login (e.g. Gmail or AOL) without ever sharing " "your login details with anyone and having to remember yet another password." -#: templates/authopenid/signup.html:19 -msgid "" -"Please select your preferred email update schedule for the following groups " -"of questions:" -msgstr "" - -#: templates/authopenid/signup.html:23 +#: forum/skins/default/templates/authopenid/signup.html:25 msgid "" "Please read and type in the two words below to help us prevent automated " "account creation." msgstr "" -#: templates/authopenid/signup.html:25 +#: forum/skins/default/templates/authopenid/signup.html:27 msgid "Create Account" msgstr "" -#: templates/authopenid/signup.html:27 +#: forum/skins/default/templates/authopenid/signup.html:29 msgid "return to OpenID login" msgstr "" -#: templates/fbconnect/xd_receiver.html:5 +#: forum/skins/default/templates/fbconnect/xd_receiver.html:5 #, python-format msgid "Connect to %(APP_SHORT_NAME)s with Facebook!" msgstr "" -#: utils/forms.py:27 +#: forum/templatetags/extra_tags.py:166 forum/templatetags/extra_tags.py:193 +msgid "reputation points" +msgstr "karma" + +#: forum/templatetags/extra_tags.py:253 +msgid "2 days ago" +msgstr "" + +#: forum/templatetags/extra_tags.py:255 +msgid "yesterday" +msgstr "" + +#: forum/templatetags/extra_tags.py:257 +#, python-format +msgid "%(hr)d hour ago" +msgid_plural "%(hr)d hours ago" +msgstr[0] "" +msgstr[1] "" + +#: forum/templatetags/extra_tags.py:259 +#, python-format +msgid "%(min)d min ago" +msgid_plural "%(min)d mins ago" +msgstr[0] "" +msgstr[1] "" + +#: forum/utils/forms.py:27 msgid "this field is required" msgstr "" -#: utils/forms.py:42 +#: forum/utils/forms.py:42 msgid "choose a username" msgstr "Choose screen name" -#: utils/forms.py:47 +#: forum/utils/forms.py:47 msgid "user name is required" msgstr "" -#: utils/forms.py:48 +#: forum/utils/forms.py:48 msgid "sorry, this name is taken, please choose another" msgstr "" -#: utils/forms.py:49 +#: forum/utils/forms.py:49 msgid "sorry, this name is not allowed, please choose another" msgstr "" -#: utils/forms.py:50 +#: forum/utils/forms.py:50 msgid "sorry, there is no user with this name" msgstr "" -#: utils/forms.py:51 +#: forum/utils/forms.py:51 msgid "sorry, we have a serious error - user name is taken by several users" msgstr "" -#: utils/forms.py:52 +#: forum/utils/forms.py:52 msgid "user name can only consist of letters, empty space and underscore" msgstr "" -#: utils/forms.py:100 +#: forum/utils/forms.py:100 msgid "your email address" msgstr "Your email <i>(never shared)</i>" -#: utils/forms.py:101 +#: forum/utils/forms.py:101 msgid "email address is required" msgstr "" -#: utils/forms.py:102 +#: forum/utils/forms.py:102 msgid "please enter a valid email address" msgstr "" -#: utils/forms.py:103 +#: forum/utils/forms.py:103 msgid "this email is already used by someone else, please choose another" msgstr "" -#: utils/forms.py:128 +#: forum/utils/forms.py:128 msgid "choose password" msgstr "Password" -#: utils/forms.py:129 +#: forum/utils/forms.py:129 msgid "password is required" msgstr "" -#: utils/forms.py:132 +#: forum/utils/forms.py:132 msgid "retype password" msgstr "Password <i>(please retype)</i>" -#: utils/forms.py:133 +#: forum/utils/forms.py:133 msgid "please, retype your password" msgstr "" -#: utils/forms.py:134 +#: forum/utils/forms.py:134 msgid "sorry, entered passwords did not match, please try again" msgstr "" +#: forum/views/commands.py:217 +#, python-format +msgid "subscription saved, %(email)s needs validation, see %(details_url)s" +msgstr "" +"Your subscription is saved, but email address %(email)s needs to be " +"validated, please see <a href='%(details_url)s'>more details here</a>" + +#: forum/views/commands.py:225 +msgid "email update frequency has been set to daily" +msgstr "" + +#: forum/views/meta.py:34 +msgid "Q&A forum feedback" +msgstr "" + +#: forum/views/meta.py:35 +msgid "Thanks for the feedback!" +msgstr "" + +#: forum/views/meta.py:43 +msgid "We look forward to hearing your feedback! Please, give it next time :)" +msgstr "" + +#: forum/views/users.py:842 forum/views/users.py:846 +msgid "changes saved" +msgstr "" + +#: forum/views/users.py:852 +msgid "email updates canceled" +msgstr "" + +#: forum/views/users.py:882 +msgid "user profile" +msgstr "" + +#: forum/views/users.py:883 +msgid "user profile overview" +msgstr "" + +#: forum/views/users.py:890 +msgid "recent user activity" +msgstr "" + +#: forum/views/users.py:891 +msgid "profile - recent activity" +msgstr "" + +#: forum/views/users.py:900 +msgid "profile - responses" +msgstr "" + +#: forum/views/users.py:908 +msgid "user reputation in the community" +msgstr "user karma" + +#: forum/views/users.py:909 +msgid "profile - user reputation" +msgstr "Profile - User's Karma" + +#: forum/views/users.py:915 +msgid "favorite questions" +msgstr "" + +#: forum/views/users.py:916 +msgid "users favorite questions" +msgstr "" + +#: forum/views/users.py:917 +msgid "profile - favorite questions" +msgstr "" + +#: forum/views/users.py:926 +msgid "profile - votes" +msgstr "" + +#: forum/views/users.py:935 +msgid "profile - email subscriptions" +msgstr "" + +#: forum/views/writers.py:74 +msgid "uploading images is limited to users with >60 reputation points" +msgstr "sorry, file uploading requires karma >60" + +#: forum/views/writers.py:76 +msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" +msgstr "" + +#: forum/views/writers.py:78 +#, python-format +msgid "maximum upload file size is %sK" +msgstr "" + +#: forum/views/writers.py:80 +#, python-format +msgid "" +"Error uploading file. Please contact the site administrator. Thank you. %s" +msgstr "" + +#: forum_modules/books/urls.py:7 forum_modules/books/urls.py:8 +#: forum_modules/books/urls.py:9 +msgid "books/" +msgstr "" + #~ msgid "have %(num_q)s unanswered questions" #~ msgstr "" #~ "<div class=\"questions-count\">%(num_q)s</div>questions <strong>without " diff --git a/middleware/__init__.py~HEAD b/middleware/__init__.py~HEAD deleted file mode 100644 index e69de29b..00000000 --- a/middleware/__init__.py~HEAD +++ /dev/null diff --git a/osqa-requirements.txt b/osqa-requirements.txt new file mode 100644 index 00000000..66a37fbe --- /dev/null +++ b/osqa-requirements.txt @@ -0,0 +1,9 @@ +django>=1.1 # Note: email subscription sender job requires Django 1.1, everything else works with 1.0 +#mysql-python # Can't use with pip, see http://groups.google.com/group/python-virtualenv/msg/ea988085951c92b3 +python-openid +html5lib +markdown2 +git+git://github.com/robhudson/django-debug-toolbar.git +git+git://github.com/dcramer/django-sphinx.git +svn+http://recaptcha-django.googlecode.com/svn/trunk/ +svn+http://recaptcha.googlecode.com/svn/trunk/recaptcha-plugins/python/ diff --git a/settings.py b/settings.py index d95118db..bbbd2f5b 100755 --- a/settings.py +++ b/settings.py @@ -2,6 +2,7 @@ # Django settings for lanai project. import os.path import sys + SITE_ID = 1 ADMIN_MEDIA_PREFIX = '/forum/admin/media/' @@ -79,7 +80,7 @@ if USE_SPHINX_SEARCH: if USE_FB_CONNECT: INSTALLED_APPS.append('fbconnect') -if DATABASE_ENGINE in ('postgresql_psycopg2', 'postgresql', ) and False: +if DATABASE_ENGINE in ('postgresql_psycopg2', 'postgresql', ) and False:#todo - is this always false? USE_PG_FTS = True INSTALLED_APPS.append('pgfulltext') else: diff --git a/settings_local.py.dist b/settings_local.py.dist index 52c54bbb..766c1a38 100755 --- a/settings_local.py.dist +++ b/settings_local.py.dist @@ -105,6 +105,6 @@ RECAPTCHA_PUBLIC_KEY='...' OSQA_DEFAULT_SKIN = 'default' #Facebook settings -USE_FB_CONNECT=False +USE_FB_CONNECT=False #make this True and fill out keys below FB_API_KEY='' #your api key from facebook FB_SECRET='' #your application secret |