[tor-commits] [bridgedb/develop] Merge branch 'fix/12122-translator-notes' into develop

[isis at torproject.org]

commit 46ab59e8a4929ead2b638f0e6444343588c58bfa
Merge: e7b3d6e 1890058
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Jun 6 17:51:55 2014 +0000

    Merge branch 'fix/12122-translator-notes' into develop

 lib/bridgedb/i18n/templates/bridgedb.pot |   73 +++++++++++++++++-------------
 lib/bridgedb/strings.py                  |    7 +++
 lib/bridgedb/templates/bridges.html      |    4 +-
 3 files changed, 52 insertions(+), 32 deletions(-)