commit d63ba215e16d5098edc41dc8c150edf68091ebe4 Merge: 46ab59e 0840864 Author: Isis Lovecruft isis@torproject.org Date: Fri Jun 6 20:38:57 2014 +0000

Merge branch 'translations/2014-06-06-update' into develop

lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 371 +++++++++++++++++++---- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 350 +++++++++++++++++---- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 9 +- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 340 +++++++++++++++++---- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 334 ++++++++++++++++---- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 345 +++++++++++++++++---- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++---- lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 +++++++ lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 341 +++++++++++++++++---- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 340 +++++++++++++++++---- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 339 +++++++++++++++++---- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 8 +- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++---- 13 files changed, 3025 insertions(+), 530 deletions(-)