about summary refs log tree commit diff
path: root/app/javascript/mastodon/locales/hr.json
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-06-10 23:01:56 +0200
committerGitHub <noreply@github.com>2019-06-10 23:01:56 +0200
commitc64eef12069c3476f9956dfaaf6a3a9f91c14e2d (patch)
treec8048db1bc718663c5ed33c8b225544d5e37f98b /app/javascript/mastodon/locales/hr.json
parentb45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff)
parent7778de467cd35fa4a514dd97ced0d19675f3b9d9 (diff)
Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/locales/hr.json')
-rw-r--r--app/javascript/mastodon/locales/hr.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 5353cb572..9f0ad1985 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -204,6 +204,7 @@
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
@@ -236,6 +237,7 @@
   "navigation_bar.favourites": "Favoriti",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Zahtjevi za slijeđenje",
+  "navigation_bar.follows_and_followers": "Follows and followers",
   "navigation_bar.info": "Više informacija",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
   "navigation_bar.lists": "Lists",
@@ -244,6 +246,7 @@
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Postavke",
+  "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.public_timeline": "Federalni timeline",
   "navigation_bar.security": "Security",
   "notification.favourite": "{name} je lajkao tvoj status",