Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.

1 files changed, 10 insertions, 5 deletions

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index ecc73baf5..aa0a4d467 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -2,11 +2,11 @@
 
 module SettingsHelper
   HUMAN_LOCALES = {
-    en: 'English',
     ar: 'العربية',
     ast: 'Asturianu',
     bg: 'Български',
     bn: 'বাংলা',
+    br: 'Breton',
     ca: 'Català',
     co: 'Corsu',
     cs: 'Čeština',
@@ -14,8 +14,11 @@ module SettingsHelper
     da: 'Dansk',
     de: 'Deutsch',
     el: 'Ελληνικά',
+    en: 'English',
     eo: 'Esperanto',
+    'es-AR': 'Español (Argentina)',
     es: 'Español',
+    et: 'Eesti',
     eu: 'Euskara',
     fa: 'فارسی',
     fi: 'Suomi',
@@ -36,32 +39,34 @@ module SettingsHelper
     ko: '한국어',
     lt: 'Lietuvių',
     lv: 'Latviešu',
+    mk: 'Македонски',
     ml: 'മലയാളം',
     ms: 'Bahasa Melayu',
     nl: 'Nederlands',
+    nn: 'Nynorsk',
     no: 'Norsk',
     oc: 'Occitan',
     pl: 'Polski',
-    pt: 'Português',
-    'pt-PT': 'Português (Portugal)',
     'pt-BR': 'Português (Brasil)',
+    'pt-PT': 'Português (Portugal)',
+    pt: 'Português',
     ro: 'Română',
     ru: 'Русский',
     sk: 'Slovenčina',
     sl: 'Slovenščina',
     sq: 'Shqip',
-    sr: 'Српски',
     'sr-Latn': 'Srpski (latinica)',
+    sr: 'Српски',
     sv: 'Svenska',
     ta: 'தமிழ்',
     te: 'తెలుగు',
     th: 'ไทย',
     tr: 'Türkçe',
     uk: 'Українська',
-    zh: '中文',
     'zh-CN': '简体中文',
     'zh-HK': '繁體中文（香港）',
     'zh-TW': '繁體中文（臺灣）',
+    zh: '中文',
   }.freeze
 
   def human_locale(locale)