From 66bddf35fc6049d7f5aeb41dfb0d5a96ab0abdb2 Mon Sep 17 00:00:00 2001 From: Riley Trautman Date: Fri, 8 Jun 2018 14:27:57 -0500 Subject: [PATCH] Update locales for 2.4.1rc3 --- app/javascript/mastodon/locales/dog.json | 13 +++++++++---- app/javascript/mastodon/locales/lion.json | 15 ++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/javascript/mastodon/locales/dog.json b/app/javascript/mastodon/locales/dog.json index dcf919e0b..c8f45ba35 100644 --- a/app/javascript/mastodon/locales/dog.json +++ b/app/javascript/mastodon/locales/dog.json @@ -58,7 +58,6 @@ "column_header.pin": "Pin", "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", - "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.", "compose_form.direct_message_warning_learn_more": "Learn more", @@ -84,6 +83,8 @@ "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.", "confirmations.mute.confirm": "Mute", "confirmations.mute.message": "Are you sure you want to mute {name}?", + "confirmations.redraft.confirm": "Delete & redraft", + "confirmations.redraft.message": "Are you sure you want to delete this toot and re-draft it? You will lose all barks, awoos, and boops to it.", "confirmations.unfollow.confirm": "Leave Pack", "confirmations.unfollow.message": "Are you sure you want to leave {name}'s pack?", "embed.instructions": "Embed this toot on your website by copying the code below.", @@ -112,11 +113,10 @@ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up", "follow_request.authorize": "Authorize", "follow_request.reject": "Reject", - "getting_started.appsshort": "Apps", - "getting_started.faq": "FAQ", + "getting_started.documentation": "Documentation", "getting_started.heading": "Getting started", "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", - "getting_started.userguide": "User Guide", + "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic", "home.column_settings.filter_regex": "Filter out by regular expressions", @@ -160,6 +160,7 @@ "navigation_bar.blocks": "Blocked users", "navigation_bar.community_timeline": "Local timeline", "navigation_bar.direct": "Direct messages", + "navigation_bar.discover": "Discover", "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "Edit profile", "navigation_bar.favourites": "Boops", @@ -169,9 +170,11 @@ "navigation_bar.lists": "Lists", "navigation_bar.logout": "Logout", "navigation_bar.mutes": "Muted users", + "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferences", "navigation_bar.public_timeline": "Federated timeline", + "navigation_bar.security": "Security", "notification.favourite": "{name} booped your toot", "notification.follow": "{name} joined your pack", "notification.mention": "{name} barked at you", @@ -263,6 +266,7 @@ "status.reblog": "Awoo", "status.reblog_private": "Awoo to original audience", "status.reblogged_by": "{name} awooed", + "status.redraft": "Delete & re-draft", "status.reply": "Bark", "status.replyAll": "Bark in thread", "status.report": "Report @{name}", @@ -282,6 +286,7 @@ "tabs_bar.search": "Search", "timeline.media": "Media", "timeline.posts": "Toots", + "trends.count_by_accounts": "{count} {rawCount, plural, one {dog} other {dogs}} barking", "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", "upload_area.title": "Drag & drop to upload", "upload_button.label": "Add media", diff --git a/app/javascript/mastodon/locales/lion.json b/app/javascript/mastodon/locales/lion.json index 4133b554e..33a981248 100644 --- a/app/javascript/mastodon/locales/lion.json +++ b/app/javascript/mastodon/locales/lion.json @@ -58,7 +58,6 @@ "column_header.pin": "Pin", "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", - "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.", "compose_form.direct_message_warning_learn_more": "Learn more", @@ -84,6 +83,8 @@ "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.", "confirmations.mute.confirm": "Mute", "confirmations.mute.message": "Are you sure you want to mute {name}?", + "confirmations.redraft.confirm": "Delete & redraft", + "confirmations.redraft.message": "Are you sure you want to delete this toot and re-draft it? You will lose all meows, roars, and boops to it.", "confirmations.unfollow.confirm": "Leave Pride", "confirmations.unfollow.message": "Are you sure you want to leave {name}'s pride?", "embed.instructions": "Embed this toot on your website by copying the code below.", @@ -112,11 +113,10 @@ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up", "follow_request.authorize": "Authorize", "follow_request.reject": "Reject", - "getting_started.appsshort": "Apps", - "getting_started.faq": "FAQ", + "getting_started.documentation": "Documentation", "getting_started.heading": "Getting started", "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", - "getting_started.userguide": "User Guide", + "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic", "home.column_settings.filter_regex": "Filter out by regular expressions", @@ -160,6 +160,7 @@ "navigation_bar.blocks": "Blocked users", "navigation_bar.community_timeline": "Local timeline", "navigation_bar.direct": "Direct messages", + "navigation_bar.discover": "Discover", "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "Edit profile", "navigation_bar.favourites": "Boops", @@ -169,9 +170,11 @@ "navigation_bar.lists": "Lists", "navigation_bar.logout": "Logout", "navigation_bar.mutes": "Muted users", + "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned toots", "navigation_bar.preferences": "Preferences", "navigation_bar.public_timeline": "Federated timeline", + "navigation_bar.security": "Security", "notification.favourite": "{name} booped your toot", "notification.follow": "{name} joined your pride", "notification.mention": "{name} meowed at you", @@ -263,6 +266,7 @@ "status.reblog": "Roar", "status.reblog_private": "Roar to original audience", "status.reblogged_by": "{name} roared", + "status.redraft": "Delete & re-draft", "status.reply": "Meow", "status.replyAll": "Meow in thread", "status.report": "Report @{name}", @@ -282,12 +286,13 @@ "tabs_bar.search": "Search", "timeline.media": "Media", "timeline.posts": "Toots", + "trends.count_by_accounts": "{count} {rawCount, plural, one {lion} other {lions}} meowing", "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", "upload_area.title": "Drag & drop to upload", "upload_button.label": "Add media", "upload_form.description": "Describe for the visually impaired", "upload_form.focus": "Crop", - "upload_form.undo": "Undo", + "upload_form.undo": "Delete", "upload_progress.label": "Uploading...", "video.close": "Close video", "video.exit_fullscreen": "Exit full screen",