diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
| commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
| tree | ef366f436ed5180489cc9377268e10328fe9a932 /config/locales/activerecord.br.yml | |
| parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
| parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Diffstat (limited to 'config/locales/activerecord.br.yml')
| -rw-r--r-- | config/locales/activerecord.br.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/activerecord.br.yml b/config/locales/activerecord.br.yml index 77fc4f2a1..a7eab580c 100644 --- a/config/locales/activerecord.br.yml +++ b/config/locales/activerecord.br.yml @@ -10,4 +10,8 @@ br: account: attributes: username: - invalid: nemet lizherennoù, niverennoù ha isbarrennigoù + invalid: nemet lizherennoù, niverennoù hag isbarrennigoù + status: + attributes: + reblog: + taken: eus ar statud a zo dija |