diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 19:12:10 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 21:00:30 +0100 |
| commit | a2a64ecd3e3551707412c47f0d16e484dea25632 (patch) | |
| tree | bc4e0b8e0ca2a2735f527bff8bd73421c0ff72dd /config/locales/ast.yml | |
| parent | fb0c906c717f2b21bb63610742a357850142b522 (diff) | |
| parent | 70801b850c78d7879182eeba4eae509af42fafeb (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
Diffstat (limited to 'config/locales/ast.yml')
| -rw-r--r-- | config/locales/ast.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/ast.yml b/config/locales/ast.yml index c18c398eb..78ad796a0 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -96,8 +96,6 @@ ast: email_domain_blocks: domain: Dominiu instances: - account_count: Cuentes conocíes - domain_name: Dominiu title: Instancies conocíes invites: filter: @@ -268,9 +266,6 @@ ast: no_account_html: "¿Nun tienes una cuenta? Pues <a href='%{sign_up_path}' target='_blank'>rexistrate equí</a>" proceed: Siguir prompt: 'Vas siguir a:' - remote_interaction: - proceed: Interactuar - prompt: 'Quies interactuar con esti toot:' remote_unfollow: error: Fallu sessions: |