diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 0cfde7edc6938880a9d2f587ee6bcf14d865c6a9..2b3fd1263a862dc7b7180334aa2dd1a2d3d464b2 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -42,7 +42,8 @@ module SettingsHelper
no: 'Norsk',
oc: 'Occitan',
pl: 'Polski',
- pt: 'Português (Portugal)',
+ pt: 'Português',
+ 'pt-PT': 'Português (Portugal)',
'pt-BR': 'Português (Brasil)',
ro: 'Română',
ru: 'РуÑÑкий',
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 6424cd1a797319683bd41d80cd6ee325e3a0a6cb..ce66a5d1c605669ac407ba2f89627729c46bad36 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -63,6 +63,7 @@
"column.notifications": "الإخطارات",
"column.pins": "التبويقات المثبتة",
"column.public": "الخيط العام الموØد",
+ "column.status": "Toot",
"column_back_button.label": "العودة",
"column_header.hide_settings": "إخÙاء الإعدادات",
"column_header.moveLeft_settings": "نقل القائمة إلى اليسار",
@@ -112,8 +113,8 @@
"confirmations.unfollow.message": "متأكد من أنك تريد إلغاء متابعة {name} ؟",
"directory.federated": "From known fediverse",
"directory.local": "From {domain} only",
- "directory.new_arrivals": "New arrivals",
- "directory.recently_active": "Recently active",
+ "directory.new_arrivals": "الواÙدون الجÙدد",
+ "directory.recently_active": "نشط مؤخرا",
"embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشÙرة أدناه.",
"embed.preview": "هكذا ما سو٠يبدو عليه:",
"emoji_button.activity": "الأنشطة",
@@ -368,7 +369,7 @@
"status.show_more": "أظهر المزيد",
"status.show_more_all": "توسيع الكل",
"status.show_thread": "الكش٠عن المØادثة",
- "status.uncached_media_warning": "Not available",
+ "status.uncached_media_warning": "غير متوÙر",
"status.unmute_conversation": "ÙÙƒ الكتم عن المØادثة",
"status.unpin": "ÙÙƒ التدبيس من المل٠الشخصي",
"suggestions.dismiss": "إلغاء الاقتراØ",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index ef17d6d64f0219a5813f82c224ab362127bc0c72..2ef693fcbcee2f260e80989820b77fde76ef5ae4 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -63,6 +63,7 @@
"column.notifications": "Avisos",
"column.pins": "Toots fixaos",
"column.public": "Llinia temporal federada",
+ "column.status": "Toot",
"column_back_button.label": "Atrás",
"column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Mover la columna a la esquierda",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b0954f1990c18331787e073ab4013e22c6c2b6e5..309f045132b71edfd420cd07e7adaf5a54f184a3 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -63,6 +63,7 @@
"column.notifications": "ИзвеÑтиÑ",
"column.pins": "Pinned toot",
"column.public": "Публичен канал",
+ "column.status": "Toot",
"column_back_button.label": "Ðазад",
"column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Move column to the left",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 241b43573aab3ecc3c56b8dfbd0f8acf0568d06b..e4984a1188cb8686bdf590ef00b2ce34a30fa534 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -63,6 +63,7 @@
"column.notifications": "পà§à¦°à¦œà§à¦žà¦¾à¦ªà¦¨à¦—à§à¦²à§‹",
"column.pins": "পিন করা টà§à¦Ÿ",
"column.public": "যà§à¦•à§à¦¤ সময়রেখা",
+ "column.status": "Toot",
"column_back_button.label": "পেছনে",
"column_header.hide_settings": "সেটিংগà§à¦²à§‹ সরান",
"column_header.moveLeft_settings": "কলমটা বামে সরান",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
new file mode 100644
index 0000000000000000000000000000000000000000..2de037f16c6fd88572c8e55d430e69e3f6ef080f
--- /dev/null
+++ b/app/javascript/mastodon/locales/br.json
@@ -0,0 +1,414 @@
+{
+ "account.add_or_remove_from_list": "Add or Remove from lists",
+ "account.badges.bot": "Bot",
+ "account.block": "Block @{name}",
+ "account.block_domain": "Hide everything from {domain}",
+ "account.blocked": "Blocked",
+ "account.cancel_follow_request": "Cancel follow request",
+ "account.direct": "Direct message @{name}",
+ "account.domain_blocked": "Domain hidden",
+ "account.edit_profile": "Edit profile",
+ "account.endorse": "Feature on profile",
+ "account.follow": "Follow",
+ "account.followers": "Followers",
+ "account.followers.empty": "No one follows this user yet.",
+ "account.follows": "Follows",
+ "account.follows.empty": "This user doesn't follow anyone yet.",
+ "account.follows_you": "Follows you",
+ "account.hide_reblogs": "Hide boosts from @{name}",
+ "account.last_status": "Last active",
+ "account.link_verified_on": "Ownership of this link was checked on {date}",
+ "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+ "account.media": "Media",
+ "account.mention": "Mention @{name}",
+ "account.moved_to": "{name} has moved to:",
+ "account.mute": "Mute @{name}",
+ "account.mute_notifications": "Mute notifications from @{name}",
+ "account.muted": "Muted",
+ "account.never_active": "Never",
+ "account.posts": "Toots",
+ "account.posts_with_replies": "Toots and replies",
+ "account.report": "Report @{name}",
+ "account.requested": "Awaiting approval",
+ "account.share": "Share @{name}'s profile",
+ "account.show_reblogs": "Show boosts from @{name}",
+ "account.unblock": "Unblock @{name}",
+ "account.unblock_domain": "Unhide {domain}",
+ "account.unendorse": "Don't feature on profile",
+ "account.unfollow": "Unfollow",
+ "account.unmute": "Unmute @{name}",
+ "account.unmute_notifications": "Unmute notifications from @{name}",
+ "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+ "alert.rate_limited.title": "Rate limited",
+ "alert.unexpected.message": "An unexpected error occurred.",
+ "alert.unexpected.title": "Oops!",
+ "autosuggest_hashtag.per_week": "{count} per week",
+ "boost_modal.combo": "You can press {combo} to skip this next time",
+ "bundle_column_error.body": "Something went wrong while loading this component.",
+ "bundle_column_error.retry": "Try again",
+ "bundle_column_error.title": "Network error",
+ "bundle_modal_error.close": "Close",
+ "bundle_modal_error.message": "Something went wrong while loading this component.",
+ "bundle_modal_error.retry": "Try again",
+ "column.blocks": "Blocked users",
+ "column.community": "Local timeline",
+ "column.direct": "Direct messages",
+ "column.directory": "Browse profiles",
+ "column.domain_blocks": "Hidden domains",
+ "column.favourites": "Favourites",
+ "column.follow_requests": "Follow requests",
+ "column.home": "Home",
+ "column.lists": "Lists",
+ "column.mutes": "Muted users",
+ "column.notifications": "Notifications",
+ "column.pins": "Pinned toot",
+ "column.public": "Federated timeline",
+ "column.status": "Toot",
+ "column_back_button.label": "Back",
+ "column_header.hide_settings": "Hide settings",
+ "column_header.moveLeft_settings": "Move column to the left",
+ "column_header.moveRight_settings": "Move column to the right",
+ "column_header.pin": "Pin",
+ "column_header.show_settings": "Show settings",
+ "column_header.unpin": "Unpin",
+ "column_subheading.settings": "Settings",
+ "community.column_settings.media_only": "Media only",
+ "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+ "compose_form.direct_message_warning_learn_more": "Learn more",
+ "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 follow you to view your follower-only posts.",
+ "compose_form.lock_disclaimer.lock": "locked",
+ "compose_form.placeholder": "What is on your mind?",
+ "compose_form.poll.add_option": "Add a choice",
+ "compose_form.poll.duration": "Poll duration",
+ "compose_form.poll.option_placeholder": "Choice {number}",
+ "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.publish": "Toot",
+ "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",
+ "compose_form.spoiler.unmarked": "Text is not hidden",
+ "compose_form.spoiler_placeholder": "Write your warning here",
+ "confirmation_modal.cancel": "Cancel",
+ "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.confirm": "Block",
+ "confirmations.block.message": "Are you sure you want to block {name}?",
+ "confirmations.delete.confirm": "Delete",
+ "confirmations.delete.message": "Are you sure you want to delete this status?",
+ "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+ "confirmations.domain_block.confirm": "Hide entire domain",
+ "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. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+ "confirmations.logout.confirm": "Log out",
+ "confirmations.logout.message": "Are you sure you want to log out?",
+ "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 status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+ "confirmations.reply.confirm": "Reply",
+ "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+ "confirmations.unfollow.confirm": "Unfollow",
+ "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+ "directory.federated": "From known fediverse",
+ "directory.local": "From {domain} only",
+ "directory.new_arrivals": "New arrivals",
+ "directory.recently_active": "Recently active",
+ "embed.instructions": "Embed this status on your website by copying the code below.",
+ "embed.preview": "Here is what it will look like:",
+ "emoji_button.activity": "Activity",
+ "emoji_button.custom": "Custom",
+ "emoji_button.flags": "Flags",
+ "emoji_button.food": "Food & Drink",
+ "emoji_button.label": "Insert emoji",
+ "emoji_button.nature": "Nature",
+ "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ â”»â”â”»",
+ "emoji_button.objects": "Objects",
+ "emoji_button.people": "People",
+ "emoji_button.recent": "Frequently used",
+ "emoji_button.search": "Search...",
+ "emoji_button.search_results": "Search results",
+ "emoji_button.symbols": "Symbols",
+ "emoji_button.travel": "Travel & Places",
+ "empty_column.account_timeline": "No toots here!",
+ "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.blocks": "You haven't blocked any users yet.",
+ "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+ "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+ "empty_column.domain_blocks": "There are no hidden domains yet.",
+ "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+ "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
+ "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+ "empty_column.hashtag": "There is nothing in this hashtag yet.",
+ "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+ "empty_column.home.public_timeline": "the public timeline",
+ "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+ "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+ "empty_column.mutes": "You haven't muted any users yet.",
+ "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+ "follow_request.authorize": "Authorize",
+ "follow_request.reject": "Reject",
+ "getting_started.developers": "Developers",
+ "getting_started.directory": "Profile directory",
+ "getting_started.documentation": "Documentation",
+ "getting_started.heading": "Getting started",
+ "getting_started.invite": "Invite people",
+ "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+ "getting_started.security": "Security",
+ "getting_started.terms": "Terms of service",
+ "hashtag.column_header.tag_mode.all": "and {additional}",
+ "hashtag.column_header.tag_mode.any": "or {additional}",
+ "hashtag.column_header.tag_mode.none": "without {additional}",
+ "hashtag.column_settings.select.no_options_message": "No suggestions found",
+ "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+ "hashtag.column_settings.tag_mode.all": "All of these",
+ "hashtag.column_settings.tag_mode.any": "Any of these",
+ "hashtag.column_settings.tag_mode.none": "None of these",
+ "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+ "home.column_settings.basic": "Basic",
+ "home.column_settings.show_reblogs": "Show boosts",
+ "home.column_settings.show_replies": "Show replies",
+ "home.column_settings.update_live": "Update in real-time",
+ "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+ "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+ "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+ "introduction.federation.action": "Next",
+ "introduction.federation.federated.headline": "Federated",
+ "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+ "introduction.federation.home.headline": "Home",
+ "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+ "introduction.federation.local.headline": "Local",
+ "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+ "introduction.interactions.action": "Finish toot-orial!",
+ "introduction.interactions.favourite.headline": "Favourite",
+ "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+ "introduction.interactions.reblog.headline": "Boost",
+ "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+ "introduction.interactions.reply.headline": "Reply",
+ "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+ "introduction.welcome.action": "Let's go!",
+ "introduction.welcome.headline": "First steps",
+ "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+ "keyboard_shortcuts.back": "to navigate back",
+ "keyboard_shortcuts.blocked": "to open blocked users 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 favourites 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.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",
+ "lightbox.close": "Close",
+ "lightbox.next": "Next",
+ "lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
+ "lists.account.add": "Add to list",
+ "lists.account.remove": "Remove from list",
+ "lists.delete": "Delete list",
+ "lists.edit": "Edit list",
+ "lists.edit.submit": "Change title",
+ "lists.new.create": "Add list",
+ "lists.new.title_placeholder": "New list title",
+ "lists.search": "Search among people you follow",
+ "lists.subheading": "Your lists",
+ "load_pending": "{count, plural, one {# new item} other {# new items}}",
+ "loading_indicator.label": "Loading...",
+ "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?",
+ "navigation_bar.apps": "Mobile apps",
+ "navigation_bar.blocks": "Blocked users",
+ "navigation_bar.community_timeline": "Local timeline",
+ "navigation_bar.compose": "Compose new toot",
+ "navigation_bar.direct": "Direct messages",
+ "navigation_bar.discover": "Discover",
+ "navigation_bar.domain_blocks": "Hidden domains",
+ "navigation_bar.edit_profile": "Edit profile",
+ "navigation_bar.favourites": "Favourites",
+ "navigation_bar.filters": "Muted words",
+ "navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.follows_and_followers": "Follows and followers",
+ "navigation_bar.info": "About this server",
+ "navigation_bar.keyboard_shortcuts": "Hotkeys",
+ "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.and_n_others": "and {count, plural, one {# other} other {# others}}",
+ "notification.favourite": "{name} favourited your status",
+ "notification.follow": "{name} followed you",
+ "notification.mention": "{name} mentioned you",
+ "notification.poll": "A poll you have voted in has ended",
+ "notification.reblog": "{name} boosted your status",
+ "notifications.clear": "Clear notifications",
+ "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+ "notifications.column_settings.alert": "Desktop notifications",
+ "notifications.column_settings.favourite": "Favourites:",
+ "notifications.column_settings.filter_bar.advanced": "Display all categories",
+ "notifications.column_settings.filter_bar.category": "Quick filter bar",
+ "notifications.column_settings.filter_bar.show": "Show",
+ "notifications.column_settings.follow": "New followers:",
+ "notifications.column_settings.mention": "Mentions:",
+ "notifications.column_settings.poll": "Poll results:",
+ "notifications.column_settings.push": "Push notifications",
+ "notifications.column_settings.reblog": "Boosts:",
+ "notifications.column_settings.show": "Show in column",
+ "notifications.column_settings.sound": "Play sound",
+ "notifications.filter.all": "All",
+ "notifications.filter.boosts": "Boosts",
+ "notifications.filter.favourites": "Favourites",
+ "notifications.filter.follows": "Follows",
+ "notifications.filter.mentions": "Mentions",
+ "notifications.filter.polls": "Poll results",
+ "notifications.group": "{count} notifications",
+ "poll.closed": "Closed",
+ "poll.refresh": "Refresh",
+ "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+ "poll.vote": "Vote",
+ "poll_button.add_poll": "Add a poll",
+ "poll_button.remove_poll": "Remove poll",
+ "privacy.change": "Adjust status privacy",
+ "privacy.direct.long": "Post to mentioned users only",
+ "privacy.direct.short": "Direct",
+ "privacy.private.long": "Post to followers only",
+ "privacy.private.short": "Followers-only",
+ "privacy.public.long": "Post to public timelines",
+ "privacy.public.short": "Public",
+ "privacy.unlisted.long": "Do not show in public timelines",
+ "privacy.unlisted.short": "Unlisted",
+ "regeneration_indicator.label": "Loading…",
+ "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+ "relative_time.days": "{number}d",
+ "relative_time.hours": "{number}h",
+ "relative_time.just_now": "now",
+ "relative_time.minutes": "{number}m",
+ "relative_time.seconds": "{number}s",
+ "reply_indicator.cancel": "Cancel",
+ "report.forward": "Forward to {target}",
+ "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+ "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+ "report.placeholder": "Additional comments",
+ "report.submit": "Submit",
+ "report.target": "Report {target}",
+ "search.placeholder": "Search",
+ "search_popout.search_format": "Advanced search format",
+ "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+ "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_results.accounts": "People",
+ "search_results.hashtags": "Hashtags",
+ "search_results.statuses": "Toots",
+ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+ "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+ "status.admin_account": "Open moderation interface for @{name}",
+ "status.admin_status": "Open this status in the moderation interface",
+ "status.block": "Block @{name}",
+ "status.cancel_reblog_private": "Unboost",
+ "status.cannot_reblog": "This post cannot be boosted",
+ "status.copy": "Copy link to status",
+ "status.delete": "Delete",
+ "status.detailed_status": "Detailed conversation view",
+ "status.direct": "Direct message @{name}",
+ "status.embed": "Embed",
+ "status.favourite": "Favourite",
+ "status.filtered": "Filtered",
+ "status.load_more": "Load more",
+ "status.media_hidden": "Media hidden",
+ "status.mention": "Mention @{name}",
+ "status.more": "More",
+ "status.mute": "Mute @{name}",
+ "status.mute_conversation": "Mute conversation",
+ "status.open": "Expand this status",
+ "status.pin": "Pin on profile",
+ "status.pinned": "Pinned toot",
+ "status.read_more": "Read more",
+ "status.reblog": "Boost",
+ "status.reblog_private": "Boost to original audience",
+ "status.reblogged_by": "{name} boosted",
+ "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+ "status.redraft": "Delete & re-draft",
+ "status.reply": "Reply",
+ "status.replyAll": "Reply to thread",
+ "status.report": "Report @{name}",
+ "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.show_thread": "Show thread",
+ "status.uncached_media_warning": "Not available",
+ "status.unmute_conversation": "Unmute conversation",
+ "status.unpin": "Unpin from profile",
+ "suggestions.dismiss": "Dismiss suggestion",
+ "suggestions.header": "You might be interested in…",
+ "tabs_bar.federated_timeline": "Federated",
+ "tabs_bar.home": "Home",
+ "tabs_bar.local_timeline": "Local",
+ "tabs_bar.notifications": "Notifications",
+ "tabs_bar.search": "Search",
+ "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+ "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+ "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+ "time_remaining.moments": "Moments remaining",
+ "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+ "trends.trending_now": "Trending now",
+ "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+ "upload_area.title": "Drag & drop to upload",
+ "upload_button.label": "Add media ({formats})",
+ "upload_error.limit": "File upload limit exceeded.",
+ "upload_error.poll": "File upload not allowed with polls.",
+ "upload_form.description": "Describe for the visually impaired",
+ "upload_form.edit": "Edit",
+ "upload_form.undo": "Delete",
+ "upload_modal.analyzing_picture": "Analyzing picture…",
+ "upload_modal.apply": "Apply",
+ "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+ "upload_modal.detect_text": "Detect text from picture",
+ "upload_modal.edit_media": "Edit media",
+ "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+ "upload_modal.preview_label": "Preview ({ratio})",
+ "upload_progress.label": "Uploading...",
+ "video.close": "Close video",
+ "video.exit_fullscreen": "Exit full screen",
+ "video.expand": "Expand video",
+ "video.fullscreen": "Full screen",
+ "video.hide": "Hide video",
+ "video.mute": "Mute sound",
+ "video.pause": "Pause",
+ "video.play": "Play",
+ "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 4554500f5de5e8610d5da90673948068d25cce99..77f84ac7d78650fd0a4db63dd7139fd7b6b2ada5 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -63,6 +63,7 @@
"column.notifications": "Notificacions",
"column.pins": "Toots fixats",
"column.public": "LÃnia de temps federada",
+ "column.status": "Toot",
"column_back_button.label": "Enrere",
"column_header.hide_settings": "Amaga la configuració",
"column_header.moveLeft_settings": "Mou la columna cap a l'esquerra",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index b54857e36977b92a7678277b7518d8f063f3d025..d95f32b18122d1dc1702381172ce40f680225d4f 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -63,6 +63,7 @@
"column.notifications": "Nutificazione",
"column.pins": "Statuti puntarulati",
"column.public": "Linea pubblica glubale",
+ "column.status": "Toot",
"column_back_button.label": "Ritornu",
"column_header.hide_settings": "Piattà i parametri",
"column_header.moveLeft_settings": "Spiazzà à manca",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index b3d1e81577c09193e989b776308b02e1335f232c..8acf27cb396ab21a712aed4d50984b919eeb4c66 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -63,6 +63,7 @@
"column.notifications": "OznámenÃ",
"column.pins": "Připnuté tooty",
"column.public": "Federovaná Äasová osa",
+ "column.status": "Toot",
"column_back_button.label": "Zpět",
"column_header.hide_settings": "Skrýt nastavenÃ",
"column_header.moveLeft_settings": "Posunout sloupec doleva",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index bc65d601e348addfacc45f8ba251a7f0112c7ac2..cdf2656d7dfbc4edcb5330e5d34797b2d49d46af 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -63,6 +63,7 @@
"column.notifications": "Hysbysiadau",
"column.pins": "Tŵtiau wedi eu pinio",
"column.public": "Ffrwd y ffederasiwn",
+ "column.status": "Toot",
"column_back_button.label": "Nôl",
"column_header.hide_settings": "Cuddio dewisiadau",
"column_header.moveLeft_settings": "Symud y golofn i'r chwith",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index dff8c3c050c673d3b647fc2e184aff23165bfea0..14b0f756399d9ea1903441a63ad20fc1bfbf28b4 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifikationer",
"column.pins": "Fastgjorte trut",
"column.public": "Fælles tidslinje",
+ "column.status": "Toot",
"column_back_button.label": "Tilbage",
"column_header.hide_settings": "Skjul indstillinger",
"column_header.moveLeft_settings": "Flyt kolonne til venstre",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index a9b777c035a98c976985390263a5ba13f1541fd1..845bc5156b6ea717f1184fae9f376caa387c56df 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -63,6 +63,7 @@
"column.notifications": "Mitteilungen",
"column.pins": "Angeheftete Beiträge",
"column.public": "Föderierte Zeitleiste",
+ "column.status": "Toot",
"column_back_button.label": "Zurück",
"column_header.hide_settings": "Einstellungen verbergen",
"column_header.moveLeft_settings": "Spalte nach links verschieben",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index b3c25ebe68bc2f74837ccb136eab68409e353b82..db68f18c59a75172d6a0a44fada57c0c14ff2420 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1132,28 +1132,24 @@
{
"descriptors": [
{
- "defaultMessage": "Delete",
- "id": "upload_form.undo"
- },
- {
- "defaultMessage": "Edit",
- "id": "upload_form.edit"
+ "defaultMessage": "Uploading...",
+ "id": "upload_progress.label"
}
],
- "path": "app/javascript/mastodon/features/compose/components/upload.json"
+ "path": "app/javascript/mastodon/features/compose/components/upload_progress.json"
},
{
"descriptors": [
{
- "defaultMessage": "Are you sure you want to log out?",
- "id": "confirmations.logout.message"
+ "defaultMessage": "Delete",
+ "id": "upload_form.undo"
},
{
- "defaultMessage": "Log out",
- "id": "confirmations.logout.confirm"
+ "defaultMessage": "Edit",
+ "id": "upload_form.edit"
}
],
- "path": "app/javascript/mastodon/features/compose/containers/navigation_container.json"
+ "path": "app/javascript/mastodon/features/compose/components/upload.json"
},
{
"descriptors": [
@@ -1584,10 +1580,6 @@
},
{
"descriptors": [
- {
- "defaultMessage": "Basic",
- "id": "home.column_settings.basic"
- },
{
"defaultMessage": "Show boosts",
"id": "home.column_settings.show_reblogs"
@@ -1969,6 +1961,14 @@
"defaultMessage": "Push notifications",
"id": "notifications.column_settings.push"
},
+ {
+ "defaultMessage": "Basic",
+ "id": "home.column_settings.basic"
+ },
+ {
+ "defaultMessage": "Update in real-time",
+ "id": "home.column_settings.update_live"
+ },
{
"defaultMessage": "Quick filter bar",
"id": "notifications.column_settings.filter_bar.category"
@@ -2027,6 +2027,10 @@
},
{
"descriptors": [
+ {
+ "defaultMessage": "and {count, plural, one {# other} other {# others}}",
+ "id": "notification.and_n_others"
+ },
{
"defaultMessage": "{name} followed you",
"id": "notification.follow"
@@ -2283,6 +2287,10 @@
"defaultMessage": "Block & Report",
"id": "confirmations.block.block_and_report"
},
+ {
+ "defaultMessage": "Toot",
+ "id": "column.status"
+ },
{
"defaultMessage": "Are you sure you want to block {name}?",
"id": "confirmations.block.message"
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 4c8a587781746bb6b08b5da61e3302f70c5dcc7f..bdd1da36cf55f9b5365e66d728b57e427b9e0463 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -63,6 +63,7 @@
"column.notifications": "Ειδοποιήσεις",
"column.pins": "ΚαÏφιτσωμÎνα τουτ",
"column.public": "Ομοσπονδιακή Ïοή",
+ "column.status": "Toot",
"column_back_button.label": "Πίσω",
"column_header.hide_settings": "ΑπόκÏυψη Ïυθμίσεων",
"column_header.moveLeft_settings": "ΜεταφοÏά κολώνας αÏιστεÏά",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index debc755c36c6d7643042c4ab7de9b79e38287729..e959e51887f564b74f203053c4487654bb14d8ea 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifications",
"column.pins": "Pinned toots",
"column.public": "Federated timeline",
+ "column.status": "Toot",
"column_back_button.label": "Back",
"column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Move column to the left",
@@ -169,6 +170,7 @@
"home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
+ "home.column_settings.update_live": "Update in real-time",
"intervals.full.days": "{number, plural, one {# day} other {# days}}",
"intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
"intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -262,6 +264,7 @@
"navigation_bar.preferences": "Preferences",
"navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.security": "Security",
+ "notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
"notification.favourite": "{name} favourited your status",
"notification.follow": "{name} followed you",
"notification.mention": "{name} mentioned you",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index a04a70cce2d12b22b2226bf8c61b90ff9c6fa267..31750050e0893c1fcbd55fe5504d0aefe272a577 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -63,6 +63,7 @@
"column.notifications": "Sciigoj",
"column.pins": "Alpinglitaj mesaÄoj",
"column.public": "Fratara tempolinio",
+ "column.status": "Toot",
"column_back_button.label": "Reveni",
"column_header.hide_settings": "KaÅi agordojn",
"column_header.moveLeft_settings": "Movi kolumnon maldekstren",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 3b36571b1c12263f9308fec06f8b5b3e1cfeae5a..a033f6e1fc6d8687341ad5094e9622e21eb21cd8 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -4,7 +4,7 @@
"account.block": "Bloquear a @{name}",
"account.block_domain": "Ocultar todo de {domain}",
"account.blocked": "Bloqueado",
- "account.cancel_follow_request": "Cancel follow request",
+ "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
"account.direct": "Mensaje directo a @{name}",
"account.domain_blocked": "Dominio oculto",
"account.edit_profile": "Editar perfil",
@@ -16,7 +16,7 @@
"account.follows.empty": "Este usuario todavÃa no sigue a nadie.",
"account.follows_you": "Te sigue",
"account.hide_reblogs": "Ocultar retoots de @{name}",
- "account.last_status": "Last active",
+ "account.last_status": "Última actividad",
"account.link_verified_on": "El proprietario de este link fue comprobado el {date}",
"account.locked_info": "El estado de privacidad de esta cuenta està configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
"account.media": "Multimedia",
@@ -25,7 +25,7 @@
"account.mute": "Silenciar a @{name}",
"account.mute_notifications": "Silenciar notificaciones de @{name}",
"account.muted": "Silenciado",
- "account.never_active": "Never",
+ "account.never_active": "Nunca",
"account.posts": "Toots",
"account.posts_with_replies": "Toots con respuestas",
"account.report": "Reportar a @{name}",
@@ -39,7 +39,7 @@
"account.unmute": "Dejar de silenciar a @{name}",
"account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
"alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
- "alert.rate_limited.title": "Rate limited",
+ "alert.rate_limited.title": "Tarifa limitada",
"alert.unexpected.message": "Hubo un error inesperado.",
"alert.unexpected.title": "¡Ups!",
"autosuggest_hashtag.per_week": "{count} per week",
@@ -53,7 +53,7 @@
"column.blocks": "Usuarios bloqueados",
"column.community": "LÃnea de tiempo local",
"column.direct": "Mensajes directos",
- "column.directory": "Browse profiles",
+ "column.directory": "Buscar perfiles",
"column.domain_blocks": "Dominios ocultados",
"column.favourites": "Favoritos",
"column.follow_requests": "Solicitudes de seguimiento",
@@ -63,6 +63,7 @@
"column.notifications": "Notificaciones",
"column.pins": "Toots fijados",
"column.public": "LÃnea de tiempo federada",
+ "column.status": "Toot",
"column_back_button.label": "Atrás",
"column_header.hide_settings": "Ocultar configuración",
"column_header.moveLeft_settings": "Mover columna a la izquierda",
@@ -100,8 +101,8 @@
"confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
"confirmations.domain_block.confirm": "Ocultar dominio entero",
"confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
- "confirmations.logout.confirm": "Log out",
- "confirmations.logout.message": "Are you sure you want to log out?",
+ "confirmations.logout.confirm": "Cerrar sesión",
+ "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
"confirmations.mute.confirm": "Silenciar",
"confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
"confirmations.redraft.confirm": "Borrar y volver a borrador",
@@ -110,10 +111,10 @@
"confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
"confirmations.unfollow.confirm": "Dejar de seguir",
"confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
- "directory.federated": "From known fediverse",
- "directory.local": "From {domain} only",
- "directory.new_arrivals": "New arrivals",
- "directory.recently_active": "Recently active",
+ "directory.federated": "Desde el fediverso conocido",
+ "directory.local": "Sólo de {domain}",
+ "directory.new_arrivals": "Recién llegados",
+ "directory.recently_active": "Recientemente activo",
"embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
"embed.preview": "Asà es como se verá:",
"emoji_button.activity": "Actividad",
@@ -368,7 +369,7 @@
"status.show_more": "Mostrar más",
"status.show_more_all": "Mostrar más para todo",
"status.show_thread": "Ver hilo",
- "status.uncached_media_warning": "Not available",
+ "status.uncached_media_warning": "No disponible",
"status.unmute_conversation": "Dejar de silenciar conversación",
"status.unpin": "Dejar de fijar",
"suggestions.dismiss": "Descartar sugerencia",
@@ -384,21 +385,21 @@
"time_remaining.moments": "Momentos restantes",
"time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
"trends.count_by_accounts": "{count} {rawCount, plural, one {persona} other {personas}} hablando",
- "trends.trending_now": "Trending now",
+ "trends.trending_now": "Tendencia ahora",
"ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
"upload_area.title": "Arrastra y suelta para subir",
"upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_error.limit": "LÃmite de subida de archivos excedido.",
"upload_error.poll": "Subida de archivos no permitida con encuestas.",
"upload_form.description": "Describir para los usuarios con dificultad visual",
- "upload_form.edit": "Edit",
+ "upload_form.edit": "Editar",
"upload_form.undo": "Borrar",
- "upload_modal.analyzing_picture": "Analyzing picture…",
- "upload_modal.apply": "Apply",
- "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
- "upload_modal.detect_text": "Detect text from picture",
- "upload_modal.edit_media": "Edit media",
- "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+ "upload_modal.analyzing_picture": "Analizando imagen…",
+ "upload_modal.apply": "Aplicar",
+ "upload_modal.description_placeholder": "Un rápido zorro marrón salta sobre el perro perezoso",
+ "upload_modal.detect_text": "Detectar texto de la imagen",
+ "upload_modal.edit_media": "Editar multimedia",
+ "upload_modal.hint": "Haga clic o arrastre el cÃrculo en la vista previa para elegir el punto focal que siempre estará a la vista en todas las miniaturas.",
"upload_modal.preview_label": "Preview ({ratio})",
"upload_progress.label": "Subiendo…",
"video.close": "Cerrar video",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 63253a1776252e11c1a157d552c2cfbe826a70e8..1d1dfd35abb8cf5599c7cacca397a7db2c5d8bd8 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -63,6 +63,7 @@
"column.notifications": "Teated",
"column.pins": "Kinnitatud upitused",
"column.public": "Föderatiivne ajajoon",
+ "column.status": "Toot",
"column_back_button.label": "Tagasi",
"column_header.hide_settings": "Peida sätted",
"column_header.moveLeft_settings": "Liiguta tulp vasakule",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index e88bcfff169a02d840526f7cfdd1a3afb5db1556..f1fc17fdd64cce0e87523df4bb5f4e6abe6b63dc 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -63,6 +63,7 @@
"column.notifications": "Jakinarazpenak",
"column.pins": "Pinned toot",
"column.public": "Federatutako denbora-lerroa",
+ "column.status": "Toot",
"column_back_button.label": "Atzera",
"column_header.hide_settings": "Ezkutatu ezarpenak",
"column_header.moveLeft_settings": "Eraman zutabea ezkerrera",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 632698c468bcdac71663000c86ed5ab06f2bfc0b..9382ec5ee006b3d4f0f49978f46a7b4037adb866 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -63,6 +63,7 @@
"column.notifications": "اعلان‌ها",
"column.pins": "نوشته‌های ثابت",
"column.public": "نوشته‌های همه‌جا",
+ "column.status": "Toot",
"column_back_button.label": "بازگشت",
"column_header.hide_settings": "نهÙتن تنظیمات",
"column_header.moveLeft_settings": "انتقال ستون به راست",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 8f8e9fc586daa5a8f102e462661a9799eafbab8b..01b5edad1bfbf696f831899814f01f25e9f8f2f9 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -63,6 +63,7 @@
"column.notifications": "Ilmoitukset",
"column.pins": "Kiinnitetty tuuttaus",
"column.public": "Yleinen aikajana",
+ "column.status": "Toot",
"column_back_button.label": "Takaisin",
"column_header.hide_settings": "Piilota asetukset",
"column_header.moveLeft_settings": "Siirrä saraketta vasemmalle",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 72158c413e47647d914dc9c161f817ded43f5fbf..7cfe9829adb3b450ab0f8414b666b0bea5a7ef10 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifications",
"column.pins": "Pouets épinglés",
"column.public": "Fil public global",
+ "column.status": "Toot",
"column_back_button.label": "Retour",
"column_header.hide_settings": "Masquer les paramètres",
"column_header.moveLeft_settings": "Déplacer la colonne vers la gauche",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 1bf37c898524fa00fe46bfa6060b4b17692c92d5..3cc44f43ee12c39798b863b704a7f9c6906d08fa 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -63,6 +63,7 @@
"column.notifications": "Notificacións",
"column.pins": "Mensaxes fixadas",
"column.public": "Liña temporal federada",
+ "column.status": "Toot",
"column_back_button.label": "Atrás",
"column_header.hide_settings": "Agochar axustes",
"column_header.moveLeft_settings": "Mover a columna hacia a esquerda",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index fd7e40c532432d2ac5ae8382bc2fd671093ebce7..b6cc3e6ce11d8c84eed35c5cebd6e3e71131c328 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -63,6 +63,7 @@
"column.notifications": "התר×ות",
"column.pins": "Pinned toot",
"column.public": "בפרהסיה",
+ "column.status": "Toot",
"column_back_button.label": "חזרה",
"column_header.hide_settings": "הסתרת העדפות",
"column_header.moveLeft_settings": "הזחת טור לשמ×ל",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 55b383d5998766de2a604e937f8858710ecbac22..e2d1eb49d1c40e68dede4e0f1c85ed50decbc465 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifications",
"column.pins": "Pinned toot",
"column.public": "Federated timeline",
+ "column.status": "Toot",
"column_back_button.label": "Back",
"column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Move column to the left",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 8d7cb436ceb3bc243f76aa497d53cfa0182a1447..6daabc694028fe9c7d5c44810f0a9aa6f93ab752 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifikacije",
"column.pins": "Pinned toot",
"column.public": "Federalni timeline",
+ "column.status": "Toot",
"column_back_button.label": "Natrag",
"column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Move column to the left",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 513f2a22a7dd08be6b15b46ff2cdc664c77fa57e..f5a02065bf39ab6c5b7f252b23543dc0e6207178 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -63,6 +63,7 @@
"column.notifications": "ÉrtesÃtések",
"column.pins": "Kitűzött tülkök",
"column.public": "Nyilvános idővonal",
+ "column.status": "Toot",
"column_back_button.label": "Vissza",
"column_header.hide_settings": "BeállÃtások elrejtése",
"column_header.moveLeft_settings": "Oszlop elmozdÃtása balra",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 1c3f1eec0a39d00a976d6972290d373a3b1d613a..1484c76df2f35172f58c7b3d6527b8dac8744b8b 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -63,6 +63,7 @@
"column.notifications": "Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€",
"column.pins": "Ô±Õ´Ö€Õ¡ÖÕ¾Õ¡Õ® Õ©Õ©Õ¥Ö€",
"column.public": "Ô´Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„",
+ "column.status": "Toot",
"column_back_button.label": "ÔµÕ¿",
"column_header.hide_settings": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
"column_header.moveLeft_settings": "ÕÕ¥Õ²Õ¡Õ·Õ¡Ö€ÕªÕ¥Õ¬ Õ½ÕµÕ¸Ö‚Õ¶Õ¨ Õ±Õ¡Õ",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 5e1f318be606caab7e08d62440a68fde77ef94ce..c9e48a1a6fb6a5c363be47e8547009451097317a 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifikasi",
"column.pins": "Pinned toot",
"column.public": "Linimasa gabungan",
+ "column.status": "Toot",
"column_back_button.label": "Kembali",
"column_header.hide_settings": "Sembunyikan pengaturan",
"column_header.moveLeft_settings": "Pindahkan kolom ke kiri",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index afbd970ecbc3d5c407ef1a6dfcd3581bd00c82d8..6c1b7fa8ba24ce89a68293d02a8a1e4f769c081f 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -63,6 +63,7 @@
"column.notifications": "Savigi",
"column.pins": "Pinned toot",
"column.public": "Federata tempolineo",
+ "column.status": "Toot",
"column_back_button.label": "Retro",
"column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Move column to the left",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index caabf6ef3e5e7cca638704bf61333d8b3404449b..dc43bcb5cc7c29744ebd8b54fbf09695fd02438f 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifiche",
"column.pins": "Toot fissati in cima",
"column.public": "Timeline federata",
+ "column.status": "Toot",
"column_back_button.label": "Indietro",
"column_header.hide_settings": "Nascondi impostazioni",
"column_header.moveLeft_settings": "Sposta colonna a sinistra",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 1960dafba2f72e45c91b72de678c5c90fc5ff0eb..4fb34e772e78244fa40f64079539df8d27b42eb3 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -63,6 +63,7 @@
"column.notifications": "通知",
"column.pins": "固定ã•ã‚ŒãŸãƒˆã‚¥ãƒ¼ãƒˆ",
"column.public": "連åˆã‚¿ã‚¤ãƒ ライン",
+ "column.status": "Toot",
"column_back_button.label": "戻る",
"column_header.hide_settings": "è¨å®šã‚’éš ã™",
"column_header.moveLeft_settings": "カラムを左ã«ç§»å‹•ã™ã‚‹",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index d3018c0bf23388169a5506322174cefd56092150..e2a6ee6c63a764de5d94d6e5a8c9495252c6bf9f 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -63,6 +63,7 @@
"column.notifications": "შეტყáƒáƒ‘ინებები",
"column.pins": "áƒáƒžáƒ˜áƒœáƒ£áƒšáƒ˜ ტუტები",
"column.public": "ფედერáƒáƒšáƒ£áƒ ი თáƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ˜",
+ "column.status": "Toot",
"column_back_button.label": "უკáƒáƒœ",
"column_header.hide_settings": "პáƒáƒ áƒáƒ›áƒ”ტრების დáƒáƒ›áƒáƒšáƒ•áƒ",
"column_header.moveLeft_settings": "სვეტის მáƒáƒ ცხნივ გáƒáƒ“áƒáƒ¢áƒáƒœáƒ",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 5d671d907402cfdfb519b87d0a8d48d9534e5c02..a07302f0a476ae3063bc78df7c0a227d81ef603d 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -63,6 +63,7 @@
"column.notifications": "ЕÑкертпелер",
"column.pins": "ЖабыÑтырылған жазбалар",
"column.public": "Жаһандық желі",
+ "column.status": "Toot",
"column_back_button.label": "Ðртқа",
"column_header.hide_settings": "Баптауларды жаÑÑ‹Ñ€",
"column_header.moveLeft_settings": "Бағананы Ñолға жылжыту",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 50f7ca543ecfb119585e40b46e4bf0caa7c40483..3ec9a8a164a9e7189863dba4755998984498f0e2 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -63,6 +63,7 @@
"column.notifications": "알림",
"column.pins": "ê³ ì •ëœ íˆ¿",
"column.public": "ì—°í•© 타임ë¼ì¸",
+ "column.status": "Toot",
"column_back_button.label": "ëŒì•„가기",
"column_header.hide_settings": "ì„¤ì • 숨기기",
"column_header.moveLeft_settings": "왼쪽으로 ì´ë™",
@@ -292,7 +293,7 @@
"notifications.group": "{count} ê°œì˜ ì•Œë¦¼",
"poll.closed": "마ê°ë¨",
"poll.refresh": "ìƒˆë¡œê³ ì¹¨",
- "poll.total_votes": "{count} 명 참여",
+ "poll.total_votes": "{count} 표",
"poll.vote": "투표",
"poll_button.add_poll": "투표 추가",
"poll_button.remove_poll": "투표 ì‚ì œ",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 7d0776dff4de6543cbe5fc1107bd33122ad64a63..2de037f16c6fd88572c8e55d430e69e3f6ef080f 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifications",
"column.pins": "Pinned toot",
"column.public": "Federated timeline",
+ "column.status": "Toot",
"column_back_button.label": "Back",
"column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Move column to the left",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index d9b12569513fdcc02c7d174d749258edf7b52290..8d281c9d5bf0bf5683f89ef98e782a673dabdbc8 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -63,6 +63,7 @@
"column.notifications": "Paziņojumi",
"column.pins": "Piespraustie ziņojumi",
"column.public": "FederatÄ«vÄ laika lÄ«nija",
+ "column.status": "Toot",
"column_back_button.label": "Atpakaļ",
"column_header.hide_settings": "Paslēpt iestatījumus",
"column_header.moveLeft_settings": "PÄrvietot kolonu pa kreisi",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index b83d26a0a55fe9866683846d91fb7d7240a67c49..9bd5eef7215e58970e4a49d4ff68f30f0f8be197 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifications",
"column.pins": "Pinned toot",
"column.public": "Federated timeline",
+ "column.status": "Toot",
"column_back_button.label": "Back",
"column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Move column to the left",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 439dccbb3ea29d8c6efa758363ee8b668fcc8337..73e7b390504c946d05f0542e49b95f82d7d27c6d 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -63,6 +63,7 @@
"column.notifications": "Meldingen",
"column.pins": "Vastgezette toots",
"column.public": "Globale tijdlijn",
+ "column.status": "Toot",
"column_back_button.label": "Terug",
"column_header.hide_settings": "Instellingen verbergen",
"column_header.moveLeft_settings": "Kolom naar links verplaatsen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
new file mode 100644
index 0000000000000000000000000000000000000000..dda402494028c6efe1d863dd13d0cdb402794f8f
--- /dev/null
+++ b/app/javascript/mastodon/locales/nn.json
@@ -0,0 +1,414 @@
+{
+ "account.add_or_remove_from_list": "Legg til eller ta vekk fra liste",
+ "account.badges.bot": "Robot",
+ "account.block": "Blokkér @{name}",
+ "account.block_domain": "Gøyme alt innhald for domenet {domain}",
+ "account.blocked": "Blokkert",
+ "account.cancel_follow_request": "Avslutt føljar-førespurnad",
+ "account.direct": "Direkte meld @{name}",
+ "account.domain_blocked": "Domenet er gøymt",
+ "account.edit_profile": "Rediger profil",
+ "account.endorse": "Framhev på profilen din",
+ "account.follow": "Følj",
+ "account.followers": "Føljare",
+ "account.followers.empty": "Er ikkje nokon som føljar denne brukaren ennå.",
+ "account.follows": "Føljingar",
+ "account.follows.empty": "Denne brukaren foljer ikkje nokon ennå.",
+ "account.follows_you": "Føljar deg",
+ "account.hide_reblogs": "Gøym robotar for @{name}",
+ "account.last_status": "Sist aktiv",
+ "account.link_verified_on": "Eigerskap for denne linken er sist sjekket den {date}",
+ "account.locked_info": "Brukarens privat-status er satt til lukka. Eigaren må manuelt døme kvem som kan følje honom.",
+ "account.media": "Media",
+ "account.mention": "Nemne @{name}",
+ "account.moved_to": "{name} har flytta til:",
+ "account.mute": "MÃ¥lbind @{name}",
+ "account.mute_notifications": "Målbind notifikasjoner ifrå @{name}",
+ "account.muted": "MÃ¥lbindt",
+ "account.never_active": "Aldri",
+ "account.posts": "Tutar",
+ "account.posts_with_replies": "Tutar og svar",
+ "account.report": "Rapporter @{name}",
+ "account.requested": "Venter på samtykke. Klikk for å avbryte føljar-førespurnad",
+ "account.share": "Del @{name} sin profil",
+ "account.show_reblogs": "Sjå framhevingar ifrå @{name}",
+ "account.unblock": "Avblokker @{name}",
+ "account.unblock_domain": "Vis {domain}",
+ "account.unendorse": "Ikkje framhev på profil",
+ "account.unfollow": "Avfølja",
+ "account.unmute": "Av-demp @{name}",
+ "account.unmute_notifications": "Av-demp notifikasjoner ifrå @{name}",
+ "alert.rate_limited.message": "Ver vennlig og prøv igjen {retry_time, time, medium}.",
+ "alert.rate_limited.title": "Bregrensa rate",
+ "alert.unexpected.message": "Eit uforventa problem har hendt.",
+ "alert.unexpected.title": "Oops!",
+ "autosuggest_hashtag.per_week": "{count} per veke",
+ "boost_modal.combo": "Du kan trykke {combo} for å hoppe over dette neste gong",
+ "bundle_column_error.body": "Noko gikk gale mens komponent ble nedlasta.",
+ "bundle_column_error.retry": "Prøv igjen",
+ "bundle_column_error.title": "Tenarmaskin feil",
+ "bundle_modal_error.close": "Lukk",
+ "bundle_modal_error.message": "Noko gikk gale mens komponent var i ferd med å bli nedlasta.",
+ "bundle_modal_error.retry": "Prøv igjen",
+ "column.blocks": "Blokka brukare",
+ "column.community": "Lokal samtid",
+ "column.direct": "Direkte meldingar",
+ "column.directory": "Sjå gjennom profiler",
+ "column.domain_blocks": "Gøymte domener",
+ "column.favourites": "Favorittar",
+ "column.follow_requests": "Føljarførespurnad",
+ "column.home": "Heim",
+ "column.lists": "Lister",
+ "column.mutes": "MÃ¥lbindte brukare",
+ "column.notifications": "Varslinger",
+ "column.pins": "Festa tuter",
+ "column.public": "Federert samtid",
+ "column.status": "Toot",
+ "column_back_button.label": "Tilbake",
+ "column_header.hide_settings": "Skjul innstillingar",
+ "column_header.moveLeft_settings": "Flytt feltet til venstre",
+ "column_header.moveRight_settings": "Flytt feltet til høgre",
+ "column_header.pin": "Fest",
+ "column_header.show_settings": "Vis innstillingar",
+ "column_header.unpin": "Løys",
+ "column_subheading.settings": "Innstillingar",
+ "community.column_settings.media_only": "Kun medie",
+ "compose_form.direct_message_warning": "Denne tuten vil kun verte synleg for nemnde brukarar.",
+ "compose_form.direct_message_warning_learn_more": "Lær meir",
+ "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 follow you to view your follower-only posts.",
+ "compose_form.lock_disclaimer.lock": "locked",
+ "compose_form.placeholder": "What is on your mind?",
+ "compose_form.poll.add_option": "Add a choice",
+ "compose_form.poll.duration": "Poll duration",
+ "compose_form.poll.option_placeholder": "Choice {number}",
+ "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.publish": "Toot",
+ "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",
+ "compose_form.spoiler.unmarked": "Text is not hidden",
+ "compose_form.spoiler_placeholder": "Write your warning here",
+ "confirmation_modal.cancel": "Cancel",
+ "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.confirm": "Block",
+ "confirmations.block.message": "Are you sure you want to block {name}?",
+ "confirmations.delete.confirm": "Delete",
+ "confirmations.delete.message": "Are you sure you want to delete this status?",
+ "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+ "confirmations.domain_block.confirm": "Hide entire domain",
+ "confirmations.domain_block.message": "Er du ordentleg, ordentleg sikker på at du vill blokkere heile {domain}? I dei tilfeller er det bedre med ein målretta blokkering eller demping av individuelle brukare.",
+ "confirmations.logout.confirm": "Logg ut",
+ "confirmations.logout.message": "Er du sikker på at du vill logge ut?",
+ "confirmations.mute.confirm": "MÃ¥lbind",
+ "confirmations.mute.message": "Er du sikker på at d vill målbinde {name}?",
+ "confirmations.redraft.confirm": "Slett & gjennopprett",
+ "confirmations.redraft.message": "Er du sikker på at du vill slette statusen og gjennoprette den? Favoritter og framhevinger vill bli borte, og svar til den originale posten vill bli einstøing.",
+ "confirmations.reply.confirm": "Svar",
+ "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+ "confirmations.unfollow.confirm": "Unfollow",
+ "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+ "directory.federated": "From known fediverse",
+ "directory.local": "From {domain} only",
+ "directory.new_arrivals": "New arrivals",
+ "directory.recently_active": "Recently active",
+ "embed.instructions": "Embed this status on your website by copying the code below.",
+ "embed.preview": "Here is what it will look like:",
+ "emoji_button.activity": "Activity",
+ "emoji_button.custom": "Custom",
+ "emoji_button.flags": "Flags",
+ "emoji_button.food": "Food & Drink",
+ "emoji_button.label": "Insert emoji",
+ "emoji_button.nature": "Nature",
+ "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ â”»â”â”»",
+ "emoji_button.objects": "Objects",
+ "emoji_button.people": "People",
+ "emoji_button.recent": "Frequently used",
+ "emoji_button.search": "Search...",
+ "emoji_button.search_results": "Search results",
+ "emoji_button.symbols": "Symbols",
+ "emoji_button.travel": "Travel & Places",
+ "empty_column.account_timeline": "No toots here!",
+ "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.blocks": "You haven't blocked any users yet.",
+ "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+ "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+ "empty_column.domain_blocks": "There are no hidden domains yet.",
+ "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+ "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
+ "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+ "empty_column.hashtag": "There is nothing in this hashtag yet.",
+ "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+ "empty_column.home.public_timeline": "the public timeline",
+ "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+ "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+ "empty_column.mutes": "You haven't muted any users yet.",
+ "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+ "follow_request.authorize": "Authorize",
+ "follow_request.reject": "Reject",
+ "getting_started.developers": "Developers",
+ "getting_started.directory": "Profile directory",
+ "getting_started.documentation": "Documentation",
+ "getting_started.heading": "Getting started",
+ "getting_started.invite": "Invite people",
+ "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+ "getting_started.security": "Security",
+ "getting_started.terms": "Terms of service",
+ "hashtag.column_header.tag_mode.all": "and {additional}",
+ "hashtag.column_header.tag_mode.any": "or {additional}",
+ "hashtag.column_header.tag_mode.none": "without {additional}",
+ "hashtag.column_settings.select.no_options_message": "No suggestions found",
+ "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+ "hashtag.column_settings.tag_mode.all": "All of these",
+ "hashtag.column_settings.tag_mode.any": "Any of these",
+ "hashtag.column_settings.tag_mode.none": "None of these",
+ "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+ "home.column_settings.basic": "Basic",
+ "home.column_settings.show_reblogs": "Show boosts",
+ "home.column_settings.show_replies": "Show replies",
+ "home.column_settings.update_live": "Update in real-time",
+ "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+ "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+ "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+ "introduction.federation.action": "Next",
+ "introduction.federation.federated.headline": "Federated",
+ "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+ "introduction.federation.home.headline": "Home",
+ "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+ "introduction.federation.local.headline": "Local",
+ "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+ "introduction.interactions.action": "Finish toot-orial!",
+ "introduction.interactions.favourite.headline": "Favourite",
+ "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+ "introduction.interactions.reblog.headline": "Boost",
+ "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+ "introduction.interactions.reply.headline": "Reply",
+ "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+ "introduction.welcome.action": "Let's go!",
+ "introduction.welcome.headline": "First steps",
+ "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+ "keyboard_shortcuts.back": "to navigate back",
+ "keyboard_shortcuts.blocked": "to open blocked users 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 favourites 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.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",
+ "lightbox.close": "Close",
+ "lightbox.next": "Next",
+ "lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
+ "lists.account.add": "Add to list",
+ "lists.account.remove": "Remove from list",
+ "lists.delete": "Delete list",
+ "lists.edit": "Edit list",
+ "lists.edit.submit": "Change title",
+ "lists.new.create": "Add list",
+ "lists.new.title_placeholder": "New list title",
+ "lists.search": "Search among people you follow",
+ "lists.subheading": "Your lists",
+ "load_pending": "{count, plural, one {# new item} other {# new items}}",
+ "loading_indicator.label": "Loading...",
+ "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?",
+ "navigation_bar.apps": "Mobile apps",
+ "navigation_bar.blocks": "Blocked users",
+ "navigation_bar.community_timeline": "Local timeline",
+ "navigation_bar.compose": "Compose new toot",
+ "navigation_bar.direct": "Direct messages",
+ "navigation_bar.discover": "Discover",
+ "navigation_bar.domain_blocks": "Hidden domains",
+ "navigation_bar.edit_profile": "Edit profile",
+ "navigation_bar.favourites": "Favourites",
+ "navigation_bar.filters": "Muted words",
+ "navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.follows_and_followers": "Follows and followers",
+ "navigation_bar.info": "About this server",
+ "navigation_bar.keyboard_shortcuts": "Hotkeys",
+ "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.and_n_others": "and {count, plural, one {# other} other {# others}}",
+ "notification.favourite": "{name} favourited your status",
+ "notification.follow": "{name} followed you",
+ "notification.mention": "{name} mentioned you",
+ "notification.poll": "A poll you have voted in has ended",
+ "notification.reblog": "{name} boosted your status",
+ "notifications.clear": "Clear notifications",
+ "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+ "notifications.column_settings.alert": "Desktop notifications",
+ "notifications.column_settings.favourite": "Favourites:",
+ "notifications.column_settings.filter_bar.advanced": "Display all categories",
+ "notifications.column_settings.filter_bar.category": "Quick filter bar",
+ "notifications.column_settings.filter_bar.show": "Show",
+ "notifications.column_settings.follow": "New followers:",
+ "notifications.column_settings.mention": "Mentions:",
+ "notifications.column_settings.poll": "Poll results:",
+ "notifications.column_settings.push": "Push notifications",
+ "notifications.column_settings.reblog": "Boosts:",
+ "notifications.column_settings.show": "Show in column",
+ "notifications.column_settings.sound": "Play sound",
+ "notifications.filter.all": "All",
+ "notifications.filter.boosts": "Boosts",
+ "notifications.filter.favourites": "Favourites",
+ "notifications.filter.follows": "Follows",
+ "notifications.filter.mentions": "Mentions",
+ "notifications.filter.polls": "Poll results",
+ "notifications.group": "{count} notifications",
+ "poll.closed": "Closed",
+ "poll.refresh": "Refresh",
+ "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+ "poll.vote": "Vote",
+ "poll_button.add_poll": "Add a poll",
+ "poll_button.remove_poll": "Remove poll",
+ "privacy.change": "Adjust status privacy",
+ "privacy.direct.long": "Post to mentioned users only",
+ "privacy.direct.short": "Direct",
+ "privacy.private.long": "Post to followers only",
+ "privacy.private.short": "Followers-only",
+ "privacy.public.long": "Post to public timelines",
+ "privacy.public.short": "Public",
+ "privacy.unlisted.long": "Do not show in public timelines",
+ "privacy.unlisted.short": "Unlisted",
+ "regeneration_indicator.label": "Loading…",
+ "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+ "relative_time.days": "{number}d",
+ "relative_time.hours": "{number}h",
+ "relative_time.just_now": "now",
+ "relative_time.minutes": "{number}m",
+ "relative_time.seconds": "{number}s",
+ "reply_indicator.cancel": "Cancel",
+ "report.forward": "Forward to {target}",
+ "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+ "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+ "report.placeholder": "Additional comments",
+ "report.submit": "Submit",
+ "report.target": "Report {target}",
+ "search.placeholder": "Search",
+ "search_popout.search_format": "Advanced search format",
+ "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+ "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_results.accounts": "People",
+ "search_results.hashtags": "Hashtags",
+ "search_results.statuses": "Toots",
+ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+ "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+ "status.admin_account": "Open moderation interface for @{name}",
+ "status.admin_status": "Open this status in the moderation interface",
+ "status.block": "Block @{name}",
+ "status.cancel_reblog_private": "Unboost",
+ "status.cannot_reblog": "This post cannot be boosted",
+ "status.copy": "Copy link to status",
+ "status.delete": "Delete",
+ "status.detailed_status": "Detailed conversation view",
+ "status.direct": "Direct message @{name}",
+ "status.embed": "Embed",
+ "status.favourite": "Favourite",
+ "status.filtered": "Filtered",
+ "status.load_more": "Load more",
+ "status.media_hidden": "Media hidden",
+ "status.mention": "Mention @{name}",
+ "status.more": "More",
+ "status.mute": "Mute @{name}",
+ "status.mute_conversation": "Mute conversation",
+ "status.open": "Expand this status",
+ "status.pin": "Pin on profile",
+ "status.pinned": "Pinned toot",
+ "status.read_more": "Read more",
+ "status.reblog": "Boost",
+ "status.reblog_private": "Boost to original audience",
+ "status.reblogged_by": "{name} boosted",
+ "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+ "status.redraft": "Delete & re-draft",
+ "status.reply": "Reply",
+ "status.replyAll": "Reply to thread",
+ "status.report": "Report @{name}",
+ "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.show_thread": "Show thread",
+ "status.uncached_media_warning": "Not available",
+ "status.unmute_conversation": "Unmute conversation",
+ "status.unpin": "Unpin from profile",
+ "suggestions.dismiss": "Dismiss suggestion",
+ "suggestions.header": "You might be interested in…",
+ "tabs_bar.federated_timeline": "Federated",
+ "tabs_bar.home": "Home",
+ "tabs_bar.local_timeline": "Local",
+ "tabs_bar.notifications": "Notifications",
+ "tabs_bar.search": "Search",
+ "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+ "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+ "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+ "time_remaining.moments": "Moments remaining",
+ "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+ "trends.trending_now": "Trending now",
+ "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+ "upload_area.title": "Drag & drop to upload",
+ "upload_button.label": "Add media ({formats})",
+ "upload_error.limit": "File upload limit exceeded.",
+ "upload_error.poll": "File upload not allowed with polls.",
+ "upload_form.description": "Describe for the visually impaired",
+ "upload_form.edit": "Edit",
+ "upload_form.undo": "Delete",
+ "upload_modal.analyzing_picture": "Analyzing picture…",
+ "upload_modal.apply": "Apply",
+ "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+ "upload_modal.detect_text": "Detect text from picture",
+ "upload_modal.edit_media": "Edit media",
+ "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+ "upload_modal.preview_label": "Preview ({ratio})",
+ "upload_progress.label": "Uploading...",
+ "video.close": "Close video",
+ "video.exit_fullscreen": "Exit full screen",
+ "video.expand": "Expand video",
+ "video.fullscreen": "Full screen",
+ "video.hide": "Hide video",
+ "video.mute": "Mute sound",
+ "video.pause": "Pause",
+ "video.play": "Play",
+ "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 77ddad7e0162cd5f54c92cf522bbdb9bf49bbdaa..8fc722037cce125a61e87de2a8ac2c80c26691b9 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -63,6 +63,7 @@
"column.notifications": "Varsler",
"column.pins": "Pinned toot",
"column.public": "Felles tidslinje",
+ "column.status": "Toot",
"column_back_button.label": "Tilbake",
"column_header.hide_settings": "Gjem innstillinger",
"column_header.moveLeft_settings": "Flytt feltet til venstre",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 10501796df8079469180dca5a695512006d95d6d..d5abe89fb92437a17924c59133ddc45d11e7b6c2 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -63,6 +63,7 @@
"column.notifications": "Notificacions",
"column.pins": "Tuts penjats",
"column.public": "Flux public global",
+ "column.status": "Toot",
"column_back_button.label": "Tornar",
"column_header.hide_settings": "Amagar los paramètres",
"column_header.moveLeft_settings": "Desplaçar la colomna a man drecha",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index e6c82c4f3fa6c1db7443aa3a2ecb0b7d5b55f35b..62f75e3c223af77ce78b0e4ab5bbb808bed6d658 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -63,6 +63,7 @@
"column.notifications": "Powiadomienia",
"column.pins": "Przypięte wpisy",
"column.public": "Globalna oÅ› czasu",
+ "column.status": "Toot",
"column_back_button.label": "Wróć",
"column_header.hide_settings": "Ukryj ustawienia",
"column_header.moveLeft_settings": "Przesuń kolumnę w lewo",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index e11141f6c68108f117467955a63b7099cc660280..debf9e6f6c4ada658f5917d94eb14940a7c1528f 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -63,6 +63,7 @@
"column.notifications": "Notificações",
"column.pins": "Postagens fixadas",
"column.public": "Global",
+ "column.status": "Toot",
"column_back_button.label": "Voltar",
"column_header.hide_settings": "Esconder configurações",
"column_header.moveLeft_settings": "Mover coluna para a esquerda",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt-PT.json
similarity index 99%
rename from app/javascript/mastodon/locales/pt.json
rename to app/javascript/mastodon/locales/pt-PT.json
index 63a078c4e92f7259eb8705e13bb6c7e923f6229e..feba8fd9a61a336ce5e7e6db5f0aa18051282d5e 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -63,6 +63,7 @@
"column.notifications": "Notificações",
"column.pins": "Publicações fixas",
"column.public": "Cronologia federada",
+ "column.status": "Toot",
"column_back_button.label": "Voltar",
"column_header.hide_settings": "Esconder configurações",
"column_header.moveLeft_settings": "Mover coluna para a esquerda",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 27e4addda70b573ece46d5bb9cb95ebd1f199a51..038b8ddd456fd865f3fc7a1f4d4b2081935041ee 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -63,6 +63,7 @@
"column.notifications": "Notificări",
"column.pins": "Postări fixate",
"column.public": "Flux global",
+ "column.status": "Toot",
"column_back_button.label": "ÃŽnapoi",
"column_header.hide_settings": "Ascunde setările",
"column_header.moveLeft_settings": "Mută coloana la stânga",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index efbaa25a08de011b983499a8ba71628d15d3be4d..69bd5a422c1b1f9180bc650ee2cb4a1db2d906dd 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -63,6 +63,7 @@
"column.notifications": "УведомлениÑ",
"column.pins": "Закреплённый поÑÑ‚",
"column.public": "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ð»ÐµÐ½Ñ‚Ð°",
+ "column.status": "Toot",
"column_back_button.label": "Ðазад",
"column_header.hide_settings": "Скрыть наÑтройки",
"column_header.moveLeft_settings": "Передвинуть колонку влево",
@@ -260,7 +261,7 @@
"navigation_bar.mutes": "СпиÑок Ñкрытых пользователей",
"navigation_bar.personal": "Личное",
"navigation_bar.pins": "Закреплённые поÑÑ‚Ñ‹",
- "navigation_bar.preferences": "Опции",
+ "navigation_bar.preferences": "ÐаÑтройки",
"navigation_bar.public_timeline": "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ð»ÐµÐ½Ñ‚Ð°",
"navigation_bar.security": "БезопаÑноÑÑ‚ÑŒ",
"notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
@@ -383,8 +384,8 @@
"time_remaining.minutes": "{number, plural, one {оÑталаÑÑŒ # минута} few {оÑталоÑÑŒ # минуты} many {оÑталоÑÑŒ # минут} other {оÑталоÑÑŒ # минут}}",
"time_remaining.moments": "оÑталиÑÑŒ Ñчитанные мгновениÑ",
"time_remaining.seconds": "{number, plural, one {оÑталаÑÑŒ # Ñекунду} few {оÑталоÑÑŒ # Ñекунды} many {оÑталоÑÑŒ # Ñекунд} other {оÑталоÑÑŒ # Ñекунд}}",
- "trends.count_by_accounts": "ПопулÑрно у {count} {rawCount, plural, one {человека} few {человек} many {человек} other {человек}}",
- "trends.trending_now": "Trending now",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {человек говорит} few {человека говорÑÑ‚} other {человек говорÑÑ‚}} про Ñто",
+ "trends.trending_now": "Самое актуальное",
"ui.beforeunload": "Ваш черновик будет утерÑн, еÑли вы покинете Mastodon.",
"upload_area.title": "Перетащите Ñюда, чтобы загрузить",
"upload_button.label": "Добавить медиаконтент",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 312f6330155a98fd81703c6db66382d89f964a65..89a472d891d5199eb3382b3779061fd6283f53ce 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -63,6 +63,7 @@
"column.notifications": "Oboznámenia",
"column.pins": "Pripnuté prÃspevky",
"column.public": "Federovaná Äasová os",
+ "column.status": "Toot",
"column_back_button.label": "Späť",
"column_header.hide_settings": "Skryť nastavenia",
"column_header.moveLeft_settings": "Presuň stĺpec doľava",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index fa5d22fd143887f4c3d6ab47020b86f80330ca90..d7d78c41cfb51fcd2e9abc9e97f21df76d45526c 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -63,6 +63,7 @@
"column.notifications": "Obvestila",
"column.pins": "Pripeti tuti",
"column.public": "Združena Äasovnica",
+ "column.status": "Toot",
"column_back_button.label": "Nazaj",
"column_header.hide_settings": "Skrij nastavitve",
"column_header.moveLeft_settings": "Premakni stolpec na levo",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 12f66cafd3b552c7a26cb5dd044ce31f6540aaae..0f851051c21955532515a378a65554620c73a48e 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -63,6 +63,7 @@
"column.notifications": "Njoftime",
"column.pins": "Mesazhe të fiksuar",
"column.public": "Rrjedhë kohore e federuar",
+ "column.status": "Toot",
"column_back_button.label": "Mbrapsht",
"column_header.hide_settings": "Fshihi rregullimet",
"column_header.moveLeft_settings": "Shpjere shtyllën majtas",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 72ea3490ff7342452bee7db15d8b5ddef4381c60..fb6a365cea6a3883be6e078935011b35b28536c4 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -63,6 +63,7 @@
"column.notifications": "Obaveštenja",
"column.pins": "PrikaÄeni tutovi",
"column.public": "Federisana lajna",
+ "column.status": "Toot",
"column_back_button.label": "Nazad",
"column_header.hide_settings": "Sakrij postavke",
"column_header.moveLeft_settings": "Pomeri kolonu ulevo",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index c77927ec1a7cea7f29d915dbaa75fb1b5cbf6f20..064934f545602f7bb68c580175d1e9774a828687 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -63,6 +63,7 @@
"column.notifications": "Обавештења",
"column.pins": "Прикачене трубе",
"column.public": "Здружена временÑка линија",
+ "column.status": "Toot",
"column_back_button.label": "Ðазад",
"column_header.hide_settings": "Сакриј поÑтавке",
"column_header.moveLeft_settings": "Помери колону улево",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 6783da15d6bd6634851f34752d3c7087ed143245..f666a4b6ee8ad183ebfec157e8077b7e04e3ad3a 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -63,6 +63,7 @@
"column.notifications": "Meddelanden",
"column.pins": "NÃ¥lade toots",
"column.public": "Förenad tidslinje",
+ "column.status": "Toot",
"column_back_button.label": "Tillbaka",
"column_header.hide_settings": "Dölj inställningar",
"column_header.moveLeft_settings": "Flytta kolumnen till vänster",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 3266102b1df2d898da9160a6392b2fc0c238c00f..3caf301d08e32096ec5de0b206562f1ecd64dacb 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -63,6 +63,7 @@
"column.notifications": "Notifications",
"column.pins": "Pinned toot",
"column.public": "கூடà¯à®Ÿà®¾à®Ÿà¯à®šà®¿ காலகà¯à®•à¯†à®Ÿà¯",
+ "column.status": "Toot",
"column_back_button.label": "ஆதரி",
"column_header.hide_settings": "அமைபà¯à®ªà¯à®•à®³à¯ˆ மறை",
"column_header.moveLeft_settings": "நெடà¯à®µà®°à®¿à®šà¯ˆà®¯à¯ˆ இடதà¯à®ªà¯à®±à®®à®¾à®• நகரà¯à®¤à¯à®¤à®µà¯à®®à¯",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index ee7293aa7cf9da246d780f73450bb56f5b015a05..5827dbb3a8fe397552b06335076152d4937c92aa 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -63,6 +63,7 @@
"column.notifications": "à°ªà±à°°à°•à°Ÿà°¨à°²à±",
"column.pins": "Pinned toot",
"column.public": "సమాఖà±à°¯ కాలకà±à°°à°®à°‚",
+ "column.status": "Toot",
"column_back_button.label": "వెనకà±à°•à°¿",
"column_header.hide_settings": "అమరà±à°ªà±à°²à°¨à± దాచిపెటà±à°Ÿà±",
"column_header.moveLeft_settings": "నిలà±à°µà± వరà±à°¸à°¨à± ఎడమకి తరలించà±",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 3ff56f947c7cdaac7a99a5aaf9612f5a748d27b8..33eb315f1e8bbf7b4feb21c5f712ba448d1dc0ad 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -16,7 +16,7 @@
"account.follows.empty": "ผู้ใช้นี้ยังไม่ได้ติดตามใคร",
"account.follows_you": "ติดตามคุณ",
"account.hide_reblogs": "ซ่à¸à¸™à¸à¸²à¸£à¸”ันจาภ@{name}",
- "account.last_status": "Last active",
+ "account.last_status": "ใช้งานล่าสุด",
"account.link_verified_on": "ตรวจสà¸à¸šà¸„วามเป็นเจ้าขà¸à¸‡à¸‚à¸à¸‡à¸¥à¸´à¸‡à¸à¹Œà¸™à¸µà¹‰à¹€à¸¡à¸·à¹ˆà¸ {date}",
"account.locked_info": "มีà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸ªà¸–านะความเป็นส่วนตัวขà¸à¸‡à¸šà¸±à¸à¸Šà¸µà¸™à¸µà¹‰à¹€à¸›à¹‡à¸™à¸¥à¹‡à¸à¸„à¸à¸¢à¸¹à¹ˆ เจ้าขà¸à¸‡à¸•à¸£à¸§à¸ˆà¸—านผู้ที่สามารถติดตามเขาด้วยตนเà¸à¸‡",
"account.media": "สื่à¸",
@@ -25,7 +25,7 @@
"account.mute": "ปิดเสียง @{name}",
"account.mute_notifications": "ปิดเสียงà¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸ˆà¸²à¸ @{name}",
"account.muted": "ปิดเสียงà¸à¸¢à¸¹à¹ˆ",
- "account.never_active": "Never",
+ "account.never_active": "ไม่เลย",
"account.posts": "โพสต์",
"account.posts_with_replies": "โพสต์à¹à¸¥à¸°à¸à¸²à¸£à¸•à¸à¸šà¸à¸¥à¸±à¸š",
"account.report": "รายงาน @{name}",
@@ -53,7 +53,7 @@
"column.blocks": "ผู้ใช้ที่ปิดà¸à¸±à¹‰à¸™à¸à¸¢à¸¹à¹ˆ",
"column.community": "เส้นเวลาในเว็บ",
"column.direct": "ข้à¸à¸„วามโดยตรง",
- "column.directory": "Browse profiles",
+ "column.directory": "เรียà¸à¸”ูโปรไฟล์",
"column.domain_blocks": "โดเมนที่ซ่à¸à¸™à¸à¸¢à¸¹à¹ˆ",
"column.favourites": "รายà¸à¸²à¸£à¹‚ปรด",
"column.follow_requests": "คำขà¸à¸•à¸´à¸”ตาม",
@@ -63,6 +63,7 @@
"column.notifications": "à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™",
"column.pins": "โพสต์ที่ปัà¸à¸«à¸¡à¸¸à¸”",
"column.public": "เส้นเวลาที่ติดต่à¸à¸à¸±à¸šà¸ ายนà¸à¸",
+ "column.status": "Toot",
"column_back_button.label": "ย้à¸à¸™à¸à¸¥à¸±à¸š",
"column_header.hide_settings": "ซ่à¸à¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่า",
"column_header.moveLeft_settings": "ย้ายคà¸à¸¥à¸±à¸¡à¸™à¹Œà¹„ปทางซ้าย",
@@ -100,8 +101,8 @@
"confirmations.delete_list.message": "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸à¹„ม่ว่าต้à¸à¸‡à¸à¸²à¸£à¸¥à¸šà¸£à¸²à¸¢à¸à¸²à¸£à¸™à¸µà¹‰à¸à¸¢à¹ˆà¸²à¸‡à¸–าวร?",
"confirmations.domain_block.confirm": "ซ่à¸à¸™à¸—ั้งโดเมน",
"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.logout.confirm": "Log out",
- "confirmations.logout.message": "Are you sure you want to log out?",
+ "confirmations.logout.confirm": "à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š",
+ "confirmations.logout.message": "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸à¹„ม่ว่าต้à¸à¸‡à¸à¸²à¸£à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š?",
"confirmations.mute.confirm": "ปิดเสียง",
"confirmations.mute.message": "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸à¹„ม่ว่าต้à¸à¸‡à¸à¸²à¸£à¸›à¸´à¸”เสียง {name}?",
"confirmations.redraft.confirm": "ลบà¹à¸¥à¹‰à¸§à¸£à¹ˆà¸²à¸‡à¹ƒà¸«à¸¡à¹ˆ",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index ec9bd0f8f9c8c5e4ac59f0ebd12a806a72e595b1..2c4d820de585445f3feec40203bdbe5bcc06fdcb 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -63,6 +63,7 @@
"column.notifications": "Bildirimler",
"column.pins": "Sabitlenmiş gönderi",
"column.public": "Federe zaman tüneli",
+ "column.status": "Toot",
"column_back_button.label": "Geri",
"column_header.hide_settings": "Ayarları gizle",
"column_header.moveLeft_settings": "Sütunu sola taşı",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 605ebdc08c74778a590053c15290f932aed1d29f..6ccb20fc6998cb092ead103f69ef1026b9e8a608 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -63,6 +63,7 @@
"column.notifications": "СповіщеннÑ",
"column.pins": "Закріплені дмухи",
"column.public": "Глобальна Ñтрічка",
+ "column.status": "Toot",
"column_back_button.label": "Ðазад",
"column_header.hide_settings": "Приховати налаштуваннÑ",
"column_header.moveLeft_settings": "ЗміÑтити колонку вліво",
diff --git a/app/javascript/mastodon/locales/whitelist_pt.json b/app/javascript/mastodon/locales/whitelist_br.json
similarity index 100%
rename from app/javascript/mastodon/locales/whitelist_pt.json
rename to app/javascript/mastodon/locales/whitelist_br.json
diff --git a/app/javascript/mastodon/locales/whitelist_nn.json b/app/javascript/mastodon/locales/whitelist_nn.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_nn.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_pt-PT.json b/app/javascript/mastodon/locales/whitelist_pt-PT.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_pt-PT.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 8ab7046c1bea188ac223d67d5dca16454fe6dffe..2f0373d93ca7ace733a97729b6c30c09ec9c511b 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -63,6 +63,7 @@
"column.notifications": "通知",
"column.pins": "置顶嘟文",
"column.public": "跨站公共时间轴",
+ "column.status": "Toot",
"column_back_button.label": "返回",
"column_header.hide_settings": "éšè—设置",
"column_header.moveLeft_settings": "å°†æ¤æ 左移",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index d63a9dd3463c1cb9426f1219df50dd253547e8e9..0a42aa47f7038f43d92e3b78efcba9c7ce4ed31b 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -63,6 +63,7 @@
"column.notifications": "通知",
"column.pins": "ç½®é ‚æ–‡ç« ",
"column.public": "跨站時間軸",
+ "column.status": "Toot",
"column_back_button.label": "返回",
"column_header.hide_settings": "éš±è—è¨å®š",
"column_header.moveLeft_settings": "將欄左移",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index d0b95da8c03de662140fc2746fe9b7fec580b511..82d7b6db585b5da729322d66d8cf7786a1ff741b 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -63,6 +63,7 @@
"column.notifications": "通知",
"column.pins": "釘é¸çš„嘟文",
"column.public": "è¯é‚¦æ™‚間軸",
+ "column.status": "Toot",
"column_back_button.label": "上一é ",
"column_header.hide_settings": "éš±è—è¨å®š",
"column_header.moveLeft_settings": "將欄ä½å‘左移動",
diff --git a/config/application.rb b/config/application.rb
index f49deffbb6d4e14b78c5c10ff5087fe4a2e403e6..5fd37120d01e5dfd855298a10dd39c222647cada 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -76,7 +76,7 @@ module Mastodon
:no,
:oc,
:pl,
- :pt,
+ :'pt-PT',
:'pt-BR',
:ro,
:ru,
diff --git a/config/locales/activerecord.br.yml b/config/locales/activerecord.br.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c7677c850c634b75b037ffd563bb1e1a6e36a5cf
--- /dev/null
+++ b/config/locales/activerecord.br.yml
@@ -0,0 +1 @@
+br:
diff --git a/config/locales/activerecord.nn.yml b/config/locales/activerecord.nn.yml
new file mode 100644
index 0000000000000000000000000000000000000000..777f4e600f65daa6a550f2cf0f04551a49cf4fcd
--- /dev/null
+++ b/config/locales/activerecord.nn.yml
@@ -0,0 +1 @@
+nn:
diff --git a/config/locales/activerecord.pt.yml b/config/locales/activerecord.pt.yml
deleted file mode 100644
index 556fcfc4fd9caabbdf4e62d682a67feef16696e9..0000000000000000000000000000000000000000
--- a/config/locales/activerecord.pt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-pt:
- activerecord:
- errors:
- models:
- account:
- attributes:
- username:
- invalid: apenas letras, números e underscores
- status:
- attributes:
- reblog:
- taken: do status já existe
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 82d2485a7509b30078453c46ede76d111bdc8724..45001e6fc287d2c43d7d7f5dc9c8e85264153845 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -240,6 +240,7 @@ ar:
copied_msg: تم إنشاء نسخة Ù…Øلية للإيموجي بنجاØ
copy: نسخ
copy_failed_msg: Ùشلت عملية إنشاء نسخة Ù…Øلية لهذا الإيموجي
+ create_new_category: انشئ Ùئة جديدة
created_msg: تم إنشاء الإيموجي بنجاØ!
delete: ØØ°Ù
destroyed_msg: تمت عملية تدمير الإيموجي بنجاØ!
@@ -256,6 +257,7 @@ ar:
shortcode: الترميز المÙصَغّر
shortcode_hint: على الأقل ØرÙين، Ùˆ Ùقط رموز أبجدية عددية Ùˆ أسطر سÙلية
title: الإيموجي الخاصة
+ uncategorized: غير مصنّÙ
unlisted: غير مدرج
update_failed_msg: تعذرت عملية تØديث ذاك الإيموجي
updated_msg: تم تØديث الإيموجي بنجاØ!
@@ -501,6 +503,7 @@ ar:
in_directory: "%{count} ÙÙŠ سجل Øسابات المستخدمين"
title: الوسوم
trending_right_now: متداول اللØظة
+ unique_uses_today: "%{count} منشورات اليوم"
unreviewed: غير Ù…Ùراجَع
updated_msg: تم تØديث إعدادات الوسوم بنجاØ
title: الإدارة
@@ -595,7 +598,6 @@ ar:
x_months: "%{count} شه"
x_seconds: "%{count}Ø«"
deletes:
- bad_password_msg: إنّ الكلمة السرية التي أدخلتها غير صØÙŠØØ©
confirm_password: قم بإدخال كلمتك السرية الØالية للتØقق من هويتك
proceed: ØØ°Ù Øساب
success_msg: تم ØØ°Ù Øسابك بنجاØ
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index e801d4b5171c7249295ebd367fbfefc4f75b21da..72b87a6acb7da2d843d9c479b1551d496c0dd912 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -131,7 +131,6 @@ ast:
half_a_minute: Púramente agora
less_than_x_seconds: Púramente agora
deletes:
- bad_password_msg: "¡Bon intentu, crackers! Contraseña incorreuta"
confirm_password: Introduz la contraseña pa verificar la to identidá
errors:
'400': The request you submitted was invalid or malformed.
diff --git a/config/locales/br.yml b/config/locales/br.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3710084e7df2f382222859c0539bc7c83bdf9cb0
--- /dev/null
+++ b/config/locales/br.yml
@@ -0,0 +1,20 @@
+---
+br:
+ errors:
+ '400': The request you submitted was invalid or malformed.
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '406': This page is not available in the requested format.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
+ '503': The page could not be served due to a temporary server failure.
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index a23b6ddf4722a643ca534a9286e6bd4caa5d6135..bfd7c514db8fd5f1b7f5f7ebd12729bed39c7f4a 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -620,7 +620,6 @@ ca:
x_months: "%{count} mesos"
x_seconds: "%{count} s"
deletes:
- bad_password_msg: Bon intent hackers! La contrasenya no és correcta
confirm_password: Introdueix la contrasenya actual per a verificar la identitat
proceed: Suprimeix el compte
success_msg: El compte s'ha eliminat correctament
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 8ecff0d59527e2e7f4761fcea3e2c9617412f459..e91b1361f15bbd18ee190b2bf5bb1d4ea9e06cc1 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -427,6 +427,9 @@ co:
custom_css:
desc_html: Mudificà l'apparenza cù CSS caricatu nant'à ogni pagina
title: CSS persunalizatu
+ default_noindex:
+ desc_html: Tocca tutti quelli ch'ùn anu micca cambiatu stu parametru
+ title: Ritirà l'utilizatori di l'indicazione nant'à i mutori di ricerca
domain_blocks:
all: À tutti
disabled: À nimu
@@ -629,7 +632,6 @@ co:
x_months: "%{count}Me"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: È nò! Sta chjave ùn hè curretta
confirm_password: Entrate a vostra chjave d’accessu attuale per verificà a vostra identitÃ
proceed: Sguassà u contu
success_msg: U vostru contu hè statu sguassatu
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 46700be56b0f82e3c312ca44a12e4200279e1163..569eb35d21dc21afbaa1c74d71b95bf610b9e0d6 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -233,10 +233,12 @@ cs:
deleted_status: "(smazaný toot)"
title: Záznam auditu
custom_emojis:
+ assign_category: Přiřadit kategorii
by_domain: Doména
copied_msg: MÃstnà kopie emoji byla úspěšnÄ› vytvoÅ™ena
copy: KopÃrovat
copy_failed_msg: Nebylo možné vytvoÅ™it mÃstnà kopii tohoto emoji
+ create_new_category: Vytvořit novou kategorii
created_msg: Emoji úspěšně vytvořeno!
delete: Smazat
destroyed_msg: Emoji úspěšnÄ› zniÄeno!
@@ -253,6 +255,7 @@ cs:
shortcode: Zkratka
shortcode_hint: Alespoň 2 znaky, pouze alfanumerické znaky a podtržÃtka
title: Vlastnà emoji
+ uncategorized: Nezařazená
unlisted: Neuvedeno
update_failed_msg: Nebylo možné aktualizovat toto emoji
updated_msg: Emoji úspěšně aktualizováno!
@@ -436,6 +439,9 @@ cs:
custom_css:
desc_html: PozmÄ›nit vzhled pomocà šablony CSS naÄtené na každé stránce
title: Vlastnà CSS
+ default_noindex:
+ desc_html: Ovlivňuje všechny uživatele, kteřà toto nastavenà sami nezměnili
+ title: Odhlásit uživatele z indexovánà vyhledávaÄemi ve výchozÃm stavu
domain_blocks:
all: VÅ¡em
disabled: Nikomu
@@ -447,7 +453,7 @@ cs:
desc_html: Zobrazuje se na hlavnà stránce. DoporuÄuje se rozliÅ¡enà alespoň 600x100 px. Pokud toto nenà nastaveno, bude zobrazena miniatura serveru
title: Hlavnà obrázek
mascot:
- desc_html: Zobrazuje se na hlavnà stránce. DoporuÄuje se rozliÅ¡enà alespoň 293x205 px. Pokud toto nenà nastaveno, bude zobrazen výchozà maskot
+ desc_html: Zobrazuje se na nÄ›kolika stránkách. DoporuÄuje se rozliÅ¡enà alespoň 293x205 px. Pokud toto nenà nastaveno, bude zobrazen výchozà maskot
title: Obrázek maskota
peers_api_enabled:
desc_html: Domény, na které tento server narazil ve fedivesmÃru
@@ -638,7 +644,6 @@ cs:
x_months: "%{count} mesÃců"
x_seconds: "%{count} s"
deletes:
- bad_password_msg: Dobrý pokus, hackeři! Nesprávné heslo
confirm_password: Zadejte svoje souÄasné heslo pro ověřenà vaÅ¡Ã identity
proceed: Odstranit úÄet
success_msg: Váš úÄet byl úspěšnÄ› odstranÄ›n
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index a1d637f2e12fb5d67e900e62b954e8dac1ea22a5..a58ea25349dc57577eb9d31a55f2ed01f7d4afaf 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -581,7 +581,6 @@ cy:
x_months: "%{count}mis"
x_seconds: "%{count}eiliad"
deletes:
- bad_password_msg: Go dda, hacwyr! Cyfrinair anghywir
confirm_password: Mewnbynnwch eich cyfrinair presennol i gadarnhau mai chi sydd yno
proceed: Dileu cyfrif
success_msg: Llwyddwyd i ddileu eich cyfrif
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 70397c77b19c5c363ebab361d5aecabe1eae62d9..06a68f68410af5b109c3e095d6ee47994a17d861 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -207,6 +207,7 @@ da:
copied_msg: Succesfuldt oprettede en lokal kopi af humørikonet
copy: Kopier
copy_failed_msg: Kunne ikke oprette en lokal kopi af dette humørikon
+ create_new_category: Opret ny kategori
created_msg: Humørikon succesfuldt oprettet!
delete: Slet
destroyed_msg: Emojo succesfuldt destrueret!
@@ -514,7 +515,6 @@ da:
over_x_years: "%{count}Ã¥r"
x_months: "%{count}md"
deletes:
- bad_password_msg: Godt forsøg, hackere! Forkert kodeord
confirm_password: Indtast dit nuværende kodeord for at bekræfte din identitet
proceed: Slet konto
success_msg: Din konto er nu blevet slettet
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0af7be2f425923172a88962e9ea735ddb7da0f9c..fb988668a5f91058d107ae8022897947918ab7e2 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -225,10 +225,12 @@ de:
deleted_status: "(gelöschter Beitrag)"
title: Überprüfungsprotokoll
custom_emojis:
+ assign_category: Kategorie zuweisen
by_domain: Domain
copied_msg: Eine lokale Kopie des Emojis wurde erstellt
copy: Kopieren
copy_failed_msg: Es konnte keine lokale Kopie des Emojis erstellt werden
+ create_new_category: Neue Kategorie erstellen
created_msg: Emoji erstellt!
delete: Löschen
destroyed_msg: Emoji gelöscht!
@@ -245,6 +247,7 @@ de:
shortcode: Kürzel
shortcode_hint: Mindestens 2 Zeichen, nur Buchstaben, Ziffern und Unterstriche
title: Eigene Emojis
+ uncategorized: Nicht kategorisiert
unlisted: Ungelistet
update_failed_msg: Konnte dieses Emoji nicht aktualisieren
updated_msg: Emoji erfolgreich aktualisiert!
@@ -424,6 +427,9 @@ de:
custom_css:
desc_html: Verändere das Aussehen mit CSS, dass auf jeder Seite geladen wird
title: Benutzerdefiniertes CSS
+ default_noindex:
+ desc_html: Beeinflusst alle Benutzer, die diese Einstellung nicht selbst geändert haben
+ title: Benutzer aus Suchmaschinen-Indizierung standardmäßig herausnehmen
domain_blocks:
all: An alle
disabled: An niemanden
@@ -626,7 +632,6 @@ de:
x_months: "%{count}mo"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: Falsches Passwort
confirm_password: Gib dein derzeitiges Passwort ein, um deine Identität zu bestätigen
proceed: Konto löschen
success_msg: Dein Konto wurde erfolgreich gelöscht
@@ -727,6 +732,7 @@ de:
all: Alle
changes_saved_msg: Änderungen gespeichert!
copy: Kopieren
+ no_batch_actions_available: Keine Massenaktionen auf dieser Seite verfügbar
order_by: Sortieren nach
save_changes: Änderungen speichern
validation_errors:
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c7677c850c634b75b037ffd563bb1e1a6e36a5cf
--- /dev/null
+++ b/config/locales/devise.br.yml
@@ -0,0 +1 @@
+br:
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
new file mode 100644
index 0000000000000000000000000000000000000000..777f4e600f65daa6a550f2cf0f04551a49cf4fcd
--- /dev/null
+++ b/config/locales/devise.nn.yml
@@ -0,0 +1 @@
+nn:
diff --git a/config/locales/devise.pt.yml b/config/locales/devise.pt.yml
deleted file mode 100644
index 9b44bbf00c6e6dadb06cf72c565e3270e9e78d15..0000000000000000000000000000000000000000
--- a/config/locales/devise.pt.yml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-pt:
- devise:
- confirmations:
- confirmed: O teu endereço de e-mail foi confirmado com sucesso.
- send_instructions: Vais receber um email com as instruções para confirmar o teu endereço de email dentro de alguns minutos. Por favor, verifica a caixa de spam se não recebeste o e-mail.
- send_paranoid_instructions: Se o teu endereço de email já existir na nossa base de dados, vais receber um email com as instruções de confirmação dentro de alguns minutos. Por favor, verifica a caixa de spam se não recebeste o e-mail.
- failure:
- already_authenticated: A tua sessão já está aberta.
- inactive: A tua conta ainda não está ativada.
- invalid: "%{authentication_keys} ou palavra-passe inválida."
- last_attempt: Tens mais uma tentativa antes de a tua conta ficar bloqueada.
- locked: A tua conta está bloqueada.
- not_found_in_database: "%{authentication_keys} ou palavra-passe inválida."
- timeout: A tua sessão expirou. Por favor, entra de novo para continuares.
- unauthenticated: Precisas de entrar na tua conta ou de te registares antes de continuar.
- unconfirmed: Tens de confirmar o teu endereço de email antes de continuar.
- mailer:
- confirmation_instructions:
- action: Verificar o endereço de e-mail
- action_with_app: Confirmar e regressar a %{app}
- explanation: Criaste uma conta em %{host} com este endereço de e-mail. Estás a um clique de activá-la. Se não foste tu que fizeste este registo, por favor ignora esta mensagem.
- extra_html: Por favor lê <a href="%{terms_path}">as regras da instância</a> e os <a href="%{policy_path}"> nossos termos de serviço</a>.
- subject: 'Mastodon: Instruções de confirmação %{instance}'
- title: Verificar o endereço de e-mail
- email_changed:
- explanation: 'O e-mail associado à tua conta será alterado para:'
- extra: Se não alteraste o teu e-mail é possÃvel que alguém tenha conseguido aceder à tua conta. Por favor muda a tua palavra-passe imediatamente ou entra em contato com um administrador do servidor se ficaste sem acesso à tua conta.
- subject: 'Mastodon: Email alterado'
- title: Novo endereço de e-mail
- password_change:
- explanation: A palavra-passe da tua conta foi alterada.
- extra: Se não alteraste a tua palavra-passe, é possÃvel que alguém tenha conseguido aceder à tua conta. Por favor muda a tua palavra-passe imediatamente ou entra em contato com um administrador do servidor se ficaste sem acesso à tua conta.
- subject: 'Mastodon: Nova palavra-passe'
- title: Palavra-passe alterada
- reconfirmation_instructions:
- explanation: Confirma o teu novo endereço para alterar o e-mail.
- extra: Se esta mudança não foi iniciada por ti, por favor ignora este e-mail. O endereço de e-mail para a tua conta do Mastodon não irá mudar enquanto não acederes ao link acima.
- subject: 'Mastodon: Confirmação de e-mail %{instance}'
- title: Validar o endereço de e-mail
- reset_password_instructions:
- action: Alterar palavra-passe
- explanation: Pediste a alteração da palavra-passe da tua conta.
- extra: Se não fizeste este pedido, por favor ignora este e-mail. A tua palavra-passe não irá mudar se não acederes ao link acima e criares uma nova.
- subject: 'Mastodon: Instruções para alterar a palavra-passe'
- title: Solicitar nova palavra-passe
- unlock_instructions:
- subject: 'Mastodon: Instruções para desbloquear a tua conta'
- omniauth_callbacks:
- failure: Não foi possÃvel autenticar %{kind} porque "%{reason}".
- success: Autenticado com sucesso na conta %{kind}.
- passwords:
- no_token: Não pode aceder a esta página se não vier através do link enviado por email para alteração da sua palavra-passe. Se usaste esse link para chegar aqui, por favor verifica que o endereço URL actual é o mesmo do que foi enviado no email.
- send_instructions: Vais receber um email com instruções para alterar a palavra-passe dentro de algns minutos.
- send_paranoid_instructions: Se o teu endereço de email existe na nossa base de dados, vais receber um link para recuperar a palavra-passe dentro de alguns minutos.
- updated: A tua palavra-passe foi alterada. Estás agora autenticado na tua conta.
- updated_not_active: A tua palavra-passe foi alterada.
- registrations:
- destroyed: Adeus! A tua conta foi cancelada. Esperamos ver-te em breve.
- signed_up: Bem-vindo! A tua conta foi registada com sucesso.
- signed_up_but_inactive: A tua conta foi registada. No entanto ainda não está activa.
- signed_up_but_locked: A tua conta foi registada. No entanto está bloqueada.
- signed_up_but_unconfirmed: Uma mensagem com um link de confirmação foi enviada para o teu email. Por favor segue esse link para activar a tua conta.
- update_needs_confirmation: Alteraste o teu endereço de email ou palavra-passe, mas é necessário confirmar essa alteração. Por favor vai ao teu email e segue link que te enviámos.
- updated: A tua conta foi actualizada com sucesso.
- sessions:
- already_signed_out: Sessão encerrada.
- signed_in: Sessão iniciada.
- signed_out: Sessão encerrada.
- unlocks:
- send_instructions: Vais receber um email com instruções para desbloquear a tua conta dentro de alguns minutos.
- send_paranoid_instructions: Se a tua conta existe, vais receber um email com instruções a detalhar como a desbloquear dentro de alguns minutos.
- unlocked: A sua conta foi desbloqueada. Por favor inica uma nova sessão para continuar.
- errors:
- messages:
- already_confirmed: já confirmado, por favor tente iniciar sessão
- confirmation_period_expired: tem de ser confirmado durante %{period}, por favor tenta outra vez
- expired: expirou, por favor tente outra vez
- not_found: não encontrado
- not_locked: não estava bloqueada
- not_saved:
- one: '1 erro impediu este %{resource} de ser guardado:'
- other: "%{count} erros impediram este %{resource} de ser guardado:"
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c7677c850c634b75b037ffd563bb1e1a6e36a5cf
--- /dev/null
+++ b/config/locales/doorkeeper.br.yml
@@ -0,0 +1 @@
+br:
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
new file mode 100644
index 0000000000000000000000000000000000000000..777f4e600f65daa6a550f2cf0f04551a49cf4fcd
--- /dev/null
+++ b/config/locales/doorkeeper.nn.yml
@@ -0,0 +1 @@
+nn:
diff --git a/config/locales/doorkeeper.pt.yml b/config/locales/doorkeeper.pt-PT.yml
similarity index 99%
rename from config/locales/doorkeeper.pt.yml
rename to config/locales/doorkeeper.pt-PT.yml
index f21e84d17f34338898398ed1641d966334b95850..42068e0a0b1b6b05fcf11a714b636afcb17c756a 100644
--- a/config/locales/doorkeeper.pt.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -1,5 +1,5 @@
---
-pt:
+pt-PT:
activerecord:
attributes:
doorkeeper/application:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 43fec340a11a185b850344d6b9ff2eeb90e98097..acc97d37e7d1a225252c24cf176295615ac5a74c 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -626,7 +626,6 @@ el:
x_months: "%{count}μ"
x_seconds: "%{count}δ"
deletes:
- bad_password_msg: Καλή Ï€Ïοσπάθεια χάκεÏÏ‚! Λάθος συνθηματικό
confirm_password: ΓÏάψε το Ï„ÏÎχον συνθηματικό σου για να πιστοποιήσεις την ταυτότητά σου
proceed: ΔιαγÏαφή λογαÏιασμοÏ
success_msg: Ο λογαÏιασμός σου διαγÏάφηκε με επιτυχία
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 5785f9b20f9e33fe5e58add641ca1a983fbbfe3d..b5b8656a45ad241bbee272f1c4c9f4612ce36dee 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -597,7 +597,6 @@ eo:
x_months: "%{count}mo"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: MalÄusta pasvorto
confirm_password: Enmetu vian nunan pasvorton por konfirmi vian identecon
proceed: Forigi konton
success_msg: Via konto estis sukcese forigita
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 184f0da0e5db92d7dcde8e13c643b1444db63c38..892d82e9cae9366626b11191b11d34c387669f64 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -56,6 +56,7 @@ es:
media: Multimedia
moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
network_hidden: Esta información no está disponible
+ never_active: Nunca
nothing_here: "¡No hay nada aquÃ!"
people_followed_by: Usuarios a quien %{name} sigue
people_who_follow: Usuarios que siguen a %{name}
@@ -222,6 +223,7 @@ es:
deleted_status: "(estado borrado)"
title: Log de auditorÃa
custom_emojis:
+ assign_category: Asignar categorÃa
by_domain: Dominio
copied_msg: Copia local del emoji creada con éxito
copy: Copiar
@@ -242,6 +244,7 @@ es:
shortcode: Código de atajo
shortcode_hint: Al menos 2 caracteres, solo caracteres alfanuméricos y guiones bajos
title: Emojis personalizados
+ uncategorized: Sin clasificar
unlisted: Sin listar
update_failed_msg: No se pudo actualizar ese emoji
updated_msg: "¡Emoji actualizado con éxito!"
@@ -489,6 +492,7 @@ es:
delete: Eliminar
nsfw_off: Marcar contenido como no sensible
nsfw_on: Marcar contenido como sensible
+ deleted: Eliminado
failed_to_execute: Falló al ejecutar
media:
title: Multimedia
@@ -609,7 +613,6 @@ es:
x_months: "%{count}m"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: "¡Buen intento, hackers! Contraseña incorrecta"
confirm_password: Ingresa tu contraseña actual para demostrar tu identidad
proceed: Eliminar cuenta
success_msg: Tu cuenta se eliminó con éxito
@@ -617,6 +620,8 @@ es:
directory: Directorio de perfiles
explanation: Descubre usuarios según sus intereses
explore_mastodon: Explorar %{title}
+ domain_blocks:
+ domain: Dominio
domain_validator:
invalid_domain: no es un nombre de dominio válido
errors:
@@ -676,6 +681,7 @@ es:
developers: Desarrolladores
more: Mas…
resources: Recursos
+ trending_now: Tendencia ahora
generic:
all: Todos
changes_saved_msg: "¡Cambios guardados con éxito!"
diff --git a/config/locales/et.yml b/config/locales/et.yml
index d02eb24bab2012573442713580a6a11aa7e7ea3a..7d077198300d3147adec95dbb18fd321b2eb68e8 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -585,7 +585,6 @@ et:
x_months: "%{count}k"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: Hea proov, häkkerid! Vale salasõna
confirm_password: Sisesta oma praegune salasõna, et kinnitada oma identiteet
proceed: Kustuta konto
success_msg: Konto kustutamine õnnestus
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 56271f3c396b366b630217342b0cca28e6cdf112..2a4d6129610e2eec5dfd00f2e5a1c67272f805d3 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -611,7 +611,6 @@ eu:
x_months: "%{count} hilabete"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: Saiakera ona hacker! Pasahitz okerra
confirm_password: Sartu zure oraingo pasahitza zure identitatea baieztatzeko
proceed: Ezabatu kontua
success_msg: Zure kontua ongi ezabatu da
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0b4d046f3348852c917b481a158e099748fd9ee3..7f316c784899cacd7f13845435c545d96ae7c0aa 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -620,7 +620,6 @@ fa:
x_months: "%{count} ماه"
x_seconds: "%{count} ثانیه"
deletes:
- bad_password_msg: هکر گرامی، رمزی که وارد کردید اشتباه است ؛)
confirm_password: رمز Ùعلی خود را وارد کنید تا معلوم شود Ú©Ù‡ خود شمایید
proceed: پاک‌کردن Øساب
success_msg: Øساب شما با موÙقیت پاک شد
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 5a3a8ad6002a0da3da0920e39a563af7d3d8e2b3..3d8fdce3a57ff6dda7856547d653d2b201c2bd82 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -393,7 +393,6 @@ fi:
x_months: "%{count} kk"
x_seconds: "%{count} s"
deletes:
- bad_password_msg: Hyvä yritys, hakkerit! Väärä salasana
confirm_password: Tunnistaudu syöttämällä nykyinen salasanasi
proceed: Poista tili
success_msg: Tilin poisto onnistui
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 58b16075168d1a5938568870ada42cfff2dc8198..15d6359b43ac9353b8eb7289c72870a44dbfd1c6 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -626,7 +626,6 @@ fr:
x_months: "%{count} mois"
x_seconds: "%{count} s"
deletes:
- bad_password_msg: Bien essayé ! Mot de passe incorrect
confirm_password: Entrez votre mot de passe pour vérifier votre identité
proceed: Supprimer compte
success_msg: Votre compte a été supprimé avec succès
@@ -1079,7 +1078,7 @@ fr:
<p>Dans le cas où nous déciderions de changer notre politique de confidentialité, nous posterons les modifications sur cette page.</p>
- <p>Ce document est publié sous lincence CC-BY-SA. Il a été mis à jours pour la dernière fois le 7 mars 2018.</p>
+ <p>Ce document est publié sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 7 mars 2018.</p>
<p>Originellement adapté de la <a href="https://github.com/discourse/discourse">politique de confidentialité de Discourse</a>.</p>
title: "%{instance} Conditions d’utilisation et politique de confidentialité"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 0c515a2ecab714f1d86e69e64b96abdbe2176ffb..20f535ad5ca2ba437cc8e2d168d0fba707e94333 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -629,7 +629,6 @@ gl:
x_months: "%{count}mes"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: Bo intento, hackers! Contrasinal incorrecto
confirm_password: Introduza o seu contrasinal para verificar a súa identidade
proceed: Eliminar conta
success_msg: A súa conta eliminouse correctamente
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 7aa75434cb25b201fd7ac9bca2b8cdfbb215d32d..5d9097d09488fd72fdce48cd7ac282152ee6ef57 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -611,7 +611,6 @@ hu:
x_months: "%{count}h"
x_seconds: "%{count}mp"
deletes:
- bad_password_msg: Haha, hekker! Helytelen jelszó
confirm_password: Személyazonosságod megerÅ‘sÃtéséhez Ãrd be a jelenlegi jelszavad
proceed: Felhasználói fiók törlése
success_msg: Felhasználói fiókod sikeresen töröltük
diff --git a/config/locales/it.yml b/config/locales/it.yml
index f62d309dfcd2bde7bffef827bd286837c027ad66..7b3eede09df07c541b93a86c24e9162ee2371632 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -617,7 +617,6 @@ it:
x_months: "%{count} mesi"
x_seconds: "%{count} secondi"
deletes:
- bad_password_msg: Ci avete provato, hacker! Password errata
confirm_password: Inserisci la tua password attuale per verificare la tua identitÃ
proceed: Cancella l'account
success_msg: Il tuo account è stato cancellato
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d4c6058bf2f9be5ca0994484905bb213bde4be74..cfaee9a381172c7ccbe0de81798e44244a1432c6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -616,7 +616,6 @@ ja:
x_months: "%{count}月"
x_seconds: "%{count}秒"
deletes:
- bad_password_msg: パスワードãŒé•ã„ã¾ã™
confirm_password: 本人確èªã®ãŸã‚ã€ç¾åœ¨ã®ãƒ‘スワードを入力ã—ã¦ãã ã•ã„
proceed: アカウントを削除ã™ã‚‹
success_msg: アカウントã¯æ£å¸¸ã«å‰Šé™¤ã•ã‚Œã¾ã—ãŸ
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index b9b9b664ff37f3f54f57b0b9baf10b801c3b540a..93cc8ec5a65ddbe59dae5d61d6c46accc73d67d2 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -434,7 +434,6 @@ ka:
x_months: "%{count}თვე"
x_seconds: "%{count}წმ"
deletes:
- bad_password_msg: კáƒáƒ გáƒáƒ“ სცáƒáƒ“ეთ, ჰáƒáƒ™áƒ”რებáƒ! áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი პáƒáƒ áƒáƒšáƒ˜
confirm_password: იდენტáƒáƒ‘ის დáƒáƒ¡áƒáƒ›áƒáƒ¬áƒ›áƒ”ბლáƒáƒ“ შეიყვáƒáƒœáƒ”თ მიმდინáƒáƒ ე პáƒáƒ áƒáƒšáƒ˜
proceed: áƒáƒœáƒ’áƒáƒ იშის გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ
success_msg: თქვენი áƒáƒœáƒ’áƒáƒ იში წáƒáƒ მáƒáƒ¢áƒ”ბით გáƒáƒ£áƒ¥áƒ›áƒ“áƒ
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 736816425f108fd1cd447fc332d2d36ebbb22918..3658b2293be53067d57094b4e94d2576c004f03b 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -510,7 +510,6 @@ kk:
x_months: "%{count}ай"
x_seconds: "%{count}Ñек"
deletes:
- bad_password_msg: Болмады ма, хакер бала? ҚұпиÑÑөз қате
confirm_password: Қазіргі құпиÑÑөзіңізді жазыңыз
proceed: Ðккаунт өшіру
success_msg: Ðккаунтыңыз Ñәтті өшірілді
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 1c4170d8af8d9523bac07177c18bdbfec89dce56..fc9fa7b80a5c3c9ec5bee80060803261cdc5b2af 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -618,7 +618,6 @@ ko:
x_months: "%{count}ì›”"
x_seconds: "%{count}ì´ˆ"
deletes:
- bad_password_msg: 비밀번호가 올바르지 않습니다
confirm_password: ë³¸ì¸ í™•ì¸ì„ 위해 현재 사용 ì¤‘ì¸ ì•”í˜¸ë¥¼ ìž…ë ¥í•´ 주ì‹ì‹œì˜¤
proceed: ê³„ì • ì‚ì œ
success_msg: ê³„ì •ì´ ì„±ê³µì 으로 ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a5dd5cbf5dd7e2a33b58a8079bfbe56806e745c3..7aed705cb3344762ef385ab0d1e22acbdb208271 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -490,7 +490,6 @@ lt:
x_months: "%{count}mÄ—n"
x_seconds: "%{count}sek"
deletes:
- bad_password_msg: Geras bandymas, programišiau! Neteisingas slaptažodis
confirm_password: Kad patvirtintumėte savo tapatybę, įveskite dabartini slaptažodį
proceed: IÅ¡trinti paskyrÄ…
success_msg: Jūsų paskyra sėkmingai ištrinta
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 25e6c6591fca8cf3d75f58017d3c4768da45dce4..9298e0ae08c7d0dc46ae03959ac086fc34cb9cd9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -600,7 +600,6 @@ nl:
x_months: "%{count}ma"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: Goed geprobeerd hackers! Ongeldig wachtwoord
confirm_password: Voer jouw huidige wachtwoord in om jouw identiteit te bevestigen
proceed: Account verwijderen
success_msg: Jouw account is succesvol verwijderd
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a1b61d6e7db4a8e6cc2c7c85eedf4c5a8315db75
--- /dev/null
+++ b/config/locales/nn.yml
@@ -0,0 +1,20 @@
+---
+nn:
+ errors:
+ '400': The request you submitted was invalid or malformed.
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '406': This page is not available in the requested format.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
+ '503': The page could not be served due to a temporary server failure.
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 4cf080be919362f3dc72a4458fac327743f24408..1d675aef684c14dd1670d45d7b2d3a154d510c68 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -326,7 +326,6 @@
x_months: "%{count} mnd"
x_seconds: "%{count} sek"
deletes:
- bad_password_msg: Godt forsøk, hacker! Feil passord
confirm_password: Skriv inn ditt passord for å verifisere din identitet
proceed: Slett konto
success_msg: Din konto ble slettet
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 65e381b3a2edf5f1c2f9c05121f27e9bbb8cef5f..2884380b8bc9545cde814faac2ac3565c3c9eb41 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -580,7 +580,6 @@ oc:
x_months: "%{count} meses"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: Ben ensajat pirata ! Senhal incorrècte
confirm_password: Picatz vòstre senhal actual per verificar vòstra identitat
proceed: Suprimir lo compte
success_msg: Compte ben suprimit
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 0671979fef3cc1d1bb7ebc4eb92c1f1702883668..23d0c8a989e7fb8fc9acd436dd70fcb612ab90ae 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -569,7 +569,6 @@ pl:
x_months: "%{count} miesięcy"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: Niezła próba, hakerze! Wprowadzono nieprawidłowe hasło
confirm_password: Wprowadź aktualne hasło, aby potwierdzić tożsamość
proceed: Usuń konto
success_msg: Twoje konto zostało pomyślnie usunięte
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index af4d117e0b1fb9c537a0bfe258c59a33ad0ac104..9896f888a412c960d31d46c1b75d01a752093fc5 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -526,7 +526,6 @@ pt-BR:
x_months: "%{count} meses"
x_seconds: "%{count} segundos"
deletes:
- bad_password_msg: Boa tentativa, hackers! Senha incorreta
confirm_password: Insira a sua senha atual para verificar a sua identidade
proceed: Excluir conta
success_msg: A sua conta foi excluÃda com sucesso
diff --git a/config/locales/pt.yml b/config/locales/pt-PT.yml
similarity index 99%
rename from config/locales/pt.yml
rename to config/locales/pt-PT.yml
index eeb158f6c35cda9002fc170ff0bfd232311ca1d5..25ee570851d1a2594a6499717a47c117f237082d 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt-PT.yml
@@ -1,5 +1,5 @@
---
-pt:
+pt-PT:
about:
about_hashtag_html: Estes são toots públicos marcados com <strong>#%{hashtag}</strong>. Podes interagir com eles se tiveres uma conta Mastodon.
about_mastodon_html: Mastodon é uma rede social baseada em protocolos abertos da web e software livre e gratuito. É descentralizado como e-mail.
@@ -499,7 +499,6 @@ pt:
x_months: "%{count} meses"
x_seconds: "%{count} segundos"
deletes:
- bad_password_msg: Boa tentativa, hackers! Palavra-passe incorreta
confirm_password: Introduz a palavra-passe atual para verificar a tua identidade
proceed: Eliminar conta
success_msg: A tua conta foi eliminada com sucesso
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index d04d0015f77188a50ac6bed4bd3dc829c2bb26ff..7deab602139c2b16289ad21c472521fb29d158d9 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -43,7 +43,6 @@ ro:
x_days: "%{count}z"
x_months: "%{count}l"
deletes:
- bad_password_msg: Bună încercare, hackere! Parolă incorectă
confirm_password: Introdu parola curentă pentru a-ți verifica identitatea
proceed: Șterge contul
success_msg: Contul tău a fost șterg. Nu mai poate fi recuperat :D
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d1ed8d1de1a5507f933466fab162a6933e462b3a..0c12021182b66f829740513c6f01d50148410a38 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -273,7 +273,7 @@ ru:
space: ИÑпользовано меÑта
title: Панель управлениÑ
total_users: вÑего пользователей
- trends: Тренды
+ trends: Ðктуальное
week_interactions: взаимодейÑтвий на Ñтой неделе
week_users_active: активно на Ñтой неделе
week_users_new: пользователей на Ñтой неделе
@@ -517,6 +517,8 @@ ru:
subject: ÐÐ¾Ð²Ð°Ñ Ð¶Ð°Ð»Ð¾Ð±Ð°, узел %{instance} (#%{id})
appearance:
advanced_web_interface: Многоколоночный интерфейÑ
+ confirmation_dialogs: Окна подтверждений
+ discovery: Обзор
sensitive_content: ЧувÑтвительное Ñодержимое
application_mailer:
notification_preferences: Изменить наÑтройки e-mail
@@ -583,7 +585,6 @@ ru:
x_months: "%{count}меÑ"
x_seconds: "%{count}Ñек"
deletes:
- bad_password_msg: Ðе вышло, хакеры! Ðеверный пароль
confirm_password: Введите текущий пароль Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð’Ð°ÑˆÐµÐ¹ личноÑти
proceed: Удалить аккаунт
success_msg: Ваш аккаунт был уÑпешно удален
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c7677c850c634b75b037ffd563bb1e1a6e36a5cf
--- /dev/null
+++ b/config/locales/simple_form.br.yml
@@ -0,0 +1 @@
+br:
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 35cebcad800516195f8f64f340f4f18f0dec46b4..898d200d2928b952b28150ca180e3d6c01f98fb8 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -5,6 +5,7 @@ es:
account_warning_preset:
text: Puede usar sintaxis de toots, como URLs, hashtags y menciones
admin_account_action:
+ include_statuses: El usuario verá qué toots han causado la acción de moderación o advertencia
send_email_notification: El usuario recibirá una explicación de lo que sucedió con respecto a su cuenta
text_html: Opcional. Puede usar sintaxis de toots. Puede añadir <a href="%{path}">configuraciones predefinidas de advertencia</a> para ahorrar tiempo
type_html: Elige qué hacer con <strong>%{acct}</strong>
@@ -15,6 +16,7 @@ es:
bot: Esta cuenta ejecuta principalmente acciones automatizadas y podrÃa no ser monitorizada
context: Uno o múltiples contextos en los que debe aplicarse el filtro
digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
+ discoverable: El directorio del perfil es otra forma en la que su cuenta puede llegar a un público más amplio
email: Se le enviará un correo de confirmación
fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
@@ -47,6 +49,8 @@ es:
text: Esto nos ayudará a revisar su aplicación
sessions:
otp: 'Introduce el código de autenticación de dos factores geberado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
+ tag:
+ name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
user:
chosen_languages: Cuando se marca, solo se mostrarán los toots en los idiomas seleccionados en los timelines públicos
labels:
@@ -57,6 +61,7 @@ es:
account_warning_preset:
text: Texto predefinido
admin_account_action:
+ include_statuses: Incluir en el correo electrónico a los toots denunciados
send_email_notification: Notificar al usuario por correo electrónico
text: Aviso personalizado
type: Acción
@@ -111,6 +116,7 @@ es:
setting_show_application: Mostrar aplicación usada para publicar toots
setting_system_font_ui: Utilizar la tipografÃa por defecto del sistema
setting_theme: Tema del sitio
+ setting_trends: Mostrar las tendencias de hoy
setting_unfollow_modal: Mostrar diálogo de confirmación antes de dejar de seguir a alguien
setting_use_blurhash: Mostrar gradientes coloridos para contenido multimedia oculto
setting_use_pending_items: Modo lento
@@ -136,6 +142,12 @@ es:
pending_account: Enviar correo electrónico cuando una nueva cuenta necesita revisión
reblog: Enviar correo electrónico cuando alguien comparta su publicación
report: Enviar un correo cuando se envÃa un nuevo informe
+ trending_tag: Enviar correo electrónico cuando una etiqueta no revisada está de tendencia
+ tag:
+ listable: Permitir que esta etiqueta aparezca en las búsquedas y en el directorio del perfil
+ name: Etiqueta
+ trendable: Permitir que esta etiqueta aparezca bajo tendencias
+ usable: Permitir a los toots usar esta etiqueta
'no': 'No'
recommended: Recomendado
required:
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
new file mode 100644
index 0000000000000000000000000000000000000000..777f4e600f65daa6a550f2cf0f04551a49cf4fcd
--- /dev/null
+++ b/config/locales/simple_form.nn.yml
@@ -0,0 +1 @@
+nn:
diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt-PT.yml
similarity index 99%
rename from config/locales/simple_form.pt.yml
rename to config/locales/simple_form.pt-PT.yml
index 9f9d0fdc24b104f2a492e989da1d8677e34e654e..0ac31f8c2b42829e67466dd491f1d5ba712ccd6b 100644
--- a/config/locales/simple_form.pt.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -1,5 +1,5 @@
---
-pt:
+pt-PT:
simple_form:
hints:
account_warning_preset:
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index c4560100aaccb11c6f269c5a538481b9db19d1f5..ab5eb855e27acae53600503a0d5ed0c4eaa2acca 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -97,11 +97,11 @@ ru:
setting_advanced_layout: Включить многоколоночный интерфейÑ
setting_aggregate_reblogs: Группировать Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð² лентах
setting_auto_play_gif: ÐвтоматичеÑки проигрывать анимированные GIF
- setting_boost_modal: Показывать диалог Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ продвижением
+ setting_boost_modal: Ð’Ñегда Ñпрашивать перед продвижением
setting_default_language: Язык отправлÑемых ÑтатуÑов
setting_default_privacy: ВидимоÑÑ‚ÑŒ поÑтов
setting_default_sensitive: Ð’Ñегда отмечать медиаконтент как чувÑтвительный
- setting_delete_modal: Показывать диалог Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ удалением
+ setting_delete_modal: Ð’Ñегда Ñпрашивать перед удалении поÑта
setting_display_media: Отображение медиафайлов
setting_display_media_default: По умолчанию
setting_display_media_hide_all: Скрывать вÑе
@@ -114,7 +114,7 @@ ru:
setting_system_font_ui: ИÑпользовать шрифт ÑиÑтемы по умолчанию
setting_theme: Тема Ñайта
setting_trends: Показывать ÑегоднÑшние тренды
- setting_unfollow_modal: Показывать диалог Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ тем, как отпиÑатьÑÑ Ð¾Ñ‚ аккаунта
+ setting_unfollow_modal: Ð’Ñегда Ñпрашивать перед отпиÑкой от аккаунта
setting_use_blurhash: Показать цветные градиенты Ð´Ð»Ñ Ñкрытых медиа
setting_use_pending_items: Медленный режим
severity: СтрогоÑÑ‚ÑŒ
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 980e4613ec2174ea28b19d15b08e2bf783e8c56f..e6a30f0c34c82da06eab52aefcad6bc5c72490ef 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -20,7 +20,7 @@ sk:
extended_description_html: |
<h3>Pravidlá</h3>
<p>Žiadne zatiaľ uvedené nie sú</p>
- federation_hint_html: S úÄtom na %{instance} budeÅ¡ môcÅ¥ následovaÅ¥ ľúdà na hociakom Mastodon serveri, ale aj inde.
+ federation_hint_html: S úÄtom na %{instance} budeÅ¡ môcÅ¥ následovaÅ¥ ľúdà na hociakom Mastodon serveri, ale aj na iných serveroch.
generic_description: "%{domain} je jeden server v sieti"
get_apps: Vyskúšaj aplikácie
hosted_on: Mastodon hostovaný na %{domain}
@@ -28,7 +28,7 @@ sk:
Tento úÄet je virtuálnym aktérom, ktorý predstavuje samotný server a nie žiadného jedného užÃvateľa.
Je využÃvaný pre potreby federovania a nemal by byÅ¥ blokovaný, pokiaľ nechceÅ¡ zablokovaÅ¥ celý server, Äo ide lepÅ¡ie dosiahnúť cez blokovanie domény.
learn_more: Zisti viac
- privacy_policy: Ustanovenia o súkromÃ
+ privacy_policy: Zásady súkromia
see_whats_happening: Pozoruj, Äo sa deje
server_stats: 'Serverové štatistiky:'
source_code: Zdrojový kód
@@ -233,10 +233,12 @@ sk:
deleted_status: "(zmazaný prÃspevok)"
title: Kontrólny záznam
custom_emojis:
+ assign_category: PriraÄ kategóriu
by_domain: Doména
copied_msg: Miestna kópia emoji bola úspešne vytvorená
copy: KopÃruj
copy_failed_msg: Nebolo možné vytvoriť miestnu kópiu tohto emoji
+ create_new_category: Vytvor novú kategóriu
created_msg: Emoji úspešne vytvorené!
delete: Zmaž
destroyed_msg: Emoji úspeÅ¡ne zniÄené!
@@ -253,6 +255,7 @@ sk:
shortcode: Skratka
shortcode_hint: Aspoň 2 znaky, povolené sú alfanumerické, alebo podÄiarkovnÃk
title: Vlastné emoji
+ uncategorized: Nezaradené
unlisted: Nie je na zozname
update_failed_msg: Nebolo možné aktualizovať toto emoji
updated_msg: Emoji bolo úspešne aktualizované!
@@ -580,6 +583,7 @@ sk:
description:
prefix_invited_by_user: "@%{name} ťa pozýva na tento Mastodon server!"
prefix_sign_up: Zaregistruj sa na Mastodone už dnes!
+ suffix: S pomocou úÄtu budeÅ¡ môcÅ¥ následovaÅ¥ ľudÃ, posielaÅ¥ prÃspevky, a vymienaÅ¥ si správy s užÃvateľmi na hociakom Mastodon serveri, ale aj na iných serveroch!
didnt_get_confirmation: Neobdržal/a si kroky na potvrdenie?
forgot_password: Zabudnuté heslo?
invalid_reset_password_token: Token na obnovu hesla vyprÅ¡al. ProsÃm vypÃtaj si nový.
@@ -630,13 +634,15 @@ sk:
x_months: "%{count}mesiace"
x_seconds: "%{count}sek"
deletes:
- bad_password_msg: Dobrý pokus, hakeri! Nesprávne heslo
confirm_password: NapÃÅ¡te svoje terajÅ¡ie heslo pre overenie vaÅ¡ej identity
proceed: Vymaž úÄet
success_msg: Tvoj úÄet bol úspeÅ¡ne vymazaný
warning:
before: 'Predtým, než budeÅ¡ pokraÄovaÅ¥, prosÃm pozorne si preÄÃtaj tieto poznámky:'
caches: Obsah, ktorý bol predÄÃtaný inými servermi môže zanechaÅ¥ pozostatky
+ data_removal: Tvoje prÃspevky a iné dáta budú natrvalo odstránené
+ more_details_html: Pre viac podrobnostÃ, pozri <a href="%{terms_path}">zásady súkromia</a>.
+ username_available: Tvoje užÃvateľské meno bude znova dostupné
username_unavailable: Tvoja prezývka ostane neprÃstupná
directories:
directory: Katalóg profilov
@@ -660,10 +666,10 @@ sk:
domain_validator:
invalid_domain: nieje správny tvar domény
errors:
- '400': The request you submitted was invalid or malformed.
+ '400': Požiadavka, ktorú si odoslal/a, bola buÄ nesprávna, alebo znehodnotená.
'403': Nemáš povolenie pre zobrazenie tejto stránky.
'404': Stránka ktorú hľadáš nieje tu.
- '406': This page is not available in the requested format.
+ '406': Táto stránka nie je dostupná v požadovanom formáte.
'410': Stránka ktorú si tu hľadal/a sa tu už viac nenachádza.
'422':
content: BezpeÄtnostné overenie zlyhalo. BlokujeÅ¡ cookies?
@@ -672,7 +678,7 @@ sk:
'500':
content: Ospravedlňujem sa. NieÄo sa pokazilo na naÅ¡om konci.
title: Táto stránka nieje v poriadku
- '503': The page could not be served due to a temporary server failure.
+ '503': Táto stránka nemôže byÅ¥ naÄÃtaná, kvôli doÄasnému výpadku servera.
noscript_html: Aby bolo možné použÃvaÅ¥ Mastodon web aplikáciu, povoľ prosÃm JavaScript. Alebo skús jednu z <a href="%{apps_path}"> aplikácii </a> dostupných pre vaÅ¡u platformu.
existing_username_validator:
not_found: nepodarilo sa nájsÅ¥ miestného užÃvateľa s takouto prezývkou
@@ -721,6 +727,7 @@ sk:
all: VÅ¡etko
changes_saved_msg: Zmeny boli úspešne uložené!
copy: KopÃruj
+ no_batch_actions_available: Na tejto stránke niesú k dispozÃcii žiadne hromadné akcie
order_by: ZoraÄ podľa
save_changes: Ulož zmeny
validation_errors:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 02507923bea62a57091795f802b9b1bf5aafe831..47b835646b5a3f8ac61e6b6f8848ecd7eb4ee6dc 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -591,7 +591,6 @@ sl:
x_months: "%{count}mo"
x_seconds: "%{count}s"
deletes:
- bad_password_msg: Lep poskus, hekerji! napaÄno geslo
confirm_password: Vnesite svoje trenutno geslo, da potrdite svojo identiteto
proceed: IzbriÅ¡i raÄun
success_msg: VaÅ¡ raÄun je bil uspeÅ¡no izbrisan
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 68754ea24bce590f34b5f116c448ce62b37ea87c..4e5f3729478734657b95fd9e17c1e3a1fe73ffe9 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -490,7 +490,6 @@ sq:
over_x_years: "%{count}v"
x_months: "%{count}mj"
deletes:
- bad_password_msg: Provë e bukur, trimosha! Fjalëkalim i pasaktë
confirm_password: Jepni fjalëkalimin tuaj të tanishëm që të verifikohet identiteti juaj
proceed: Fshini llogarinë
success_msg: Llogaria juaj u fshi me sukses
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index c4a319964150f6fa0d2c5e4bb9289bd492a1a7ae..5c06242cc1c8a7444024327bbaa65da5978ba5de 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -314,7 +314,6 @@ sr-Latn:
over_x_years: "%{count}god"
x_months: "%{count}mesec"
deletes:
- bad_password_msg: Dobar pokušaj, hakeri! Neispravna lozinka
confirm_password: Unesite trenutnu lozinku da bismo proverili Vaš identitet
proceed: Obriši nalog
success_msg: Vaš nalog je uspešno obrisan
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 992311201b37ad1ea818fbbeae0d357f105c7154..772c04d64208ec60b65781c8cca937dc2a9af07e 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -510,7 +510,6 @@ sr:
x_days: "%{count}д"
x_months: "%{count}меÑец"
deletes:
- bad_password_msg: Добар покушај, хакери! ÐеиÑправна лозинка
confirm_password: УнеÑите тренутну лозинку да биÑмо проверили Ваш идентитет
proceed: Обриши налог
success_msg: Ваш налог је уÑпешно обриÑан
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 029704671909fe9b86cee018f5b912b5a291efe3..a71ea9e1853592a851bc96d929d3c08361b7834b 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -377,7 +377,6 @@ sv:
x_months: "%{count}mån"
x_seconds: "%{count}sek"
deletes:
- bad_password_msg: Bra försök, hackare! Fel lösenord
confirm_password: Ange ditt lösenord för att verifiera din identitet
proceed: Ta bort konto
success_msg: Ditt konto har tagits bort
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f27c066175ea2fe874cd113a172959a39f965a50..97ef414608646a74d0b5a1ffcf1104a0e980f318 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -48,6 +48,7 @@ th:
media: สื่à¸
moved_html: "%{name} ได้ย้ายไปยัง %{new_profile_link}:"
network_hidden: ไม่มีข้à¸à¸¡à¸¹à¸¥à¸™à¸µà¹‰
+ never_active: ไม่เลย
nothing_here: ไม่มีสิ่งใดที่นี่!
people_followed_by: ผู้คนที่ %{name} ติดตาม
people_who_follow: ผู้คนที่ติดตาม %{name}
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 564b21db1aa1eac65b6d6cba355a13110ce0b64c..5edbbd1940cce6a10b3f1d94ccfdd53b34ad3f59 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -633,7 +633,6 @@ uk:
x_months: "%{count}міÑ"
x_seconds: "%{count}Ñек"
deletes:
- bad_password_msg: Гарна Ñпроба, гакери! Ðеправильний пароль
confirm_password: Введіть актуальний пароль, щоб перевірити що ви це ви
proceed: Видалити обліковий запиÑ
success_msg: Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ»Ð¾ уÑпішно видалено
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d2549bcb4d627795ca317bd1bb2ffa7cb88b1780..9c6fd27e8de2ce6a8775d746e2b9408115818762 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -586,7 +586,6 @@ zh-CN:
x_months: "%{count}个月"
x_seconds: "%{count}秒"
deletes:
- bad_password_msg: 想得美，黑客ï¼å¯†ç 输入错误
confirm_password: è¾“å…¥ä½ å½“å‰çš„密ç æ¥éªŒè¯èº«ä»½
proceed: åˆ é™¤å¸æˆ·
success_msg: ä½ çš„å¸æˆ·å·²ç»æˆåŠŸåˆ 除
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 75202fa6884d200dc178ecf932e9e7aa7eba753d..2c59b3f0760747f0eef2011262c0571cf6f96d9c 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -391,7 +391,6 @@ zh-HK:
x_months: "%{count}個月"
x_seconds: "%{count}秒"
deletes:
- bad_password_msg: 想得美，黑客ï¼å¯†ç¢¼è¼¸å…¥éŒ¯èª¤
confirm_password: è¼¸å…¥ä½ ç¾åœ¨çš„密碼來驗è‰èº«ä»½
proceed: 刪除帳戶
success_msg: ä½ çš„å¸³æˆ¶å·²ç¶“æˆåŠŸåˆªé™¤
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 95f7d7f9ac156ac9022417317d85cf6d6f46dec9..8bdbf87aa5255203c49d732f9bb8cc0cff649be0 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -465,7 +465,6 @@ zh-TW:
x_months: "%{count}個月"
x_seconds: "%{count}秒"
deletes:
- bad_password_msg: 想得美，é§å®¢! 密碼輸入錯誤
confirm_password: è¼¸å…¥ä½ ç¾åœ¨çš„密碼來驗è‰èº«ä»½
proceed: 刪除帳戶
success_msg: ä½ çš„å¸³æˆ¶å·²ç¶“æˆåŠŸåˆªé™¤