Merge remote-tracking branch 'remotes/upstream/master' into beta

diff --cc res/values-ar/strings.xml
Simple merge

diff --cc res/values-az/strings.xml
Simple merge

diff --cc res/values-bg-rBG/strings.xml
Simple merge

diff --cc res/values-bn-rBD/strings.xml
Simple merge

diff --cc res/values-ca/strings.xml
Simple merge

diff --cc res/values-cs-rCZ/strings.xml
Simple merge

diff --cc res/values-da/strings.xml
Simple merge

diff --cc res/values-de-rDE/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-el/strings.xml
Simple merge

diff --cc res/values-en-rGB/strings.xml
Simple merge

diff --cc res/values-eo/strings.xml
Simple merge

diff --cc res/values-es-rAR/strings.xml
Simple merge

diff --cc res/values-es-rCL/strings.xml
Simple merge

diff --cc res/values-es/strings.xml
Simple merge

diff --cc res/values-et-rEE/strings.xml
Simple merge

diff --cc res/values-eu/strings.xml
Simple merge

diff --cc res/values-fi-rFI/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
Simple merge

diff --cc res/values-gl/strings.xml
Simple merge

diff --cc res/values-he/strings.xml
Simple merge

diff --cc res/values-hu-rHU/strings.xml
Simple merge

diff --cc res/values-id/strings.xml
Simple merge

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-ja-rJP/strings.xml
Simple merge

diff --cc res/values-ko/strings.xml
Simple merge

diff --cc res/values-lb/strings.xml
Simple merge

diff --cc res/values-lt-rLT/strings.xml
Simple merge

diff --cc res/values-mk/strings.xml
Simple merge

diff --cc res/values-nb-rNO/strings.xml
Simple merge

diff --cc res/values-nl/strings.xml
Simple merge

diff --cc res/values-oc/strings.xml
Simple merge

diff --cc res/values-pl/strings.xml
Simple merge

diff --cc res/values-pt-rBR/strings.xml
Simple merge

diff --cc res/values-pt-rPT/strings.xml
Simple merge

diff --cc res/values-ro/strings.xml
Simple merge

diff --cc res/values-ru/strings.xml
Simple merge

diff --cc res/values-sk-rSK/strings.xml
Simple merge

diff --cc res/values-sl/strings.xml
Simple merge

diff --cc res/values-sr/strings.xml
Simple merge

diff --cc res/values-sv/strings.xml
Simple merge

diff --cc res/values-th-rTH/strings.xml
Simple merge

diff --cc res/values-tr/strings.xml
Simple merge

diff --cc res/values-uk/strings.xml
Simple merge

diff --cc res/values-zh-rCN/strings.xml
Simple merge

diff --cc res/values-zh-rTW/strings.xml
Simple merge