From 093103e5b383535efa69bb6866afb0fc127e7d31 Mon Sep 17 00:00:00 2001 From: asonix Date: Sat, 1 Sep 2018 11:57:57 -0500 Subject: [PATCH] Update translations --- app/javascript/mastodon/locales/dog.json | 20 ++++++++++++++++---- app/javascript/mastodon/locales/lion.json | 20 ++++++++++++++++---- app/javascript/mastodon/locales/squeak.json | 11 +++++++++++ config/locales/dog.yml | 2 ++ config/locales/lion.yml | 2 ++ config/locales/squeak.yml | 2 ++ 6 files changed, 49 insertions(+), 8 deletions(-) diff --git a/app/javascript/mastodon/locales/dog.json b/app/javascript/mastodon/locales/dog.json index d44b94968..dea8d5129 100644 --- a/app/javascript/mastodon/locales/dog.json +++ b/app/javascript/mastodon/locales/dog.json @@ -4,7 +4,7 @@ "account.block_domain": "Hide everything from {domain}", "account.blocked": "Blocked", "account.direct": "Direct message @{name}", - "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", + "account.disclaimer_full": "Information below may reflect the dog's profile incompletely.", "account.domain_blocked": "Domain hidden", "account.edit_profile": "Edit profile", "account.endorse": "Feature on profile", @@ -24,7 +24,7 @@ "account.posts": "Toots", "account.posts_with_replies": "Toots with barks", "account.report": "Report @{name}", - "account.requested": "Awaiting approval. Click to cancel follow request", + "account.requested": "Awaiting approval. Click to cancel pack request", "account.share": "Share @{name}'s profile", "account.show_reblogs": "Show awoos from @{name}", "account.unblock": "Unblock @{name}", @@ -137,20 +137,32 @@ "home.column_settings.show_reblogs": "Show awoos", "home.column_settings.show_replies": "Show barks", "keyboard_shortcuts.back": "to navigate back", + "keyboard_shortcuts.blocked": "to open blocked dogs list", "keyboard_shortcuts.boost": "to awoo", "keyboard_shortcuts.column": "to focus a status in one of the columns", "keyboard_shortcuts.compose": "to focus the compose textarea", "keyboard_shortcuts.description": "Description", + "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", "keyboard_shortcuts.favourite": "to boop", + "keyboard_shortcuts.favourites": "to open boops list", + "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard shortcuts", + "keyboard_shortcuts.home": "to open home timeline", "keyboard_shortcuts.hotkey": "Hotkey", "keyboard_shortcuts.legend": "to display this legend", + "keyboard_shortcuts.local": "to open local timeline", "keyboard_shortcuts.mention": "to mention author", + "keyboard_shortcuts.muted": "to open muted dogs list", + "keyboard_shortcuts.my_profile": "to open your profile", + "keyboard_shortcuts.notifications": "to open notifications column", + "keyboard_shortcuts.pinned": "to open pinned toots list", "keyboard_shortcuts.profile": "to open author's profile", "keyboard_shortcuts.reply": "to reply", + "keyboard_shortcuts.requests": "to open pack requests list", "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.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", @@ -170,7 +182,7 @@ "media_gallery.toggle_visible": "Toggle visibility", "missing_indicator.label": "Not found", "missing_indicator.sublabel": "This resource could not be found", - "mute_modal.hide_notifications": "Hide notifications from this user?", + "mute_modal.hide_notifications": "Hide notifications from this dog?", "navigation_bar.apps": "Mobile apps", "navigation_bar.blocks": "Blocked dogs", "navigation_bar.community_timeline": "Local timeline", @@ -258,7 +270,7 @@ "search_popout.tips.hashtag": "hashtag", "search_popout.tips.status": "status", "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags", - "search_popout.tips.user": "user", + "search_popout.tips.user": "dog", "search_results.accounts": "Dogs", "search_results.hashtags": "Hashtags", "search_results.statuses": "Toots", diff --git a/app/javascript/mastodon/locales/lion.json b/app/javascript/mastodon/locales/lion.json index 6a4e588b7..bf3c16a8d 100644 --- a/app/javascript/mastodon/locales/lion.json +++ b/app/javascript/mastodon/locales/lion.json @@ -4,7 +4,7 @@ "account.block_domain": "Hide everything from {domain}", "account.blocked": "Blocked", "account.direct": "Direct message @{name}", - "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", + "account.disclaimer_full": "Information below may reflect the lion's profile incompletely.", "account.domain_blocked": "Domain hidden", "account.edit_profile": "Edit profile", "account.endorse": "Feature on profile", @@ -24,7 +24,7 @@ "account.posts": "Toots", "account.posts_with_replies": "Toots with meows", "account.report": "Report @{name}", - "account.requested": "Awaiting approval. Click to cancel follow request", + "account.requested": "Awaiting approval. Click to cancel pride request", "account.share": "Share @{name}'s profile", "account.show_reblogs": "Show roars from @{name}", "account.unblock": "Unblock @{name}", @@ -137,20 +137,32 @@ "home.column_settings.show_reblogs": "Show roars", "home.column_settings.show_replies": "Show meows", "keyboard_shortcuts.back": "to navigate back", + "keyboard_shortcuts.blocked": "to open blocked dogs list", "keyboard_shortcuts.boost": "to boost", "keyboard_shortcuts.column": "to focus a status in one of the columns", "keyboard_shortcuts.compose": "to focus the compose textarea", "keyboard_shortcuts.description": "Description", + "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", "keyboard_shortcuts.favourite": "to favourite", + "keyboard_shortcuts.favourites": "to open boops list", + "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard shortcuts", + "keyboard_shortcuts.home": "to open home timeline", "keyboard_shortcuts.hotkey": "Hotkey", "keyboard_shortcuts.legend": "to display this legend", + "keyboard_shortcuts.local": "to open local timeline", "keyboard_shortcuts.mention": "to mention author", + "keyboard_shortcuts.muted": "to open muted lions list", + "keyboard_shortcuts.my_profile": "to open your profile", + "keyboard_shortcuts.notifications": "to open notifications column", + "keyboard_shortcuts.pinned": "to open pinned toots list", "keyboard_shortcuts.profile": "to open author's profile", "keyboard_shortcuts.reply": "to reply", + "keyboard_shortcuts.requests": "to open pride requests list", "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.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", @@ -170,7 +182,7 @@ "media_gallery.toggle_visible": "Toggle visibility", "missing_indicator.label": "Not found", "missing_indicator.sublabel": "This resource could not be found", - "mute_modal.hide_notifications": "Hide notifications from this user?", + "mute_modal.hide_notifications": "Hide notifications from this lion?", "navigation_bar.apps": "Mobile apps", "navigation_bar.blocks": "Blocked lions", "navigation_bar.community_timeline": "Local timeline", @@ -258,7 +270,7 @@ "search_popout.tips.hashtag": "hashtag", "search_popout.tips.status": "status", "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags", - "search_popout.tips.user": "user", + "search_popout.tips.user": "lion", "search_results.accounts": "Lions", "search_results.hashtags": "Hashtags", "search_results.statuses": "Toots", diff --git a/app/javascript/mastodon/locales/squeak.json b/app/javascript/mastodon/locales/squeak.json index 97b59d0f2..6a4faf932 100644 --- a/app/javascript/mastodon/locales/squeak.json +++ b/app/javascript/mastodon/locales/squeak.json @@ -137,6 +137,7 @@ "home.column_settings.show_reblogs": "Show pumps", "home.column_settings.show_replies": "Show replies", "keyboard_shortcuts.back": "to navigate back", + "keyboard_shortcuts.blocked": "to open blocked users list", "keyboard_shortcuts.boost": "to pump", "keyboard_shortcuts.column": "to focus a status in one of the columns", "keyboard_shortcuts.compose": "to focus the compose textarea", @@ -144,13 +145,23 @@ "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", "keyboard_shortcuts.favourite": "to squeak", + "keyboard_shortcuts.favourites": "to open squeaks list", + "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard shortcuts", + "keyboard_shortcuts.home": "to open home timeline", "keyboard_shortcuts.hotkey": "Hotkey", "keyboard_shortcuts.legend": "to display this legend", + "keyboard_shortcuts.local": "to open local timeline", "keyboard_shortcuts.mention": "to mention author", + "keyboard_shortcuts.muted": "to open muted users list", + "keyboard_shortcuts.my_profile": "to open your profile", + "keyboard_shortcuts.notifications": "to open notifications column", + "keyboard_shortcuts.pinned": "to open pinned toots list", "keyboard_shortcuts.profile": "to open author's profile", "keyboard_shortcuts.reply": "to reply", + "keyboard_shortcuts.requests": "to open follow requests list", "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.toot": "to start a brand new toot", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", diff --git a/config/locales/dog.yml b/config/locales/dog.yml index 2e308758e..2270fdaa8 100644 --- a/config/locales/dog.yml +++ b/config/locales/dog.yml @@ -303,6 +303,8 @@ dog: description_html: A federation relay is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. It can help small and medium servers discover content from the fediverse, which would otherwise require local dogs manually following other people on remote servers. enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it. inbox_url: Relay URL + pending: Waiting for relay's approval + save_and_enable: Save and enable setup: Setup a relay connection status: Status title: Relays diff --git a/config/locales/lion.yml b/config/locales/lion.yml index 4a7c8e9e6..099624dc0 100644 --- a/config/locales/lion.yml +++ b/config/locales/lion.yml @@ -303,6 +303,8 @@ lion: description_html: A federation relay is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. It can help small and medium servers discover content from the fediverse, which would otherwise require local users manually following other people on remote servers. enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it. inbox_url: Relay URL + pending: Waiting for relay's approval + save_and_enable: Save and enable setup: Setup a relay connection status: Status title: Relays diff --git a/config/locales/squeak.yml b/config/locales/squeak.yml index 2aa92c8ee..3c5bc23a1 100644 --- a/config/locales/squeak.yml +++ b/config/locales/squeak.yml @@ -303,6 +303,8 @@ squeak: description_html: A federation relay is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. It can help small and medium servers discover content from the fediverse, which would otherwise require local users manually following other people on remote servers. enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it. inbox_url: Relay URL + pending: Waiting for relay's approval + save_and_enable: Save and enable setup: Setup a relay connection status: Status title: Relays