diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
| commit | 91bef4759f40422b64d7990f9b90db0b493773b1 (patch) | |
| tree | 3211b1014a6d0a88737db16c44d210ef96a070e4 /config/locales/sr-Latn.yml | |
| parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
| parent | 554f659f2aa1eb9c0ca64ec1c9c177538434826c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js
Diffstat (limited to 'config/locales/sr-Latn.yml')
| -rw-r--r-- | config/locales/sr-Latn.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index d9813db47..800fe5414 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -246,20 +246,16 @@ sr-Latn: are_you_sure: Da li ste sigurni? comment: none: Ništa - id: ID mark_as_resolved: Označi kao rešen report: 'Prijava #%{id}' - report_contents: Sadržaj reported_account: Prijavljeni nalog reported_by: Prijavio resolved: Rešeni silence_account: Ućutkaj nalog status: Status suspend_account: Suspenduj nalog - target: Cilj title: Prijave unresolved: Nerešeni - view: Pogledaj settings: bootstrap_timeline_accounts: desc_html: Odvojite više korisničkih imena zarezom. Radi samo za lokalne i otključane naloge. Ako je prazno, onda se odnosi na sve lokalne administratore. |