commit eebf89f1f2959d3fa21a4219cabf8b517e0a4738 Author: emma peel emma.peel@riseup.net Date: Tue May 18 21:34:23 2021 +0200

update from master databags --- databags/about.ini | 5 +- databags/alternatives.ini | 94 +------------------------------- databags/download-alternatives-alpha.ini | 18 +++++- databags/download-alternatives.ini | 18 +++++- databags/platforms.ini | 4 +- databags/versions.ini | 25 +++++++-- models/person.ini | 4 +- 7 files changed, 64 insertions(+), 104 deletions(-)

diff --git a/databags/about.ini b/databags/about.ini index 184ae432..82bc62c9 100644 --- a/databags/about.ini +++ b/databags/about.ini @@ -10,6 +10,10 @@ label = People path = about/sponsors label = Sponsors

+[membership] +path = about/membership +label = Membership + [reports] path = about/reports label = Reports @@ -21,4 +25,3 @@ label = Jobs [trademark] path = about/trademark label = Trademark - diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 9f30f70f..510183c5 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,30 +4,12 @@ order = order-last url = / language = English (en)

-[ar] -direction = text-right -order = order-first -url = /ar/ -language = عربية (ar) - -[bn] -direction = text-left -order = order-last -url = /bn/ -language = বাংলা ভাষা (bn) - [ca] direction = text-left order = order-last url = /ca/ language = Català (ca)

-[da] -direction = text-left -ordar = order-last -url = /da/ -language = Dansk (da) - [de] direction = text-left order = order-last @@ -46,24 +28,6 @@ order = order-last url = /fr/ language = Français (fr)

-[he] -direction = text-right -order = order-first -url = /he/ -language = עברית (he) - -[hu] -direction = text-left -order = order-last -url = /hu/ -language = Magyar nyelv (hu) - -[id] -direction = text-left -order = order-last -url = /id/ -language = Indonesia (id) - [is] direction = text-left order = order-last @@ -76,59 +40,17 @@ order = order-last url = /it/ language = Italiano (it)

-[ja] -direction = text-left -order = order-last -language = 日本語 (ja) -url = /ja/ - [ka] direction = text-left order = order-last -language = Georgian (ka) +language = ქართული ენა (ka) url = /ka/

-[ko] -direction = text-left -order = order-last -language = 한국어 (ko) -url = /ko/ - -[ms] -direction = text-left -order = order-last -language = Melayu (ms) -url = /ms/ - -[nl] -direction = text-left -order = order-last -url = /nl/ -language = Nederlands (nl) - -[pl] -direction = text-left -order = order-last -url = /pl/ -language = Polski (pl) - [pt-BR] direction = text-left order = order-last url = /pt-BR/ -language = Português Br. (pt-BR) - -[pt-PT] -direction = text-left -order = order-last -url = /pt-PT/ -language = Português Port. (pt-PT) - -[ro] -direction = text-left -order = order-last -url = /ro/ -language = Română (ro) +language = Português Brasil (pt-BR)

[ru] direction = text-left @@ -136,12 +58,6 @@ order = order-last url = /ru/ language = Русский (ru)

-[th] -direction = text-left -order = order-last -url = /th/ -language = ภาษาไทย (th) - [tr] direction = text-left order = order-last @@ -153,9 +69,3 @@ direction = text-left order = order-last url = /zh-CN/ language = 简体中文 (zh-CN) - -[zh-TW] -direction = text-left -order = order-last -url = /zh-TW/ -language = 正體字 (zh-TW) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 1badac9c..cdb9448a 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -32,7 +32,7 @@ language = Español (es)

[fa] url = /fa/ -language = Farsi (fa) +language = فارسی (fa)

[fr] url = /fr/ @@ -74,10 +74,22 @@ language = ქართული ენა (ka) url = /ko/ language = 한국어 (ko)

+[lt] +url = /lt/ +language = Lietuvių (lt) + [mk] url = /mk/ language = македонски (mk)

+[ms] +url = /ms/ +language = Melayu (ms) + +[my] +url = /my/ +language = မြန်မာစာ (my) + [nb-NO] url = /nb-NO/ language = Norsk Bokmål (nb-NO) @@ -106,6 +118,10 @@ url = /ru/ url = /sv-SE/ language = Svenska (sv-SE)

+[th] +url = /th/ +language = ภาษาไทย (th) + [tr] url = /tr/ language = Türkçe (tr) diff --git a/databags/download-alternatives.ini b/databags/download-alternatives.ini index 88847045..4a4b1755 100644 --- a/databags/download-alternatives.ini +++ b/databags/download-alternatives.ini @@ -36,7 +36,7 @@ language = Español Arg. (es-AR)

[fa] url = /fa/ -language = Farsi (fa) +language = فارسی (fa)

[fr] url = /fr/ @@ -78,10 +78,22 @@ url = /ka/ url = /ko/ language = 한국어 (ko)

+[lt] +url = /lt/ +language = lietuvių kalba (lt) + [mk] url = /mk/ language = македонски (mk)

+[ms] +url = /ms/ +language = بهاس ملايو (ms) + +[my] +url = /my/ +language = မြန်မာစာ (my) + [nb-NO] url = /nb-NO/ language = Norsk Bokmål (nb-NO) @@ -110,6 +122,10 @@ url = /ru/ url = /sv-SE/ language = Svenska (sv-SE)

+[th] +url = /th/ +language = ภาษาไทย (th) + [tr] url = /tr/ language = Türkçe (tr) diff --git a/databags/platforms.ini b/databags/platforms.ini index 43306c2d..7d0efbe3 100644 --- a/databags/platforms.ini +++ b/databags/platforms.ini @@ -1,10 +1,10 @@ [windows] path = windows -label = Microsoft Windows +label = Windows

[apple] path = osx -label = Apple OS X +label = OS X

[linux] path = linux diff --git a/databags/versions.ini b/databags/versions.ini index 70ca6892..d5ce5d9e 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,13 +1,28 @@ [torbrowser-stable] -version = 9.0.1 -win32 = 0.4.1.6 +version = 10.0.16 +win32 = 0.4.5.7 + +[torbrowser-android-stable] +version = 10.0.16 + +[torbrowser-win-stable] +version = 10.0.16 + +[torbrowser-linux-stable] +version = 10.0.16

[torbrowser-alpha] -version = 9.5a2 +version = 10.5a15 + +[torbrowser-android-alpha] +version = 10.5a15 + +[torbrowser-win-alpha] +version = 10.5a15

[tor-stable] -version = 0.4.1.6 +version = 0.4.5.8

[tor-alpha] -version = 0.4.2.4-rc +version = 0.4.6.3-rc

diff --git a/models/person.ini b/models/person.ini index b4868da1..a3e4bf84 100644 --- a/models/person.ini +++ b/models/person.ini @@ -12,8 +12,8 @@ label = Twitter Handle type = string addon_label = @

-[fields.mastodon_handle] -label = Mastodon Handle +[fields.mastodon_url] +label = Mastodon URL type = string addon_label = @