[tbb-commits] [torbutton/master] Merge branch 'bug_30468_v4'

[gk at torproject.org]

commit 171b482609c7b8dc644150f4e83900bac715f071
Merge: 208b1131 3ec6d04c
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jul 4 16:06:49 2019 +0000

    Merge branch 'bug_30468_v4'

 src/chrome/locale/mk/aboutDialog.dtd              | 19 ++++++
 src/chrome/locale/mk/aboutTBUpdate.dtd            |  8 +++
 src/chrome/locale/mk/aboutTor.dtd                 | 57 ++++++----------
 src/chrome/locale/mk/brand.dtd                    | 11 +++-
 src/chrome/locale/mk/brand.properties             | 13 ++--
 src/chrome/locale/mk/browserOnboarding.properties | 71 ++++++++++++++++++++
 src/chrome/locale/mk/securityLevel.properties     | 23 ++++++-
 src/chrome/locale/mk/torbutton.dtd                | 56 +++++++++++-----
 src/chrome/locale/mk/torbutton.properties         | 79 ++++++++++++++++-------
 trans_tools/import-translations.sh                |  2 +-
 10 files changed, 253 insertions(+), 86 deletions(-)