about summary refs log tree commit diff
path: root/config/locales/simple_form.gl.yml
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2018-03-03 13:40:00 -0500
committerGitHub <noreply@github.com>2018-03-03 13:40:00 -0500
commit43a9a781a443a6b9296431fbcc4285b3ca6a1a57 (patch)
treed4bf067aeedcebbdc3d160eca6aa1a7c7d1bfa00 /config/locales/simple_form.gl.yml
parentee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff)
parent65e2a4645e086110072efed5b3d4d1434c933e04 (diff)
Merge pull request #377 from glitch-soc/merge-upstream
hhhhhhhhhnnnnnnnnnnnghh!!!!!
Diffstat (limited to 'config/locales/simple_form.gl.yml')
-rw-r--r--config/locales/simple_form.gl.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 2e51cf691..57eaf5016 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -45,6 +45,7 @@ gl:
         setting_default_privacy: Intimidade da publicación
         setting_default_sensitive: Marcar sempre multimedia como sensible
         setting_delete_modal: Solicitar confirmación antes de eliminar unha mensaxe
+        setting_display_sensitive_media: Mostrar sempre os medios marcados como sensibles
         setting_noindex: Pedir non aparecer nas buscas dos motores de busca
         setting_reduce_motion: Reducir o movemento nas animacións
         setting_system_font_ui: Utilizar a tipografía por defecto do sistema
@@ -53,6 +54,7 @@ gl:
         severity: Severidade
         type: Tipo de importación
         username: Nome de usuaria
+        username_or_email: Nome de usuaria ou Correo-e
       interactions:
         must_be_follower: Bloquear as notificacións de non-seguidoras
         must_be_following: Bloquea as notificacións de personas que non segue