diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 19:01:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 19:01:30 +0200 |
| commit | c0dc247bcee9080989d5e5354e54f9d320be1f13 (patch) | |
| tree | 708074cbed581c48d619008f8ed58d962e0f15b7 /app/javascript/mastodon/locales/hu.json | |
| parent | 0744d6e57186292e751026fbb749728d56a8ed2d (diff) | |
| parent | 89d600bedb023a9656b98d22deab10f8c051a664 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
Diffstat (limited to 'app/javascript/mastodon/locales/hu.json')
| -rw-r--r-- | app/javascript/mastodon/locales/hu.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index c5b0831c3..b906dd619 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -77,6 +77,7 @@ "compose_form.poll.remove_option": "Remove this choice", "compose_form.publish": "Tülk", "compose_form.publish_loud": "{publish}!", + "compose_form.sensitive.hide": "Mark media as sensitive", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", "compose_form.spoiler.marked": "Text is hidden behind warning", @@ -209,6 +210,7 @@ "lightbox.close": "Bezárás", "lightbox.next": "Következő", "lightbox.previous": "Előző", + "lightbox.view_context": "View context", "lists.account.add": "Hozzáadás a listához", "lists.account.remove": "Eltávolít a listából", "lists.delete": "Lista törlése", @@ -340,7 +342,6 @@ "status.reply": "Válasz", "status.replyAll": "Válaszolj a beszélgetésre", "status.report": "Report @{name}", - "status.sensitive_toggle": "Katt a megtekintéshez", "status.sensitive_warning": "Érzékeny tartalom", "status.share": "Megosztás", "status.show_less": "Kevesebb", |