[tor-commits] [torbutton/master] Merge branch 'bug_30469_v6'

[gk at torproject.org]

commit 534a42c9d8c57730dab0df9a1f77b2b5cc1d0b43
Merge: fc1b50e4 ac4a5747
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Jun 3 11:29:09 2019 +0000

    Merge branch 'bug_30469_v6'

 src/chrome/locale/ro/aboutDialog.dtd              | 19 ++++++
 src/chrome/locale/ro/aboutTBUpdate.dtd            |  8 +++
 src/chrome/locale/ro/aboutTor.dtd                 | 57 +++++++----------
 src/chrome/locale/ro/brand.dtd                    | 11 +++-
 src/chrome/locale/ro/brand.properties             | 13 ++--
 src/chrome/locale/ro/browserOnboarding.properties | 71 +++++++++++++++++++++
 src/chrome/locale/ro/securityLevel.properties     | 23 ++++++-
 src/chrome/locale/ro/torbutton.dtd                | 50 ++++++++++-----
 src/chrome/locale/ro/torbutton.properties         | 75 ++++++++++++++++-------
 src/jar.mn                                        |  2 +
 trans_tools/import-translations.sh                |  2 +-
 11 files changed, 250 insertions(+), 81 deletions(-)