commit e4bcb8fbe150b476fd21d6b530929353e0d35814 Merge: 83bdce5 f283a67 Author: Isis Lovecruft isis@torproject.org Date: Fri Mar 20 04:23:47 2015 +0000

Merge branch 'translations/2015-03-19-update' into develop

lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 21 +- lib/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ++++++++++++++++++ lib/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ++++++++++++++++++ lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 391 +++++++++++++++++--- lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 367 ++++++++++++++++--- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 169 +++++---- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 103 ++++-- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 20 +- lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 445 +++++++++++++++++++--- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 387 +++++++++++++++++--- lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 447 +++++++++++++++++++---- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ++++++++++++++++++ lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 79 ++-- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 63 +++- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 63 +++- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 61 +++- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 64 ++-- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 72 ++-- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 59 ++- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 161 +++++--- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 145 +++++--- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 19 +- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 20 +- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 161 +++++--- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 170 +++++---- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 100 +++-- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 64 +++- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 53 ++- lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 21 +- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 65 +++- lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 367 ++++++++++++++++--- lib/bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ++++++++++++++++++ lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ++++++++++++++++++ lib/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 380 +++++++++++++++++++ lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 61 +++- lib/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ++++++++++++++++++ lib/bridgedb/i18n/templates/bridgedb.pot | 17 +- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 97 +++-- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 184 ++++++---- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 121 +++--- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 22 +- 41 files changed, 6036 insertions(+), 1149 deletions(-)