diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 18:30:41 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 18:59:53 +0200 |
commit | 1b0ff4cd69b00f0d2613be45cc233e25dc1a0d05 (patch) | |
tree | 1b67879adb426809f3e00102fc2f97a8118b011e /config/locales/simple_form.ast.yml | |
parent | b45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff) | |
parent | 8514ef723c3e3963567a9d57bd0d71a5091fc802 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb
Diffstat (limited to 'config/locales/simple_form.ast.yml')
-rw-r--r-- | config/locales/simple_form.ast.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml index b91d5780a..41102d23f 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -10,7 +10,6 @@ ast: irreversible: Los toots peñeraos van desapaecer de mou irreversible, magar que se desanicie la peñera dempués password: Usa 8 caráuteres polo menos 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. username: El nome d'usuariu va ser únicu en %{domain} imports: data: El ficheru CSV esportáu dende otra instancia de Mastodon |