diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-13 18:13:43 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-13 18:13:43 +0200 |
| commit | 74c5b2bd08f844aac03ca6f9653bac4f4eea3a43 (patch) | |
| tree | ef0f56bc549ae22b134c749decadbd69f783b7e4 /config/locales/ast.yml | |
| parent | c7f71b974f1a57cd93f86e5a678018d4aea8e728 (diff) | |
| parent | 18331fefa2246facc818226043b1f9cc67cf6c1a (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)
Diffstat (limited to 'config/locales/ast.yml')
| -rw-r--r-- | config/locales/ast.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 30390c163..e801d4b51 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -133,19 +133,18 @@ ast: deletes: bad_password_msg: "¡Bon intentu, crackers! Contraseña incorreuta" confirm_password: Introduz la contraseña pa verificar la to identidá - directories: - people: - one: "%{count} persona" - other: "%{count} persones" errors: + '400': The request you submitted was invalid or malformed. '403': Nun tienes permisu pa ver esta páxina. '404': La páxina que tabes guetando nun esiste. + '406': This page is not available in the requested format. '410': La páxina que tabes guetando yá nun esiste. '422': content: Falló la verificación de seguranza. ¿Tas bloquiando les cookies? title: Falló la verificación de seguranza '429': Ficiéronse milenta solicitúes '500': + '503': The page could not be served due to a temporary server failure. exports: archive_takeout: date: Data |