diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
| commit | a942ad3062285b6b4984fe92f9bd610829f04456 (patch) | |
| tree | 2476b65436959dda09871ee96edca53b53201b96 /config/locales/sr-Latn.yml | |
| parent | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (diff) | |
| parent | 32f950a7a8d3acfed43d76cb21d0fc06a471bafe (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
Diffstat (limited to 'config/locales/sr-Latn.yml')
| -rw-r--r-- | config/locales/sr-Latn.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 12867f4eb..1e32190cc 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -199,7 +199,7 @@ sr-Latn: suspend: Suspenzija title: Novo blokiranje domena reject_media: Odbaci multimediju - reject_media_hint: Uklanja lokalno uskladištene multimedijske fajlove i odbija da ih skida na dalje. Nebitno je za suspenziju. + reject_media_hint: Uklanja lokalno uskladištene multimedijske fajlove i odbija da ih skida na dalje. Nebitno je za suspenziju severities: noop: Ništa silence: Ućutkavanje |