commit fe22faf2bfa74a899622ae371c69136ba2960117 Merge: 45213d8 695b585 Author: Isis Lovecruft isis@torproject.org Date: Sat Jul 26 02:22:10 2014 +0000
Merge branch 'fix/11139-riseup_r1' into develop
README | 59 ++++++++++++++++++----- bridgedb.conf | 18 +++++-- lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/templates/bridgedb.pot | 18 +++---- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/strings.py | 2 +- lib/bridgedb/templates/base.html | 1 + lib/bridgedb/txrecaptcha.py | 2 +- 32 files changed, 202 insertions(+), 132 deletions(-)