diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
| commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
| tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /config/locales/ast.yml | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Diffstat (limited to 'config/locales/ast.yml')
| -rw-r--r-- | config/locales/ast.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 6c757558e..d64f6b005 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -305,6 +305,7 @@ ast: errors: already_voted: Yá votesti nesta encuesta expired: La encuesta yá finó + invalid_choice: El la opción de votu escoyida nun esiste preferences: public_timelines: Llinies temporales públiques relationships: |