[tor-commits] [bridgedb/master] Merge branch 'translations/2014-05-16-update' into develop