diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-26 20:36:49 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-26 20:41:43 +0200 |
commit | 5bb8563f6c0ec9021d6e70d85544147e6c2d0f44 (patch) | |
tree | 96a939def53ee44f19d28c66f1d1f2195806ccc2 /config/locales/simple_form.ast.yml | |
parent | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (diff) | |
parent | 82e7988afcde5b19b99ad9ecf7973560a8a17f7f (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
Diffstat (limited to 'config/locales/simple_form.ast.yml')
-rw-r--r-- | config/locales/simple_form.ast.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml index a6b3e0733..0d78f419f 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -6,13 +6,7 @@ ast: autofollow: La xente que se rexistre pente la invitación va siguite automáticamente bot: Esta cuenta fai principalmente aiciones automatizaes y podría nun supervisase digest: Namái s'unvia tres un periodu llargu d'inactividá y namái si recibiesti cualesquier mensaxe personal na to ausencia - display_name: - one: Queda <span class="name-counter">1</span> caráuter - other: Queden <span class="name-counter">%{count}</span> caráuteres irreversible: Los toots peñeraos van desapaecer de mou irreversible, magar que se desanicie la peñera dempués - note: - one: Queda <span class="note-counter">1</span> caráuter - other: Queden <span class="note-counter">%{count}</span> caráuteres setting_hide_network: La xente que sigas y teas siguiendo nun va amosase nel perfil setting_theme: Afeuta al aspeutu de Mastodon cuando anicies sesión dende cualesquier preséu. labels: |