From 68265482ace5ab3b128acf201f6ee4e44c82e5fd Mon Sep 17 00:00:00 2001 From: Riley Trautman Date: Tue, 13 Mar 2018 10:39:35 -0500 Subject: [PATCH] Fix and update locales --- app/javascript/mastodon/locales/dog.json | 16 ++++++++++------ app/javascript/mastodon/locales/lion.json | 18 +++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/javascript/mastodon/locales/dog.json b/app/javascript/mastodon/locales/dog.json index 153f0a954..a9999ee4f 100644 --- a/app/javascript/mastodon/locales/dog.json +++ b/app/javascript/mastodon/locales/dog.json @@ -54,14 +54,16 @@ "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", - "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can join your pack to view your pack-only toots.", + "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can join your pack to view your pack-only posts.", "compose_form.lock_disclaimer.lock": "locked", "compose_form.placeholder": "Bark???", "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", - "compose_form.sensitive": "Mark media as sensitive", - "compose_form.spoiler": "Hide text behind warning", + "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", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Write your warning here", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block", @@ -179,7 +181,7 @@ "onboarding.page_four.home": "The home timeline shows toots from people you follow.", "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.", "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.", - "onboarding.page_one.handle": "You are on {domain}, so your full handle is {handle}", + "onboarding.page_one.full_handle": "Your full handle", "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.", "onboarding.page_one.welcome": "Welcome to Mastodon!", "onboarding.page_six.admin": "Your instance's admin is {admin}.", @@ -229,7 +231,7 @@ "search_results.statuses": "Toots", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", "standalone.public_title": "A look inside...", - "status.cannot_reblog": "This toot cannot be awooed", + "status.block": "Block @{name}", "status.cannot_reblog": "This toot cannot be awooed", "status.delete": "Delete", "status.embed": "Embed", @@ -242,17 +244,19 @@ "status.mute_conversation": "Mute conversation", "status.open": "Expand this toot", "status.pin": "Pin on profile", + "status.pinned": "Pinned toot", "status.reblog": "Awoo", "status.reblogged_by": "{name} awooed", "status.reply": "Bark", - "status.replyAll": "Bark at thread", "status.replyAll": "Bark in thread", "status.report": "Report @{name}", "status.sensitive_toggle": "Click to view", "status.sensitive_warning": "Sensitive content", "status.share": "Share", "status.show_less": "Show less", + "status.show_less_all": "Show less for all", "status.show_more": "Show more", + "status.show_more_all": "Show more for all", "status.unmute_conversation": "Unmute conversation", "status.unpin": "Unpin from profile", "tabs_bar.federated_timeline": "Federated", diff --git a/app/javascript/mastodon/locales/lion.json b/app/javascript/mastodon/locales/lion.json index 281fe7eee..bd70ccce7 100644 --- a/app/javascript/mastodon/locales/lion.json +++ b/app/javascript/mastodon/locales/lion.json @@ -54,14 +54,16 @@ "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", + "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can join your pride to view your pride-only toots.", - "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can join your pride to view your pride-only posts.", "compose_form.lock_disclaimer.lock": "locked", "compose_form.placeholder": "Meow???", "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", - "compose_form.sensitive": "Mark media as sensitive", - "compose_form.spoiler": "Hide text behind warning", + "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", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Write your warning here", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block", @@ -179,7 +181,7 @@ "onboarding.page_four.home": "The home timeline shows toots from people you follow.", "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.", "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.", - "onboarding.page_one.handle": "You are on {domain}, so your full handle is {handle}", + "onboarding.page_one.full_handle": "Your full handle", "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.", "onboarding.page_one.welcome": "Welcome to Mastodon!", "onboarding.page_six.admin": "Your instance's admin is {admin}.", @@ -229,7 +231,7 @@ "search_results.statuses": "Toots", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", "standalone.public_title": "A look inside...", - "status.cannot_reblog": "This toot cannot be roared", + "status.block": "Block @{name}", "status.cannot_reblog": "This toot cannot be roared", "status.delete": "Delete", "status.embed": "Embed", @@ -242,17 +244,19 @@ "status.mute_conversation": "Mute conversation", "status.open": "Expand this toot", "status.pin": "Pin on profile", + "status.pinned": "Pinned toot", "status.reblog": "Roar", "status.reblogged_by": "{name} roared", "status.reply": "Meow", - "status.replyAll": "Meow at thread", - "status.replyAll": "Reply to thread", + "status.replyAll": "Meow in thread", "status.report": "Report @{name}", "status.sensitive_toggle": "Click to view", "status.sensitive_warning": "Sensitive content", "status.share": "Share", "status.show_less": "Show less", + "status.show_less_all": "Show less for all", "status.show_more": "Show more", + "status.show_more_all": "Show more for all", "status.unmute_conversation": "Unmute conversation", "status.unpin": "Unpin from profile", "tabs_bar.federated_timeline": "Federated",