about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-09-16 15:11:01 +0200
committerGitHub <noreply@github.com>2019-09-16 15:11:01 +0200
commit692fe477b4dded6a2f6f48685eef329ded4484ec (patch)
tree902180924e85ed2a86c163fb79a41b5acb8fe63f /config/locales
parent524187b65344f6bcedb9bc188df7b6032540ac48 (diff)
New Crowdin translations (#11799)
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]

* New translations doorkeeper.en.yml (Ido)
[ci skip]

* New translations doorkeeper.en.yml (Indonesian)
[ci skip]

* New translations doorkeeper.en.yml (Italian)
[ci skip]

* New translations doorkeeper.en.yml (Japanese)
[ci skip]

* New translations doorkeeper.en.yml (Kazakh)
[ci skip]

* New translations simple_form.en.yml (Asturian)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.json (Latvian)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.json (Malay)
[ci skip]

* New translations en.json (Norwegian)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Indonesian)
[ci skip]

* New translations en.json (Romanian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.json (Serbian (Cyrillic))
[ci skip]

* New translations en.json (Serbian (Latin))
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.json (Swedish)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations en.json (Ido)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations en.json (Albanian)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Armenian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Bulgarian)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Corsican)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations en.json (Danish)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.json (Georgian)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.json (Welsh)
[ci skip]

* New translations simple_form.en.yml (Albanian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Malay)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Romanian)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Serbian (Latin))
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Telugu)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Croatian)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Bulgarian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Georgian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Ido)
[ci skip]

* New translations doorkeeper.en.yml (Estonian)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations activerecord.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations devise.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Armenian)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.json (Bulgarian)
[ci skip]

* New translations doorkeeper.en.yml (Breton)
[ci skip]

* New translations devise.en.yml (Breton)
[ci skip]

* New translations simple_form.en.yml (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations activerecord.en.yml (Breton)
[ci skip]

* New translations devise.en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations activerecord.en.yml (Asturian)
[ci skip]

* New translations devise.en.yml (Russian)
[ci skip]

* New translations activerecord.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations devise.en.yml (Norwegian)
[ci skip]

* New translations activerecord.en.yml (Norwegian)
[ci skip]

* New translations en.json (Norwegian)
[ci skip]

* New translations en.json (Malay)
[ci skip]

* New translations en.json (Serbian (Cyrillic))
[ci skip]

* New translations devise.en.yml (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Ukrainian)
[ci skip]

* New translations activerecord.en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations devise.en.yml (Slovak)
[ci skip]

* New translations activerecord.en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]

* New translations en.json (Serbian (Latin))
[ci skip]

* New translations devise.en.yml (Serbian (Cyrillic))
[ci skip]

* New translations activerecord.en.yml (Serbian (Cyrillic))
[ci skip]

* New translations activerecord.en.yml (Indonesian)
[ci skip]

* New translations devise.en.yml (Georgian)
[ci skip]

* New translations activerecord.en.yml (Georgian)
[ci skip]

* New translations en.json (Georgian)
[ci skip]

* New translations devise.en.yml (Croatian)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations devise.en.yml (Bulgarian)
[ci skip]

* New translations activerecord.en.yml (Bulgarian)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.json (Latvian)
[ci skip]

* New translations devise.en.yml (Indonesian)
[ci skip]

* New translations en.json (Indonesian)
[ci skip]

* New translations devise.en.yml (Ido)
[ci skip]

* New translations en.json (Ido)
[ci skip]

* New translations devise.en.yml (Hebrew)
[ci skip]

* New translations activerecord.en.yml (Hebrew)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations doorkeeper.en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Romanian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Georgian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Serbian (Latin))
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/activerecord.br.yml1
-rw-r--r--config/locales/activerecord.nn.yml1
-rw-r--r--config/locales/activerecord.pt.yml13
-rw-r--r--config/locales/ar.yml4
-rw-r--r--config/locales/ast.yml1
-rw-r--r--config/locales/br.yml20
-rw-r--r--config/locales/ca.yml1
-rw-r--r--config/locales/co.yml4
-rw-r--r--config/locales/cs.yml9
-rw-r--r--config/locales/cy.yml1
-rw-r--r--config/locales/da.yml2
-rw-r--r--config/locales/de.yml8
-rw-r--r--config/locales/devise.br.yml1
-rw-r--r--config/locales/devise.nn.yml1
-rw-r--r--config/locales/devise.pt.yml83
-rw-r--r--config/locales/doorkeeper.br.yml1
-rw-r--r--config/locales/doorkeeper.nn.yml1
-rw-r--r--config/locales/doorkeeper.pt-PT.yml (renamed from config/locales/doorkeeper.pt.yml)2
-rw-r--r--config/locales/el.yml1
-rw-r--r--config/locales/eo.yml1
-rw-r--r--config/locales/es.yml8
-rw-r--r--config/locales/et.yml1
-rw-r--r--config/locales/eu.yml1
-rw-r--r--config/locales/fa.yml1
-rw-r--r--config/locales/fi.yml1
-rw-r--r--config/locales/fr.yml3
-rw-r--r--config/locales/gl.yml1
-rw-r--r--config/locales/hu.yml1
-rw-r--r--config/locales/it.yml1
-rw-r--r--config/locales/ja.yml1
-rw-r--r--config/locales/ka.yml1
-rw-r--r--config/locales/kk.yml1
-rw-r--r--config/locales/ko.yml1
-rw-r--r--config/locales/lt.yml1
-rw-r--r--config/locales/nl.yml1
-rw-r--r--config/locales/nn.yml20
-rw-r--r--config/locales/no.yml1
-rw-r--r--config/locales/oc.yml1
-rw-r--r--config/locales/pl.yml1
-rw-r--r--config/locales/pt-BR.yml1
-rw-r--r--config/locales/pt-PT.yml (renamed from config/locales/pt.yml)3
-rw-r--r--config/locales/ro.yml1
-rw-r--r--config/locales/ru.yml5
-rw-r--r--config/locales/simple_form.br.yml1
-rw-r--r--config/locales/simple_form.es.yml12
-rw-r--r--config/locales/simple_form.nn.yml1
-rw-r--r--config/locales/simple_form.pt-PT.yml (renamed from config/locales/simple_form.pt.yml)2
-rw-r--r--config/locales/simple_form.ru.yml6
-rw-r--r--config/locales/sk.yml19
-rw-r--r--config/locales/sl.yml1
-rw-r--r--config/locales/sq.yml1
-rw-r--r--config/locales/sr-Latn.yml1
-rw-r--r--config/locales/sr.yml1
-rw-r--r--config/locales/sv.yml1
-rw-r--r--config/locales/th.yml1
-rw-r--r--config/locales/uk.yml1
-rw-r--r--config/locales/zh-CN.yml1
-rw-r--r--config/locales/zh-HK.yml1
-rw-r--r--config/locales/zh-TW.yml1
59 files changed, 112 insertions, 152 deletions
diff --git a/config/locales/activerecord.br.yml b/config/locales/activerecord.br.yml
new file mode 100644
index 000000000..c7677c850
--- /dev/null
+++ b/config/locales/activerecord.br.yml
@@ -0,0 +1 @@
+br:
diff --git a/config/locales/activerecord.nn.yml b/config/locales/activerecord.nn.yml
new file mode 100644
index 000000000..777f4e600
--- /dev/null
+++ b/config/locales/activerecord.nn.yml
@@ -0,0 +1 @@
+nn:
diff --git a/config/locales/activerecord.pt.yml b/config/locales/activerecord.pt.yml
deleted file mode 100644
index 556fcfc4f..000000000
--- a/config/locales/activerecord.pt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-pt:
-  activerecord:
-    errors:
-      models:
-        account:
-          attributes:
-            username:
-              invalid: apenas letras, números e underscores
-        status:
-          attributes:
-            reblog:
-              taken: do status já existe
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 82d2485a7..45001e6fc 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -240,6 +240,7 @@ ar:
       copied_msg: تم إنشاء نسخة محلية للإيموجي بنجاح
       copy: نسخ
       copy_failed_msg: فشلت عملية إنشاء نسخة محلية لهذا الإيموجي
+      create_new_category: انشئ فئة جديدة
       created_msg: تم إنشاء الإيموجي بنجاح!
       delete: حذف
       destroyed_msg: تمت عملية تدمير الإيموجي بنجاح!
@@ -256,6 +257,7 @@ ar:
       shortcode: الترميز المُصَغّر
       shortcode_hint: على الأقل حرفين، و فقط رموز أبجدية عددية و أسطر سفلية
       title: الإيموجي الخاصة
+      uncategorized: غير مصنّف
       unlisted: غير مدرج
       update_failed_msg: تعذرت عملية تحديث ذاك الإيموجي
       updated_msg: تم تحديث الإيموجي بنجاح!
@@ -501,6 +503,7 @@ ar:
       in_directory: "%{count} في سجل حسابات المستخدمين"
       title: الوسوم
       trending_right_now: متداول اللحظة
+      unique_uses_today: "%{count} منشورات اليوم"
       unreviewed: غير مُراجَع
       updated_msg: تم تحديث إعدادات الوسوم بنجاح
     title: الإدارة
@@ -595,7 +598,6 @@ ar:
       x_months: "%{count} شه"
       x_seconds: "%{count}ث"
   deletes:
-    bad_password_msg: إنّ الكلمة السرية التي أدخلتها غير صحيحة
     confirm_password: قم بإدخال كلمتك السرية الحالية للتحقق من هويتك
     proceed: حذف حساب
     success_msg: تم حذف حسابك بنجاح
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index e801d4b51..72b87a6ac 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -131,7 +131,6 @@ ast:
       half_a_minute: Púramente agora
       less_than_x_seconds: Púramente agora
   deletes:
-    bad_password_msg: "¡Bon intentu, crackers! Contraseña incorreuta"
     confirm_password: Introduz la contraseña pa verificar la to identidá
   errors:
     '400': The request you submitted was invalid or malformed.
diff --git a/config/locales/br.yml b/config/locales/br.yml
new file mode 100644
index 000000000..3710084e7
--- /dev/null
+++ b/config/locales/br.yml
@@ -0,0 +1,20 @@
+---
+br:
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Throttled
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
+  invites:
+    expires_in:
+      '1800': 30 minutes
+      '21600': 6 hours
+      '3600': 1 hour
+      '43200': 12 hours
+      '604800': 1 week
+      '86400': 1 day
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index a23b6ddf4..bfd7c514d 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -620,7 +620,6 @@ ca:
       x_months: "%{count} mesos"
       x_seconds: "%{count} s"
   deletes:
-    bad_password_msg: Bon intent hackers! La contrasenya no és correcta
     confirm_password: Introdueix la contrasenya actual per a verificar la identitat
     proceed: Suprimeix el compte
     success_msg: El compte s'ha eliminat correctament
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 8ecff0d59..e91b1361f 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -427,6 +427,9 @@ co:
       custom_css:
         desc_html: Mudificà l'apparenza cù CSS caricatu nant'à ogni pagina
         title: CSS persunalizatu
+      default_noindex:
+        desc_html: Tocca tutti quelli ch'ùn anu micca cambiatu stu parametru
+        title: Ritirà l'utilizatori di l'indicazione nant'à i mutori di ricerca
       domain_blocks:
         all: À tutti
         disabled: À nimu
@@ -629,7 +632,6 @@ co:
       x_months: "%{count}Me"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: È nò! Sta chjave ùn hè curretta
     confirm_password: Entrate a vostra chjave d’accessu attuale per verificà a vostra identità
     proceed: Sguassà u contu
     success_msg: U vostru contu hè statu sguassatu
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 46700be56..569eb35d2 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -233,10 +233,12 @@ cs:
       deleted_status: "(smazaný toot)"
       title: Záznam auditu
     custom_emojis:
+      assign_category: Přiřadit kategorii
       by_domain: Doména
       copied_msg: Místní kopie emoji byla úspěšně vytvořena
       copy: Kopírovat
       copy_failed_msg: Nebylo možné vytvořit místní kopii tohoto emoji
+      create_new_category: Vytvořit novou kategorii
       created_msg: Emoji úspěšně vytvořeno!
       delete: Smazat
       destroyed_msg: Emoji úspěšně zničeno!
@@ -253,6 +255,7 @@ cs:
       shortcode: Zkratka
       shortcode_hint: Alespoň 2 znaky, pouze alfanumerické znaky a podtržítka
       title: Vlastní emoji
+      uncategorized: Nezařazená
       unlisted: Neuvedeno
       update_failed_msg: Nebylo možné aktualizovat toto emoji
       updated_msg: Emoji úspěšně aktualizováno!
@@ -436,6 +439,9 @@ cs:
       custom_css:
         desc_html: Pozměnit vzhled pomocí šablony CSS načtené na každé stránce
         title: Vlastní CSS
+      default_noindex:
+        desc_html: Ovlivňuje všechny uživatele, kteří toto nastavení sami nezměnili
+        title: Odhlásit uživatele z indexování vyhledávačemi ve výchozím stavu
       domain_blocks:
         all: Všem
         disabled: Nikomu
@@ -447,7 +453,7 @@ cs:
         desc_html: Zobrazuje se na hlavní stránce. Doporučuje se rozlišení alespoň 600x100 px. Pokud toto není nastaveno, bude zobrazena miniatura serveru
         title: Hlavní obrázek
       mascot:
-        desc_html: Zobrazuje se na hlavní stránce. Doporučuje se rozlišení alespoň 293x205 px. Pokud toto není nastaveno, bude zobrazen výchozí maskot
+        desc_html: Zobrazuje se na několika stránkách. Doporučuje se rozlišení alespoň 293x205 px. Pokud toto není nastaveno, bude zobrazen výchozí maskot
         title: Obrázek maskota
       peers_api_enabled:
         desc_html: Domény, na které tento server narazil ve fedivesmíru
@@ -638,7 +644,6 @@ cs:
       x_months: "%{count} mesíců"
       x_seconds: "%{count} s"
   deletes:
-    bad_password_msg: Dobrý pokus, hackeři! Nesprávné heslo
     confirm_password: Zadejte svoje současné heslo pro ověření vaší identity
     proceed: Odstranit účet
     success_msg: Váš účet byl úspěšně odstraněn
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index a1d637f2e..a58ea2534 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -581,7 +581,6 @@ cy:
       x_months: "%{count}mis"
       x_seconds: "%{count}eiliad"
   deletes:
-    bad_password_msg: Go dda, hacwyr! Cyfrinair anghywir
     confirm_password: Mewnbynnwch eich cyfrinair presennol i gadarnhau mai chi sydd yno
     proceed: Dileu cyfrif
     success_msg: Llwyddwyd i ddileu eich cyfrif
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 70397c77b..06a68f684 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -207,6 +207,7 @@ da:
       copied_msg: Succesfuldt oprettede en lokal kopi af humørikonet
       copy: Kopier
       copy_failed_msg: Kunne ikke oprette en lokal kopi af dette humørikon
+      create_new_category: Opret ny kategori
       created_msg: Humørikon succesfuldt oprettet!
       delete: Slet
       destroyed_msg: Emojo succesfuldt destrueret!
@@ -514,7 +515,6 @@ da:
       over_x_years: "%{count}år"
       x_months: "%{count}md"
   deletes:
-    bad_password_msg: Godt forsøg, hackere! Forkert kodeord
     confirm_password: Indtast dit nuværende kodeord for at bekræfte din identitet
     proceed: Slet konto
     success_msg: Din konto er nu blevet slettet
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0af7be2f4..fb988668a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -225,10 +225,12 @@ de:
       deleted_status: "(gelöschter Beitrag)"
       title: Überprüfungsprotokoll
     custom_emojis:
+      assign_category: Kategorie zuweisen
       by_domain: Domain
       copied_msg: Eine lokale Kopie des Emojis wurde erstellt
       copy: Kopieren
       copy_failed_msg: Es konnte keine lokale Kopie des Emojis erstellt werden
+      create_new_category: Neue Kategorie erstellen
       created_msg: Emoji erstellt!
       delete: Löschen
       destroyed_msg: Emoji gelöscht!
@@ -245,6 +247,7 @@ de:
       shortcode: Kürzel
       shortcode_hint: Mindestens 2 Zeichen, nur Buchstaben, Ziffern und Unterstriche
       title: Eigene Emojis
+      uncategorized: Nicht kategorisiert
       unlisted: Ungelistet
       update_failed_msg: Konnte dieses Emoji nicht aktualisieren
       updated_msg: Emoji erfolgreich aktualisiert!
@@ -424,6 +427,9 @@ de:
       custom_css:
         desc_html: Verändere das Aussehen mit CSS, dass auf jeder Seite geladen wird
         title: Benutzerdefiniertes CSS
+      default_noindex:
+        desc_html: Beeinflusst alle Benutzer, die diese Einstellung nicht selbst geändert haben
+        title: Benutzer aus Suchmaschinen-Indizierung standardmäßig herausnehmen
       domain_blocks:
         all: An alle
         disabled: An niemanden
@@ -626,7 +632,6 @@ de:
       x_months: "%{count}mo"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Falsches Passwort
     confirm_password: Gib dein derzeitiges Passwort ein, um deine Identität zu bestätigen
     proceed: Konto löschen
     success_msg: Dein Konto wurde erfolgreich gelöscht
@@ -727,6 +732,7 @@ de:
     all: Alle
     changes_saved_msg: Änderungen gespeichert!
     copy: Kopieren
+    no_batch_actions_available: Keine Massenaktionen auf dieser Seite verfügbar
     order_by: Sortieren nach
     save_changes: Änderungen speichern
     validation_errors:
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
new file mode 100644
index 000000000..c7677c850
--- /dev/null
+++ b/config/locales/devise.br.yml
@@ -0,0 +1 @@
+br:
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
new file mode 100644
index 000000000..777f4e600
--- /dev/null
+++ b/config/locales/devise.nn.yml
@@ -0,0 +1 @@
+nn:
diff --git a/config/locales/devise.pt.yml b/config/locales/devise.pt.yml
deleted file mode 100644
index 9b44bbf00..000000000
--- a/config/locales/devise.pt.yml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-pt:
-  devise:
-    confirmations:
-      confirmed: O teu endereço de e-mail foi confirmado com sucesso.
-      send_instructions: Vais receber um email com as instruções para confirmar o teu endereço de email dentro de alguns minutos. Por favor, verifica a caixa de spam se não recebeste o e-mail.
-      send_paranoid_instructions: Se o teu endereço de email já existir na nossa base de dados, vais receber um email com as instruções de confirmação dentro de alguns minutos. Por favor, verifica a caixa de spam se não recebeste o e-mail.
-    failure:
-      already_authenticated: A tua sessão já está aberta.
-      inactive: A tua conta ainda não está ativada.
-      invalid: "%{authentication_keys} ou palavra-passe inválida."
-      last_attempt: Tens mais uma tentativa antes de a tua conta ficar bloqueada.
-      locked: A tua conta está bloqueada.
-      not_found_in_database: "%{authentication_keys} ou palavra-passe inválida."
-      timeout: A tua sessão expirou. Por favor, entra de novo para continuares.
-      unauthenticated: Precisas de entrar na tua conta ou de te registares antes de continuar.
-      unconfirmed: Tens de confirmar o teu endereço de email antes de continuar.
-    mailer:
-      confirmation_instructions:
-        action: Verificar o endereço de e-mail
-        action_with_app: Confirmar e regressar a %{app}
-        explanation: Criaste uma conta em %{host} com este endereço de e-mail. Estás a um clique de activá-la. Se não foste tu que fizeste este registo, por favor ignora esta mensagem.
-        extra_html: Por favor lê <a href="%{terms_path}">as regras da instância</a> e os <a href="%{policy_path}"> nossos termos de serviço</a>.
-        subject: 'Mastodon: Instruções de confirmação %{instance}'
-        title: Verificar o endereço de e-mail
-      email_changed:
-        explanation: 'O e-mail associado à tua conta será alterado para:'
-        extra: Se não alteraste o teu e-mail é possível que alguém tenha conseguido aceder à tua conta. Por favor muda a tua palavra-passe imediatamente ou entra em contato com um administrador do servidor se ficaste sem acesso à tua conta.
-        subject: 'Mastodon: Email alterado'
-        title: Novo endereço de e-mail
-      password_change:
-        explanation: A palavra-passe da tua conta foi alterada.
-        extra: Se não alteraste a tua palavra-passe, é possível que alguém tenha conseguido aceder à tua conta. Por favor muda a tua palavra-passe imediatamente ou entra em contato com um administrador do servidor se ficaste sem acesso à tua conta.
-        subject: 'Mastodon: Nova palavra-passe'
-        title: Palavra-passe alterada
-      reconfirmation_instructions:
-        explanation: Confirma o teu novo endereço para alterar o e-mail.
-        extra: Se esta mudança não foi iniciada por ti, por favor ignora este e-mail. O endereço de e-mail para a tua conta do Mastodon não irá mudar enquanto não acederes ao link acima.
-        subject: 'Mastodon: Confirmação de e-mail %{instance}'
-        title: Validar o endereço de e-mail
-      reset_password_instructions:
-        action: Alterar palavra-passe
-        explanation: Pediste a alteração da palavra-passe da tua conta.
-        extra: Se não fizeste este pedido, por favor ignora este e-mail. A tua palavra-passe não irá mudar se não acederes ao link acima e criares uma nova.
-        subject: 'Mastodon: Instruções para alterar a palavra-passe'
-        title: Solicitar nova palavra-passe
-      unlock_instructions:
-        subject: 'Mastodon: Instruções para desbloquear a tua conta'
-    omniauth_callbacks:
-      failure: Não foi possível autenticar %{kind} porque "%{reason}".
-      success: Autenticado com sucesso na conta %{kind}.
-    passwords:
-      no_token: Não pode aceder a esta página se não vier através do link enviado por email para alteração da sua palavra-passe. Se usaste esse link para chegar aqui, por favor verifica que o endereço URL actual é o mesmo do que foi enviado no email.
-      send_instructions: Vais receber um email com instruções para alterar a palavra-passe dentro de algns minutos.
-      send_paranoid_instructions: Se o teu endereço de email existe na nossa base de dados, vais receber um link para recuperar a palavra-passe dentro de alguns minutos.
-      updated: A tua palavra-passe foi alterada. Estás agora autenticado na tua conta.
-      updated_not_active: A tua palavra-passe foi alterada.
-    registrations:
-      destroyed: Adeus! A tua conta foi cancelada. Esperamos ver-te em breve.
-      signed_up: Bem-vindo! A tua conta foi registada com sucesso.
-      signed_up_but_inactive: A tua conta foi registada. No entanto ainda não está activa.
-      signed_up_but_locked: A tua conta foi registada. No entanto está bloqueada.
-      signed_up_but_unconfirmed: Uma mensagem com um link de confirmação foi enviada para o teu email. Por favor segue esse link para activar a tua conta.
-      update_needs_confirmation: Alteraste o teu endereço de email ou palavra-passe, mas é necessário confirmar essa alteração. Por favor vai ao teu email e segue link que te enviámos.
-      updated: A tua conta foi actualizada com sucesso.
-    sessions:
-      already_signed_out: Sessão encerrada.
-      signed_in: Sessão iniciada.
-      signed_out: Sessão encerrada.
-    unlocks:
-      send_instructions: Vais receber um email com instruções para desbloquear a tua conta dentro de alguns minutos.
-      send_paranoid_instructions: Se a tua conta existe, vais receber um email com instruções a detalhar como a desbloquear dentro de alguns minutos.
-      unlocked: A sua conta foi desbloqueada. Por favor inica uma nova sessão para continuar.
-  errors:
-    messages:
-      already_confirmed: já confirmado, por favor tente iniciar sessão
-      confirmation_period_expired: tem de ser confirmado durante %{period}, por favor tenta outra vez
-      expired: expirou, por favor tente outra vez
-      not_found: não encontrado
-      not_locked: não estava bloqueada
-      not_saved:
-        one: '1 erro impediu este %{resource} de ser guardado:'
-        other: "%{count} erros impediram este %{resource} de ser guardado:"
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
new file mode 100644
index 000000000..c7677c850
--- /dev/null
+++ b/config/locales/doorkeeper.br.yml
@@ -0,0 +1 @@
+br:
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
new file mode 100644
index 000000000..777f4e600
--- /dev/null
+++ b/config/locales/doorkeeper.nn.yml
@@ -0,0 +1 @@
+nn:
diff --git a/config/locales/doorkeeper.pt.yml b/config/locales/doorkeeper.pt-PT.yml
index f21e84d17..42068e0a0 100644
--- a/config/locales/doorkeeper.pt.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -1,5 +1,5 @@
 ---
-pt:
+pt-PT:
   activerecord:
     attributes:
       doorkeeper/application:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 43fec340a..acc97d37e 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -626,7 +626,6 @@ el:
       x_months: "%{count}μ"
       x_seconds: "%{count}δ"
   deletes:
-    bad_password_msg: Καλή προσπάθεια χάκερς! Λάθος συνθηματικό
     confirm_password: Γράψε το τρέχον συνθηματικό σου για να πιστοποιήσεις την ταυτότητά σου
     proceed: Διαγραφή λογαριασμού
     success_msg: Ο λογαριασμός σου διαγράφηκε με επιτυχία
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 5785f9b20..b5b8656a4 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -597,7 +597,6 @@ eo:
       x_months: "%{count}mo"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Malĝusta pasvorto
     confirm_password: Enmetu vian nunan pasvorton por konfirmi vian identecon
     proceed: Forigi konton
     success_msg: Via konto estis sukcese forigita
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 184f0da0e..892d82e9c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -56,6 +56,7 @@ es:
     media: Multimedia
     moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
     network_hidden: Esta información no está disponible
+    never_active: Nunca
     nothing_here: "¡No hay nada aquí!"
     people_followed_by: Usuarios a quien %{name} sigue
     people_who_follow: Usuarios que siguen a %{name}
@@ -222,6 +223,7 @@ es:
       deleted_status: "(estado borrado)"
       title: Log de auditoría
     custom_emojis:
+      assign_category: Asignar categoría
       by_domain: Dominio
       copied_msg: Copia local del emoji creada con éxito
       copy: Copiar
@@ -242,6 +244,7 @@ es:
       shortcode: Código de atajo
       shortcode_hint: Al menos 2 caracteres, solo caracteres alfanuméricos y guiones bajos
       title: Emojis personalizados
+      uncategorized: Sin clasificar
       unlisted: Sin listar
       update_failed_msg: No se pudo actualizar ese emoji
       updated_msg: "¡Emoji actualizado con éxito!"
@@ -489,6 +492,7 @@ es:
         delete: Eliminar
         nsfw_off: Marcar contenido como no sensible
         nsfw_on: Marcar contenido como sensible
+      deleted: Eliminado
       failed_to_execute: Falló al ejecutar
       media:
         title: Multimedia
@@ -609,7 +613,6 @@ es:
       x_months: "%{count}m"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: "¡Buen intento, hackers! Contraseña incorrecta"
     confirm_password: Ingresa tu contraseña actual para demostrar tu identidad
     proceed: Eliminar cuenta
     success_msg: Tu cuenta se eliminó con éxito
@@ -617,6 +620,8 @@ es:
     directory: Directorio de perfiles
     explanation: Descubre usuarios según sus intereses
     explore_mastodon: Explorar %{title}
+  domain_blocks:
+    domain: Dominio
   domain_validator:
     invalid_domain: no es un nombre de dominio válido
   errors:
@@ -676,6 +681,7 @@ es:
     developers: Desarrolladores
     more: Mas…
     resources: Recursos
+    trending_now: Tendencia ahora
   generic:
     all: Todos
     changes_saved_msg: "¡Cambios guardados con éxito!"
diff --git a/config/locales/et.yml b/config/locales/et.yml
index d02eb24ba..7d0771983 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -585,7 +585,6 @@ et:
       x_months: "%{count}k"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Hea proov, häkkerid! Vale salasõna
     confirm_password: Sisesta oma praegune salasõna, et kinnitada oma identiteet
     proceed: Kustuta konto
     success_msg: Konto kustutamine õnnestus
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 56271f3c3..2a4d61296 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -611,7 +611,6 @@ eu:
       x_months: "%{count} hilabete"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Saiakera ona hacker! Pasahitz okerra
     confirm_password: Sartu zure oraingo pasahitza zure identitatea baieztatzeko
     proceed: Ezabatu kontua
     success_msg: Zure kontua ongi ezabatu da
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0b4d046f3..7f316c784 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -620,7 +620,6 @@ fa:
       x_months: "%{count} ماه"
       x_seconds: "%{count} ثانیه"
   deletes:
-    bad_password_msg: هکر گرامی، رمزی که وارد کردید اشتباه است ؛)
     confirm_password: رمز فعلی خود را وارد کنید تا معلوم شود که خود شمایید
     proceed: پاک‌کردن حساب
     success_msg: حساب شما با موفقیت پاک شد
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 5a3a8ad60..3d8fdce3a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -393,7 +393,6 @@ fi:
       x_months: "%{count} kk"
       x_seconds: "%{count} s"
   deletes:
-    bad_password_msg: Hyvä yritys, hakkerit! Väärä salasana
     confirm_password: Tunnistaudu syöttämällä nykyinen salasanasi
     proceed: Poista tili
     success_msg: Tilin poisto onnistui
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 58b160751..15d6359b4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -626,7 +626,6 @@ fr:
       x_months: "%{count} mois"
       x_seconds: "%{count} s"
   deletes:
-    bad_password_msg: Bien essayé ! Mot de passe incorrect
     confirm_password: Entrez votre mot de passe pour vérifier votre identité
     proceed: Supprimer compte
     success_msg: Votre compte a été supprimé avec succès
@@ -1079,7 +1078,7 @@ fr:
 
       <p>Dans le cas où nous déciderions de changer notre politique de confidentialité, nous posterons les modifications sur cette page.</p>
 
-      <p>Ce document est publié sous lincence CC-BY-SA. Il a été mis à jours pour la dernière fois le 7 mars 2018.</p>
+      <p>Ce document est publié sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 7 mars 2018.</p>
 
       <p>Originellement adapté de la <a href="https://github.com/discourse/discourse">politique de confidentialité de Discourse</a>.</p>
     title: "%{instance} Conditions d’utilisation et politique de confidentialité"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 0c515a2ec..20f535ad5 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -629,7 +629,6 @@ gl:
       x_months: "%{count}mes"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Bo intento, hackers! Contrasinal incorrecto
     confirm_password: Introduza o seu contrasinal para verificar a súa identidade
     proceed: Eliminar conta
     success_msg: A súa conta eliminouse correctamente
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 7aa75434c..5d9097d09 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -611,7 +611,6 @@ hu:
       x_months: "%{count}h"
       x_seconds: "%{count}mp"
   deletes:
-    bad_password_msg: Haha, hekker! Helytelen jelszó
     confirm_password: Személyazonosságod megerősítéséhez írd be a jelenlegi jelszavad
     proceed: Felhasználói fiók törlése
     success_msg: Felhasználói fiókod sikeresen töröltük
diff --git a/config/locales/it.yml b/config/locales/it.yml
index f62d309df..7b3eede09 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -617,7 +617,6 @@ it:
       x_months: "%{count} mesi"
       x_seconds: "%{count} secondi"
   deletes:
-    bad_password_msg: Ci avete provato, hacker! Password errata
     confirm_password: Inserisci la tua password attuale per verificare la tua identità
     proceed: Cancella l'account
     success_msg: Il tuo account è stato cancellato
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d4c6058bf..cfaee9a38 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -616,7 +616,6 @@ ja:
       x_months: "%{count}月"
       x_seconds: "%{count}秒"
   deletes:
-    bad_password_msg: パスワードが違います
     confirm_password: 本人確認のため、現在のパスワードを入力してください
     proceed: アカウントを削除する
     success_msg: アカウントは正常に削除されました
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index b9b9b664f..93cc8ec5a 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -434,7 +434,6 @@ ka:
       x_months: "%{count}თვე"
       x_seconds: "%{count}წმ"
   deletes:
-    bad_password_msg: კარგად სცადეთ, ჰაკერებო! არასწორი პაროლი
     confirm_password: იდენტობის დასამოწმებლად შეიყვანეთ მიმდინარე პაროლი
     proceed: ანგარიშის გაუქმება
     success_msg: თქვენი ანგარიში წარმატებით გაუქმდა
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 736816425..3658b2293 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -510,7 +510,6 @@ kk:
       x_months: "%{count}ай"
       x_seconds: "%{count}сек"
   deletes:
-    bad_password_msg: Болмады ма, хакер бала? Құпиясөз қате
     confirm_password: Қазіргі құпиясөзіңізді жазыңыз
     proceed: Аккаунт өшіру
     success_msg: Аккаунтыңыз сәтті өшірілді
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 1c4170d8a..fc9fa7b80 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -618,7 +618,6 @@ ko:
       x_months: "%{count}월"
       x_seconds: "%{count}초"
   deletes:
-    bad_password_msg: 비밀번호가 올바르지 않습니다
     confirm_password: 본인 확인을 위해 현재 사용 중인 암호를 입력해 주십시오
     proceed: 계정 삭제
     success_msg: 계정이 성공적으로 삭제되었습니다
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a5dd5cbf5..7aed705cb 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -490,7 +490,6 @@ lt:
       x_months: "%{count}mėn"
       x_seconds: "%{count}sek"
   deletes:
-    bad_password_msg: Geras bandymas, programišiau! Neteisingas slaptažodis
     confirm_password: Kad patvirtintumėte savo tapatybę, įveskite dabartini slaptažodį
     proceed: Ištrinti paskyrą
     success_msg: Jūsų paskyra sėkmingai ištrinta
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 25e6c6591..9298e0ae0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -600,7 +600,6 @@ nl:
       x_months: "%{count}ma"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Goed geprobeerd hackers! Ongeldig wachtwoord
     confirm_password: Voer jouw huidige wachtwoord in om jouw identiteit te bevestigen
     proceed: Account verwijderen
     success_msg: Jouw account is succesvol verwijderd
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
new file mode 100644
index 000000000..a1b61d6e7
--- /dev/null
+++ b/config/locales/nn.yml
@@ -0,0 +1,20 @@
+---
+nn:
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Throttled
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
+  invites:
+    expires_in:
+      '1800': 30 minutes
+      '21600': 6 hours
+      '3600': 1 hour
+      '43200': 12 hours
+      '604800': 1 week
+      '86400': 1 day
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 4cf080be9..1d675aef6 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -326,7 +326,6 @@
       x_months: "%{count} mnd"
       x_seconds: "%{count} sek"
   deletes:
-    bad_password_msg: Godt forsøk, hacker! Feil passord
     confirm_password: Skriv inn ditt passord for å verifisere din identitet
     proceed: Slett konto
     success_msg: Din konto ble slettet
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 65e381b3a..2884380b8 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -580,7 +580,6 @@ oc:
       x_months: "%{count} meses"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Ben ensajat pirata ! Senhal incorrècte
     confirm_password: Picatz vòstre senhal actual per verificar vòstra identitat
     proceed: Suprimir lo compte
     success_msg: Compte ben suprimit
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 0671979fe..23d0c8a98 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -569,7 +569,6 @@ pl:
       x_months: "%{count} miesięcy"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Niezła próba, hakerze! Wprowadzono nieprawidłowe hasło
     confirm_password: Wprowadź aktualne hasło, aby potwierdzić tożsamość
     proceed: Usuń konto
     success_msg: Twoje konto zostało pomyślnie usunięte
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index af4d117e0..9896f888a 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -526,7 +526,6 @@ pt-BR:
       x_months: "%{count} meses"
       x_seconds: "%{count} segundos"
   deletes:
-    bad_password_msg: Boa tentativa, hackers! Senha incorreta
     confirm_password: Insira a sua senha atual para verificar a sua identidade
     proceed: Excluir conta
     success_msg: A sua conta foi excluída com sucesso
diff --git a/config/locales/pt.yml b/config/locales/pt-PT.yml
index eeb158f6c..25ee57085 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt-PT.yml
@@ -1,5 +1,5 @@
 ---
-pt:
+pt-PT:
   about:
     about_hashtag_html: Estes são toots públicos marcados com <strong>#%{hashtag}</strong>. Podes interagir com eles se tiveres uma conta Mastodon.
     about_mastodon_html: Mastodon é uma rede social baseada em protocolos abertos da web e software livre e gratuito. É descentralizado como e-mail.
@@ -499,7 +499,6 @@ pt:
       x_months: "%{count} meses"
       x_seconds: "%{count} segundos"
   deletes:
-    bad_password_msg: Boa tentativa, hackers! Palavra-passe incorreta
     confirm_password: Introduz a palavra-passe atual para verificar a tua identidade
     proceed: Eliminar conta
     success_msg: A tua conta foi eliminada com sucesso
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index d04d0015f..7deab6021 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -43,7 +43,6 @@ ro:
       x_days: "%{count}z"
       x_months: "%{count}l"
   deletes:
-    bad_password_msg: Bună încercare, hackere! Parolă incorectă
     confirm_password: Introdu parola curentă pentru a-ți verifica identitatea
     proceed: Șterge contul
     success_msg: Contul tău a fost șterg. Nu mai poate fi recuperat :D
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d1ed8d1de..0c1202118 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -273,7 +273,7 @@ ru:
       space: Использовано места
       title: Панель управления
       total_users: всего пользователей
-      trends: Тренды
+      trends: Актуальное
       week_interactions: взаимодействий на этой неделе
       week_users_active: активно на этой неделе
       week_users_new: пользователей на этой неделе
@@ -517,6 +517,8 @@ ru:
       subject: Новая жалоба, узел %{instance} (#%{id})
   appearance:
     advanced_web_interface: Многоколоночный интерфейс
+    confirmation_dialogs: Окна подтверждений
+    discovery: Обзор
     sensitive_content: Чувствительное содержимое
   application_mailer:
     notification_preferences: Изменить настройки e-mail
@@ -583,7 +585,6 @@ ru:
       x_months: "%{count}мес"
       x_seconds: "%{count}сек"
   deletes:
-    bad_password_msg: Не вышло, хакеры! Неверный пароль
     confirm_password: Введите текущий пароль для подтверждения Вашей личности
     proceed: Удалить аккаунт
     success_msg: Ваш аккаунт был успешно удален
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
new file mode 100644
index 000000000..c7677c850
--- /dev/null
+++ b/config/locales/simple_form.br.yml
@@ -0,0 +1 @@
+br:
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 35cebcad8..898d200d2 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -5,6 +5,7 @@ es:
       account_warning_preset:
         text: Puede usar sintaxis de toots, como URLs, hashtags y menciones
       admin_account_action:
+        include_statuses: El usuario verá qué toots han causado la acción de moderación o advertencia
         send_email_notification: El usuario recibirá una explicación de lo que sucedió con respecto a su cuenta
         text_html: Opcional. Puede usar sintaxis de toots. Puede añadir <a href="%{path}">configuraciones predefinidas de advertencia</a> para ahorrar tiempo
         type_html: Elige qué hacer con <strong>%{acct}</strong>
@@ -15,6 +16,7 @@ es:
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
+        discoverable: El directorio del perfil es otra forma en la que su cuenta puede llegar a un público más amplio
         email: Se le enviará un correo de confirmación
         fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
         header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
@@ -47,6 +49,8 @@ es:
         text: Esto nos ayudará a revisar su aplicación
       sessions:
         otp: 'Introduce el código de autenticación de dos factores geberado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
+      tag:
+        name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando se marca, solo se mostrarán los toots en los idiomas seleccionados en los timelines públicos
     labels:
@@ -57,6 +61,7 @@ es:
       account_warning_preset:
         text: Texto predefinido
       admin_account_action:
+        include_statuses: Incluir en el correo electrónico a los toots denunciados
         send_email_notification: Notificar al usuario por correo electrónico
         text: Aviso personalizado
         type: Acción
@@ -111,6 +116,7 @@ es:
         setting_show_application: Mostrar aplicación usada para publicar toots
         setting_system_font_ui: Utilizar la tipografía por defecto del sistema
         setting_theme: Tema del sitio
+        setting_trends: Mostrar las tendencias de hoy
         setting_unfollow_modal: Mostrar diálogo de confirmación antes de dejar de seguir a alguien
         setting_use_blurhash: Mostrar gradientes coloridos para contenido multimedia oculto
         setting_use_pending_items: Modo lento
@@ -136,6 +142,12 @@ es:
         pending_account: Enviar correo electrónico cuando una nueva cuenta necesita revisión
         reblog: Enviar correo electrónico cuando alguien comparta su publicación
         report: Enviar un correo cuando se envía un nuevo informe
+        trending_tag: Enviar correo electrónico cuando una etiqueta no revisada está de tendencia
+      tag:
+        listable: Permitir que esta etiqueta aparezca en las búsquedas y en el directorio del perfil
+        name: Etiqueta
+        trendable: Permitir que esta etiqueta aparezca bajo tendencias
+        usable: Permitir a los toots usar esta etiqueta
     'no': 'No'
     recommended: Recomendado
     required:
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
new file mode 100644
index 000000000..777f4e600
--- /dev/null
+++ b/config/locales/simple_form.nn.yml
@@ -0,0 +1 @@
+nn:
diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt-PT.yml
index 9f9d0fdc2..0ac31f8c2 100644
--- a/config/locales/simple_form.pt.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -1,5 +1,5 @@
 ---
-pt:
+pt-PT:
   simple_form:
     hints:
       account_warning_preset:
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index c4560100a..ab5eb855e 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -97,11 +97,11 @@ ru:
         setting_advanced_layout: Включить многоколоночный интерфейс
         setting_aggregate_reblogs: Группировать продвижения в лентах
         setting_auto_play_gif: Автоматически проигрывать анимированные GIF
-        setting_boost_modal: Показывать диалог подтверждения перед продвижением
+        setting_boost_modal: Всегда спрашивать перед продвижением
         setting_default_language: Язык отправляемых статусов
         setting_default_privacy: Видимость постов
         setting_default_sensitive: Всегда отмечать медиаконтент как чувствительный
-        setting_delete_modal: Показывать диалог подтверждения перед удалением
+        setting_delete_modal: Всегда спрашивать перед удалении поста
         setting_display_media: Отображение медиафайлов
         setting_display_media_default: По умолчанию
         setting_display_media_hide_all: Скрывать все
@@ -114,7 +114,7 @@ ru:
         setting_system_font_ui: Использовать шрифт системы по умолчанию
         setting_theme: Тема сайта
         setting_trends: Показывать сегодняшние тренды
-        setting_unfollow_modal: Показывать диалог подтверждения перед тем, как отписаться от аккаунта
+        setting_unfollow_modal: Всегда спрашивать перед отпиской от аккаунта
         setting_use_blurhash: Показать цветные градиенты для скрытых медиа
         setting_use_pending_items: Медленный режим
         severity: Строгость
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 980e4613e..e6a30f0c3 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -20,7 +20,7 @@ sk:
     extended_description_html: |
       <h3>Pravidlá</h3>
       <p>Žiadne zatiaľ uvedené nie sú</p>
-    federation_hint_html: S účtom na %{instance} budeš môcť následovať ľúdí na hociakom Mastodon serveri, ale aj inde.
+    federation_hint_html: S účtom na %{instance} budeš môcť následovať ľúdí na hociakom Mastodon serveri, ale aj na iných serveroch.
     generic_description: "%{domain} je jeden server v sieti"
     get_apps: Vyskúšaj aplikácie
     hosted_on: Mastodon hostovaný na %{domain}
@@ -28,7 +28,7 @@ sk:
       Tento účet je virtuálnym aktérom, ktorý predstavuje samotný server a nie žiadného jedného užívateľa.
       Je využívaný pre potreby federovania a nemal by byť blokovaný, pokiaľ nechceš zablokovať celý server, čo ide lepšie dosiahnúť cez blokovanie domény.
     learn_more: Zisti viac
-    privacy_policy: Ustanovenia o súkromí
+    privacy_policy: Zásady súkromia
     see_whats_happening: Pozoruj, čo sa deje
     server_stats: 'Serverové štatistiky:'
     source_code: Zdrojový kód
@@ -233,10 +233,12 @@ sk:
       deleted_status: "(zmazaný príspevok)"
       title: Kontrólny záznam
     custom_emojis:
+      assign_category: Priraď kategóriu
       by_domain: Doména
       copied_msg: Miestna kópia emoji bola úspešne vytvorená
       copy: Kopíruj
       copy_failed_msg: Nebolo možné vytvoriť miestnu kópiu tohto emoji
+      create_new_category: Vytvor novú kategóriu
       created_msg: Emoji úspešne vytvorené!
       delete: Zmaž
       destroyed_msg: Emoji úspešne zničené!
@@ -253,6 +255,7 @@ sk:
       shortcode: Skratka
       shortcode_hint: Aspoň 2 znaky, povolené sú alfanumerické, alebo podčiarkovník
       title: Vlastné emoji
+      uncategorized: Nezaradené
       unlisted: Nie je na zozname
       update_failed_msg: Nebolo možné aktualizovať toto emoji
       updated_msg: Emoji bolo úspešne aktualizované!
@@ -580,6 +583,7 @@ sk:
     description:
       prefix_invited_by_user: "@%{name} ťa pozýva na tento Mastodon server!"
       prefix_sign_up: Zaregistruj sa na Mastodone už dnes!
+      suffix: S pomocou účtu budeš môcť následovať ľudí, posielať príspevky, a vymienať si správy s užívateľmi na hociakom Mastodon serveri, ale aj na iných serveroch!
     didnt_get_confirmation: Neobdržal/a si kroky na potvrdenie?
     forgot_password: Zabudnuté heslo?
     invalid_reset_password_token: Token na obnovu hesla vypršal. Prosím vypítaj si nový.
@@ -630,13 +634,15 @@ sk:
       x_months: "%{count}mesiace"
       x_seconds: "%{count}sek"
   deletes:
-    bad_password_msg: Dobrý pokus, hakeri! Nesprávne heslo
     confirm_password: Napíšte svoje terajšie heslo pre overenie vašej identity
     proceed: Vymaž účet
     success_msg: Tvoj účet bol úspešne vymazaný
     warning:
       before: 'Predtým, než budeš pokračovať, prosím pozorne si prečítaj tieto poznámky:'
       caches: Obsah, ktorý bol predčítaný inými servermi môže zanechať pozostatky
+      data_removal: Tvoje príspevky a iné dáta budú natrvalo odstránené
+      more_details_html: Pre viac podrobností, pozri <a href="%{terms_path}">zásady súkromia</a>.
+      username_available: Tvoje užívateľské meno bude znova dostupné
       username_unavailable: Tvoja prezývka ostane neprístupná
   directories:
     directory: Katalóg profilov
@@ -660,10 +666,10 @@ sk:
   domain_validator:
     invalid_domain: nieje správny tvar domény
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': Požiadavka, ktorú si odoslal/a, bola buď nesprávna, alebo znehodnotená.
     '403': Nemáš povolenie pre zobrazenie tejto stránky.
     '404': Stránka ktorú hľadáš nieje tu.
-    '406': This page is not available in the requested format.
+    '406': Táto stránka nie je dostupná v požadovanom formáte.
     '410': Stránka ktorú si tu hľadal/a sa tu už viac nenachádza.
     '422':
       content: Bezpečtnostné overenie zlyhalo. Blokuješ cookies?
@@ -672,7 +678,7 @@ sk:
     '500':
       content: Ospravedlňujem sa. Niečo sa pokazilo na našom konci.
       title: Táto stránka nieje v poriadku
-    '503': The page could not be served due to a temporary server failure.
+    '503': Táto stránka nemôže byť načítaná, kvôli dočasnému výpadku servera.
     noscript_html: Aby bolo možné používať Mastodon web aplikáciu, povoľ prosím JavaScript. Alebo skús jednu z <a href="%{apps_path}"> aplikácii </a> dostupných pre vašu platformu.
   existing_username_validator:
     not_found: nepodarilo sa nájsť miestného užívateľa s takouto prezývkou
@@ -721,6 +727,7 @@ sk:
     all: Všetko
     changes_saved_msg: Zmeny boli úspešne uložené!
     copy: Kopíruj
+    no_batch_actions_available: Na tejto stránke niesú k dispozícii žiadne hromadné akcie
     order_by: Zoraď podľa
     save_changes: Ulož zmeny
     validation_errors:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 02507923b..47b835646 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -591,7 +591,6 @@ sl:
       x_months: "%{count}mo"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Lep poskus, hekerji! napačno geslo
     confirm_password: Vnesite svoje trenutno geslo, da potrdite svojo identiteto
     proceed: Izbriši račun
     success_msg: Vaš račun je bil uspešno izbrisan
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 68754ea24..4e5f37294 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -490,7 +490,6 @@ sq:
       over_x_years: "%{count}v"
       x_months: "%{count}mj"
   deletes:
-    bad_password_msg: Provë e bukur, trimosha! Fjalëkalim i pasaktë
     confirm_password: Jepni fjalëkalimin tuaj të tanishëm që të verifikohet identiteti juaj
     proceed: Fshini llogarinë
     success_msg: Llogaria juaj u fshi me sukses
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index c4a319964..5c06242cc 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -314,7 +314,6 @@ sr-Latn:
       over_x_years: "%{count}god"
       x_months: "%{count}mesec"
   deletes:
-    bad_password_msg: Dobar pokušaj, hakeri! Neispravna lozinka
     confirm_password: Unesite trenutnu lozinku da bismo proverili Vaš identitet
     proceed: Obriši nalog
     success_msg: Vaš nalog je uspešno obrisan
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 992311201..772c04d64 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -510,7 +510,6 @@ sr:
       x_days: "%{count}д"
       x_months: "%{count}месец"
   deletes:
-    bad_password_msg: Добар покушај, хакери! Неисправна лозинка
     confirm_password: Унесите тренутну лозинку да бисмо проверили Ваш идентитет
     proceed: Обриши налог
     success_msg: Ваш налог је успешно обрисан
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 029704671..a71ea9e18 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -377,7 +377,6 @@ sv:
       x_months: "%{count}mån"
       x_seconds: "%{count}sek"
   deletes:
-    bad_password_msg: Bra försök, hackare! Fel lösenord
     confirm_password: Ange ditt lösenord för att verifiera din identitet
     proceed: Ta bort konto
     success_msg: Ditt konto har tagits bort
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f27c06617..97ef41460 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -48,6 +48,7 @@ th:
     media: สื่อ
     moved_html: "%{name} ได้ย้ายไปยัง %{new_profile_link}:"
     network_hidden: ไม่มีข้อมูลนี้
+    never_active: ไม่เลย
     nothing_here: ไม่มีสิ่งใดที่นี่!
     people_followed_by: ผู้คนที่ %{name} ติดตาม
     people_who_follow: ผู้คนที่ติดตาม %{name}
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 564b21db1..5edbbd194 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -633,7 +633,6 @@ uk:
       x_months: "%{count}міс"
       x_seconds: "%{count}сек"
   deletes:
-    bad_password_msg: Гарна спроба, гакери! Неправильний пароль
     confirm_password: Введіть актуальний пароль, щоб перевірити що ви це ви
     proceed: Видалити обліковий запис
     success_msg: Ваш обліковий запис було успішно видалено
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d2549bcb4..9c6fd27e8 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -586,7 +586,6 @@ zh-CN:
       x_months: "%{count}个月"
       x_seconds: "%{count}秒"
   deletes:
-    bad_password_msg: 想得美,黑客!密码输入错误
     confirm_password: 输入你当前的密码来验证身份
     proceed: 删除帐户
     success_msg: 你的帐户已经成功删除
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 75202fa68..2c59b3f07 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -391,7 +391,6 @@ zh-HK:
       x_months: "%{count}個月"
       x_seconds: "%{count}秒"
   deletes:
-    bad_password_msg: 想得美,黑客!密碼輸入錯誤
     confirm_password: 輸入你現在的密碼來驗證身份
     proceed: 刪除帳戶
     success_msg: 你的帳戶已經成功刪除
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 95f7d7f9a..8bdbf87aa 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -465,7 +465,6 @@ zh-TW:
       x_months: "%{count}個月"
       x_seconds: "%{count}秒"
   deletes:
-    bad_password_msg: 想得美,駭客! 密碼輸入錯誤
     confirm_password: 輸入你現在的密碼來驗證身份
     proceed: 刪除帳戶
     success_msg: 你的帳戶已經成功刪除