diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:56:49 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:56:49 -0600 |
| commit | 81e2244eca04c02de0d7c32f0063f64f2ca3b1c4 (patch) | |
| tree | 1014127ab7b69d121aa2fe4ed80de5a43e7b078a /locale | |
| parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
| parent | 3e7c42f81352ad73a1395ed0601f2d4fdf9b5359 (diff) | |
| download | askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.tar.gz askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.tar.bz2 askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts:
forum/management/commands/send_email_alerts.py
locale/en/LC_MESSAGES/django.mo
settings.py
templates/about.html
templates/authopenid/complete.html
templates/authopenid/external_legacy_login_info.html
templates/content/js/com.cnprog.post.js
templates/content/js/com.cnprog.utils.js
templates/content/style/style.css
templates/question.html
templates/questions.html
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/en/LC_MESSAGES/django.po | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 3f554733..3ce3d53d 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -175,7 +175,7 @@ msgstr "" #: django_authopenid/urls.py:15 msgid "external-login/" -msgstr "using-nmr-wiki-login-and-password/" +msgstr "" #: django_authopenid/urls.py:16 msgid "register/" |