diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-16 21:52:38 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-16 21:52:38 +0200 |
| commit | 78ac246b877072bb5f94da34d29612fafde3a8ae (patch) | |
| tree | e1b781fe4fae9d02284e5e836338cc598431413f /config/locales/gl.yml | |
| parent | 80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff) | |
| parent | 6bed372ad2d8da87f0f3cfa478e688c48aa94702 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn
Diffstat (limited to 'config/locales/gl.yml')
| -rw-r--r-- | config/locales/gl.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/gl.yml b/config/locales/gl.yml index a33eb1251..201f83087 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -682,6 +682,7 @@ gl: video: one: "%{count} vídeo" other: "%{count} vídeos" + boosted_from_html: Promovida desde %{acct_link} content_warning: 'Aviso sobre o contido: %{warning}' disallowed_hashtags: one: 'contiña unha etiqueta non permitida: %{tags}' |