[tor-commits] [community/staging] merge master

[emmapeel at torproject.org]

commit c292d43654e5b63c77338aa4dd8103c816823b57
Merge: 492c8a3 eb60871
Author: emma peel <emma.peel at riseup.net>
Date:   Tue May 28 08:33:01 2019 +0200

    merge master

 community.lektorproject                            |  19 ++-
 configs/i18n.ini                                   |   2 +-
 content/relay-operations/contents.lr               |   7 +-
 .../relays-requirements/contents.lr                |  80 +++++------
 .../technical-setup/centosrhel/contents.lr         |   4 +
 .../relay-operations/technical-setup/contents.lr   | 160 ++++++++-------------
 .../technical-setup/debianubuntu/contents.lr       |   2 +
 .../technical-setup/fedora/contents.lr             |   2 +
 .../technical-setup/freebsd/contents.lr            |   2 +
 databags/alternatives.ini                          |  20 ++-
 databags/menu+es.ini                               |  20 +--
 databags/menu+fr.ini                               |  20 +--
 databags/menu+it.ini                               |   1 +
 databags/menu+ru.ini                               |   1 +
 databags/menu_footer+es.ini                        |   2 +-
 databags/menu_footer+it.ini                        |   1 +
 databags/menu_footer+ru.ini                        |   1 +
 databags/pagenav+de.ini                            |  12 +-
 databags/pagenav+es.ini                            |  24 +---
 databags/pagenav+it.ini                            |   1 +
 databags/pagenav+ru.ini                            |   1 +
 21 files changed, 158 insertions(+), 224 deletions(-)

diff --cc community.lektorproject
index 422a406,7195f39..bb88054
--- a/community.lektorproject
+++ b/community.lektorproject
@@@ -24,10 -8,15 +24,15 @@@ locale = d
  name = English (en)
  primary = yes
  url_prefix = /
- locale = en-US
+ locale = en
+ 
+ [alternatives.de]
+ name = Deutsch (de)
+ url_prefix = /de/
+ locale = de
  
  [alternatives.es]
 -name = Español
 +name = Español (es)
  url_prefix = /es/
  locale = es
  
@@@ -36,17 -25,17 +41,29 @@@ name = Français (fr
  url_prefix = /fr/
  locale = fr
  
+ [alternatives.it]
+ name = Italia (it)
+ url_prefix = /it/
+ locale = it
+ 
  [alternatives.pt-BR]
 -name = Português Br. (pr-BR)
 +name = Português (Brasil)
  url_prefix = /pt-BR/
  locale = pt-BR
  
+ [alternatives.ru]
+ name = Русский (ru)
+ url_prefix = /ru/
+ locale = ru
++
 +[alternatives.tr]
 +name = Türkçe (tr)
 +url_prefix = /tr/
 +locale = tr
 +
 +[alternatives.zh-CN]
 +name = 简体字 (zh-CN)
 +url_prefix = /zh-CN/
 +locale = zh-CN
++
++
diff --cc configs/i18n.ini
index cdc9610,cb13961..436704b
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@@ -1,5 -1,5 +1,5 @@@
  content = en
- translations = ar,bn-BD,de,es,fr,pt-BR,tr,zh-CN
 -translations = es,de,fr,it,pt-BR,ru
++translations = ar,bn-BD,de,es,fr,it,pt-BR,ru,tr,zh-CN
  i18npath = i18n
  translate_paragraphwise = False
 -url_prefix = https://torproject.org/
 +url_prefix = https://lektor-staging.torproject.org/community/staging/
diff --cc databags/alternatives.ini
index f36def3,1dafc16..2cce48a
--- a/databags/alternatives.ini
+++ b/databags/alternatives.ini
@@@ -4,29 -4,11 +4,29 @@@ order = order-las
  url =  /
  language = English (en)
  
 +[ar]
 +direction = text-right
 +order = order-first
 +url = /ar/
 +language = عربية (ar)
 +
 +[bn-BD]
 +direction = text-left
 +order = order-last
 +url = /bn-BD/
 +language = বাংলা ভাষা (bn)
 +
 +[de]
 +direction = text-left
 +order = order-last
 +url = /de/
 +language = Deutsch (de)
 +
- [en-US]
+ [de]
  direction = text-left
  order = order-last
- url =  /en-US/
- language = English (en)
+ url = /de/
+ language = Deutsch (de)
  
  [es]
  direction = text-left
@@@ -44,16 -32,10 +50,24 @@@ language = Italiano (it
  direction = text-left
  order = order-last
  url = /pt-BR/
 -language = Português Br. (pt-BR)
 +language = Português (pt-BR)
  
+ [ru]
+ direction = text-left
+ order = order-last
+ url = /ru/
+ language = Русский (ru)
++
 +[tr]
 +direction = text-left
 +order = order-last
 +url = /tr/
 +language = Türkçe (tr)
 +
 +[zh-CN]
 +direction = text-left
 +order = order-last
 +url = /zh-CN/
 +language = 简体字 (zh-CN)
++
++
diff --cc databags/menu_footer+es.ini
index 553ed4a,a3178a1..3a07e3f
mode 100644,120000..100644
--- a/databags/menu_footer+es.ini
+++ b/databags/menu_footer+es.ini
@@@ -1,15 -1,1 +1,15 @@@
 -menu_footer+en.ini
 +[jobs]
- path = https://www.torproject.org/about/jobs
++path = https://www.torproject.org/es/about/jobs
 +label = Jobs
 +
 +[blog]
 +path = https://blog.torproject.org
 +label = Blog
 +
 +[contact]
 +path = https://www.torproject.org/es/contact
 +label = Contact
 +
 +[press]
 +path = https://www.torproject.org/es/press
 +label = Press
diff --cc databags/pagenav+de.ini
index ee4a217,214e4d8..1ad40f2
mode 100644,120000..100644
--- a/databags/pagenav+de.ini
+++ b/databags/pagenav+de.ini
@@@ -1,23 -1,1 +1,23 @@@
 -pagenav+en.ini
 +[relay-operations]
- path = de/relay-operations
++path = relay-operations
 +label = Relay Operations
 +
 +[user-testing]
- path = de/user-testing
++path = user-testing
 +label = User Testing
 +
 +[training]
- path = de/training
++path = training
 +label = Training
 +
 +[outreach]
- path = de/outreach
++path = outreach
 +label = Outreach
 +
 +[translations]
- path = de/translations
++path = translations
 +label = Translations
 +
 +[onion-services]
- path = de/onion-services
++path = onion-services
 +label = .Onion Services