diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 740f7bf771..a9539e6e04 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -4,6 +4,7 @@ module SettingsHelper
HUMAN_LOCALES = {
en: 'English',
ar: 'العربية',
+ ast: 'l\'asturianu',
bg: 'Български',
ca: 'Català',
co: 'Corsu',
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.js b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
index 5ae7b34a2e..c6fb735eb9 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.js
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
@@ -40,6 +40,10 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
m |
|
+
+ p |
+ |
+
f |
|
@@ -49,7 +53,7 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
|
- enter |
+ enter, o |
|
@@ -57,11 +61,11 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
|
- up |
+ up, k |
|
- down |
+ down, j |
|
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index 6af0a101c9..12db953262 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -54,19 +54,23 @@ export default class MediaModal extends ImmutablePureComponent {
this.setState({ index: index % this.props.media.size });
}
- handleKeyUp = (e) => {
+ handleKeyDown = (e) => {
switch(e.key) {
case 'ArrowLeft':
this.handlePrevClick();
+ e.preventDefault();
+ e.stopPropagation();
break;
case 'ArrowRight':
this.handleNextClick();
+ e.preventDefault();
+ e.stopPropagation();
break;
}
}
componentDidMount () {
- window.addEventListener('keyup', this.handleKeyUp, false);
+ window.addEventListener('keydown', this.handleKeyDown, false);
if (this.context.router) {
const history = this.context.router.history;
history.push(history.location.pathname, previewState);
@@ -77,7 +81,7 @@ export default class MediaModal extends ImmutablePureComponent {
}
componentWillUnmount () {
- window.removeEventListener('keyup', this.handleKeyUp);
+ window.removeEventListener('keydown', this.handleKeyDown);
if (this.context.router) {
this.unlistenHistory();
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index ff0ddd95f2..221aa4a414 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "مفتاح الإختصار",
"keyboard_shortcuts.legend": "لعرض هذا المفتاح",
"keyboard_shortcuts.mention": "لذِكر الناشر",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "للردّ",
"keyboard_shortcuts.search": "للتركيز على البحث",
"keyboard_shortcuts.toggle_hidden": "لعرض أو إخفاء النص مِن وراء التحذير",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
new file mode 100644
index 0000000000..16bfd77bb5
--- /dev/null
+++ b/app/javascript/mastodon/locales/ast.json
@@ -0,0 +1,309 @@
+{
+ "account.badges.bot": "Bot",
+ "account.block": "Block @{name}",
+ "account.block_domain": "Hide everything from {domain}",
+ "account.blocked": "Blocked",
+ "account.direct": "Direct message @{name}",
+ "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+ "account.domain_blocked": "Domain hidden",
+ "account.edit_profile": "Edit profile",
+ "account.follow": "Follow",
+ "account.followers": "Followers",
+ "account.follows": "Follows",
+ "account.follows_you": "Follows you",
+ "account.hide_reblogs": "Hide boosts from @{name}",
+ "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.posts": "Toots",
+ "account.posts_with_replies": "Toots and replies",
+ "account.report": "Report @{name}",
+ "account.requested": "Awaiting approval. Click to cancel follow request",
+ "account.share": "Share @{name}'s profile",
+ "account.show_reblogs": "Show boosts from @{name}",
+ "account.unblock": "Unblock @{name}",
+ "account.unblock_domain": "Unhide {domain}",
+ "account.unfollow": "Unfollow",
+ "account.unmute": "Unmute @{name}",
+ "account.unmute_notifications": "Unmute notifications from @{name}",
+ "account.view_full_profile": "View full profile",
+ "alert.unexpected.message": "An unexpected error occurred.",
+ "alert.unexpected.title": "Oops!",
+ "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.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_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.publish": "Toot",
+ "compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.marked": "Media is marked as sensitive",
+ "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+ "compose_form.spoiler.marked": "Text is hidden behind warning",
+ "compose_form.spoiler.unmarked": "Text is not hidden",
+ "compose_form.spoiler_placeholder": "Write your warning here",
+ "confirmation_modal.cancel": "Cancel",
+ "confirmations.block.confirm": "Block",
+ "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.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? You will lose all replies, boosts and favourites to it.",
+ "confirmations.unfollow.confirm": "Unfollow",
+ "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+ "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.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.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.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 instances to fill it up",
+ "follow_request.authorize": "Authorize",
+ "follow_request.reject": "Reject",
+ "getting_started.developers": "Developers",
+ "getting_started.documentation": "Documentation",
+ "getting_started.find_friends": "Find friends from Twitter",
+ "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",
+ "home.column_settings.basic": "Basic",
+ "home.column_settings.show_reblogs": "Show boosts",
+ "home.column_settings.show_replies": "Show replies",
+ "keyboard_shortcuts.back": "to navigate back",
+ "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.down": "to move down in the list",
+ "keyboard_shortcuts.enter": "to open status",
+ "keyboard_shortcuts.favourite": "to favourite",
+ "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+ "keyboard_shortcuts.hotkey": "Hotkey",
+ "keyboard_shortcuts.legend": "to display this legend",
+ "keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
+ "keyboard_shortcuts.reply": "to reply",
+ "keyboard_shortcuts.search": "to focus search",
+ "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toot": "to start a brand new toot",
+ "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+ "keyboard_shortcuts.up": "to move up in the list",
+ "lightbox.close": "Close",
+ "lightbox.next": "Next",
+ "lightbox.previous": "Previous",
+ "lists.account.add": "Add to list",
+ "lists.account.remove": "Remove from list",
+ "lists.delete": "Delete list",
+ "lists.edit": "Edit list",
+ "lists.new.create": "Add list",
+ "lists.new.title_placeholder": "New list title",
+ "lists.search": "Search among people you follow",
+ "lists.subheading": "Your lists",
+ "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.blocks": "Blocked users",
+ "navigation_bar.community_timeline": "Local timeline",
+ "navigation_bar.direct": "Direct messages",
+ "navigation_bar.discover": "Discover",
+ "navigation_bar.domain_blocks": "Hidden domains",
+ "navigation_bar.edit_profile": "Edit profile",
+ "navigation_bar.favourites": "Favourites",
+ "navigation_bar.filters": "Muted words",
+ "navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.info": "About this instance",
+ "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.favourite": "{name} favourited your status",
+ "notification.follow": "{name} followed you",
+ "notification.mention": "{name} mentioned you",
+ "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.follow": "New followers:",
+ "notifications.column_settings.mention": "Mentions:",
+ "notifications.column_settings.push": "Push notifications",
+ "notifications.column_settings.push_meta": "This device",
+ "notifications.column_settings.reblog": "Boosts:",
+ "notifications.column_settings.show": "Show in column",
+ "notifications.column_settings.sound": "Play sound",
+ "notifications.group": "{count} notifications",
+ "onboarding.done": "Done",
+ "onboarding.next": "Next",
+ "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
+ "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
+ "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
+ "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
+ "onboarding.page_one.full_handle": "Your full handle",
+ "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
+ "onboarding.page_one.welcome": "Welcome to Mastodon!",
+ "onboarding.page_six.admin": "Your instance's admin is {admin}.",
+ "onboarding.page_six.almost_done": "Almost done...",
+ "onboarding.page_six.appetoot": "Bon Appetoot!",
+ "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
+ "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
+ "onboarding.page_six.guidelines": "community guidelines",
+ "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
+ "onboarding.page_six.various_app": "mobile apps",
+ "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
+ "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
+ "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
+ "onboarding.skip": "Skip",
+ "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 instance 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.total": "{count, number} {count, plural, one {result} other {results}}",
+ "standalone.public_title": "A look inside...",
+ "status.block": "Block @{name}",
+ "status.cancel_reblog_private": "Unboost",
+ "status.cannot_reblog": "This post cannot be boosted",
+ "status.delete": "Delete",
+ "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.reblog": "Boost",
+ "status.reblog_private": "Boost to original audience",
+ "status.reblogged_by": "{name} boosted",
+ "status.redraft": "Delete & re-draft",
+ "status.reply": "Reply",
+ "status.replyAll": "Reply to thread",
+ "status.report": "Report @{name}",
+ "status.sensitive_toggle": "Click to view",
+ "status.sensitive_warning": "Sensitive content",
+ "status.share": "Share",
+ "status.show_less": "Show less",
+ "status.show_less_all": "Show less for all",
+ "status.show_more": "Show more",
+ "status.show_more_all": "Show more for all",
+ "status.unmute_conversation": "Unmute conversation",
+ "status.unpin": "Unpin from profile",
+ "tabs_bar.federated_timeline": "Federated",
+ "tabs_bar.home": "Home",
+ "tabs_bar.local_timeline": "Local",
+ "tabs_bar.notifications": "Notifications",
+ "tabs_bar.search": "Search",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+ "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+ "upload_area.title": "Drag & drop to upload",
+ "upload_button.label": "Add media",
+ "upload_form.description": "Describe for the visually impaired",
+ "upload_form.focus": "Crop",
+ "upload_form.undo": "Delete",
+ "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/bg.json b/app/javascript/mastodon/locales/bg.json
index c788b8c617..b7c08a8fb8 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 408f5ced7b..3bfcff46ef 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Tecla d'accés directe",
"keyboard_shortcuts.legend": "per a mostrar aquesta llegenda",
"keyboard_shortcuts.mention": "per esmentar l'autor",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "respondre",
"keyboard_shortcuts.search": "per centrar la cerca",
"keyboard_shortcuts.toggle_hidden": "per a mostrar/amagar text sota CW",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 1e7090a199..5fec67e66b 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Accorta",
"keyboard_shortcuts.legend": "vede a legenda",
"keyboard_shortcuts.mention": "mintuvà l'autore",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "risponde",
"keyboard_shortcuts.search": "fucalizà nant'à l'area di circata",
"keyboard_shortcuts.toggle_hidden": "vede/piattà u testu daretu à l'avertimentu CW",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index b0f9cd5246..e0dd0ab233 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -24,67 +24,67 @@
"account.requested": "Požadavek čeká na schválení. Kliknutím zrušíte požadavek o sledování",
"account.share": "Sdílet profil uživatele @{name}",
"account.show_reblogs": "Zobrazit povýšení od uživatele @{name}",
- "account.unblock": "Unblock @{name}",
- "account.unblock_domain": "Unhide {domain}",
- "account.unfollow": "Unfollow",
- "account.unmute": "Unmute @{name}",
- "account.unmute_notifications": "Unmute notifications from @{name}",
- "account.view_full_profile": "View full profile",
- "alert.unexpected.message": "An unexpected error occurred.",
- "alert.unexpected.title": "Oops!",
- "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.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_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.publish": "Toot",
+ "account.unblock": "Odblokovat uživatele @{name}",
+ "account.unblock_domain": "Odkrýt doménu {domain}",
+ "account.unfollow": "Přestat sledovat",
+ "account.unmute": "Přestat ignorovat uživatele @{name}",
+ "account.unmute_notifications": "Odtišit oznámení od uživatele @{name}",
+ "account.view_full_profile": "Zobrazit celý profil",
+ "alert.unexpected.message": "Objevila se neočekávaná chyba.",
+ "alert.unexpected.title": "Jejda!",
+ "boost_modal.combo": "Příště můžete pro přeskočení kliknout na {combo}",
+ "bundle_column_error.body": "Při načtení tohoto prvku se něco pokazilo.",
+ "bundle_column_error.retry": "Zkuste to znovu",
+ "bundle_column_error.title": "Chyba sítě",
+ "bundle_modal_error.close": "Zavřít",
+ "bundle_modal_error.message": "Při načítání tohoto komponentu se něco pokazilo.",
+ "bundle_modal_error.retry": "Zkusit znovu",
+ "column.blocks": "Blokovaní uživatelé",
+ "column.community": "Místní časová osa",
+ "column.direct": "Přímé zprávy",
+ "column.domain_blocks": "Skryté domény",
+ "column.favourites": "Oblíbené",
+ "column.follow_requests": "Žádosti o sledování",
+ "column.home": "Domů",
+ "column.lists": "Seznamy",
+ "column.mutes": "Ignorovaní uživatelé",
+ "column.notifications": "Oznámení",
+ "column.pins": "Připnuté tooty",
+ "column.public": "Federovaná časová osa",
+ "column_back_button.label": "Zpět",
+ "column_header.hide_settings": "Skrýt nastavení",
+ "column_header.moveLeft_settings": "Přesunout sloupec doleva",
+ "column_header.moveRight_settings": "Přesunout sloupec doprava",
+ "column_header.pin": "Připnout",
+ "column_header.show_settings": "Zobrazit nastavení",
+ "column_header.unpin": "Odepnout",
+ "column_subheading.settings": "Nastavení",
+ "community.column_settings.media_only": "Pouze média",
+ "compose_form.direct_message_warning": "Tento toot bude vidielný pouze zmíněným uživatelům.",
+ "compose_form.direct_message_warning_learn_more": "Zjistit více",
+ "compose_form.hashtag_warning": "Tento toot nebude zobrazen pod žádným hashtagem, neboť je neuvedený. Pouze veřejné tooty mohou být vyhledány podle hashtagu.",
+ "compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky pouze pro sledovatele.",
+ "compose_form.lock_disclaimer.lock": "zamknutý",
+ "compose_form.placeholder": "Co máte na mysli?",
+ "compose_form.publish": "Tootnout",
"compose_form.publish_loud": "{publish}!",
- "compose_form.sensitive.marked": "Media is marked as sensitive",
- "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
- "compose_form.spoiler.marked": "Text is hidden behind warning",
- "compose_form.spoiler.unmarked": "Text is not hidden",
- "compose_form.spoiler_placeholder": "Write your warning here",
- "confirmation_modal.cancel": "Cancel",
- "confirmations.block.confirm": "Block",
- "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.mute.confirm": "Mute",
- "confirmations.mute.message": "Are you sure you want to mute {name}?",
- "confirmations.redraft.confirm": "Delete & redraft",
+ "compose_form.sensitive.marked": "Mediální obsah je označen jako citlivý",
+ "compose_form.sensitive.unmarked": "Mediální obsah není označen jako citlivý",
+ "compose_form.spoiler.marked": "Text je ukrytý za varováním",
+ "compose_form.spoiler.unmarked": "Text není ukrytý",
+ "compose_form.spoiler_placeholder": "Sem napište vaše varování",
+ "confirmation_modal.cancel": "Zrušit",
+ "confirmations.block.confirm": "Blokovat",
+ "confirmations.block.message": "Jste si jistý/á, že chcete zablokovat uživatele {name}?",
+ "confirmations.delete.confirm": "Smazat",
+ "confirmations.delete.message": "Jste si jistý/á, že chcete smazat tento status?",
+ "confirmations.delete_list.confirm": "Smazat",
+ "confirmations.delete_list.message": "Jste si jistý/á, že chcete tento seznam navždy vymazat?",
+ "confirmations.domain_block.confirm": "Skrýt celou doménu",
+ "confirmations.domain_block.message": "Jste si opravdu, opravdu jistý/á, že chcete blokovat celou {domain}? Ve většině případů stačí zablokovat nebo ignorovat pár konkrétních uživatelů, což se doporučuje. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledovatelé z této domény budou odstraněni.",
+ "confirmations.mute.confirm": "Ignorovat",
+ "confirmations.mute.message": "Jste si jistý/á, že chcete ignorovat uživatele {name}?",
+ "confirmations.redraft.confirm": "Vymazat a přepsat",
"confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
"confirmations.unfollow.confirm": "Unfollow",
"confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 90b88380ac..76e769a51d 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hurtigtast",
"keyboard_shortcuts.legend": "for at vise denne legende",
"keyboard_shortcuts.mention": "for at nævne forfatteren",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "for at svare",
"keyboard_shortcuts.search": "for at fokusere søgningen",
"keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 8ea318158a..1bc6e12e1b 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Tastenkürzel",
"keyboard_shortcuts.legend": "um diese Übersicht anzuzeigen",
"keyboard_shortcuts.mention": "um Autor_in zu erwähnen",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "um zu antworten",
"keyboard_shortcuts.search": "um die Suche zu fokussieren",
"keyboard_shortcuts.toggle_hidden": "um den Text hinter einer Inhaltswarnung zu verstecken oder ihn anzuzeigen",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 9a0d16b8b2..5706348746 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1254,6 +1254,10 @@
"defaultMessage": "to mention author",
"id": "keyboard_shortcuts.mention"
},
+ {
+ "defaultMessage": "to open author's profile",
+ "id": "keyboard_shortcuts.profile"
+ },
{
"defaultMessage": "to favourite",
"id": "keyboard_shortcuts.favourite"
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 447d68b3f8..c38e05059c 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -114,9 +114,9 @@
"empty_column.public": "Δεν υπάρχει τίποτα εδώ! Γράψε κάτι δημόσιο, ή ακολούθησε χειροκίνητα χρήστες από άλλα instances για να τη γεμίσεις",
"follow_request.authorize": "Ενέκρινε",
"follow_request.reject": "Απέρριψε",
- "getting_started.developers": "Προγραμματιστές",
- "getting_started.documentation": "Documentation",
- "getting_started.find_friends": "Βρες φίλους/ες από το Twitter",
+ "getting_started.developers": "Ανάπτυξη",
+ "getting_started.documentation": "Τεκμηρίωση",
+ "getting_started.find_friends": "Βρες φίλους από το Twitter",
"getting_started.heading": "Αφετηρία",
"getting_started.invite": "Προσκάλεσε κόσμο",
"getting_started.open_source_notice": "Το Mastodon είναι ελεύθερο λογισμικό. Μπορείς να συνεισφέρεις ή να αναφέρεις ζητήματα στο GitHub στο {github}.",
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Συντόμευση",
"keyboard_shortcuts.legend": "για να εμφανίσεις αυτόν τον οδηγό",
"keyboard_shortcuts.mention": "για να αναφέρεις το συγγραφέα",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "για απάντηση",
"keyboard_shortcuts.search": "για εστίαση αναζήτησης",
"keyboard_shortcuts.toggle_hidden": "για εμφάνιση/απόκρυψη κειμένου πίσω από την προειδοποίηση",
@@ -163,17 +164,17 @@
"navigation_bar.community_timeline": "Τοπική ροή",
"navigation_bar.direct": "Προσωπικά μηνύματα",
"navigation_bar.discover": "Ανακάλυψη",
- "navigation_bar.domain_blocks": "Κρυφοί τομείς",
+ "navigation_bar.domain_blocks": "Κρυμμένοι τομείς",
"navigation_bar.edit_profile": "Επεξεργασία προφίλ",
"navigation_bar.favourites": "Αγαπημένα",
"navigation_bar.filters": "Αποσιωπημένες λέξεις",
"navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
- "navigation_bar.info": "Extended information",
+ "navigation_bar.info": "Πληροφορίες κόμβου",
"navigation_bar.keyboard_shortcuts": "Συντομεύσεις",
"navigation_bar.lists": "Λίστες",
"navigation_bar.logout": "Αποσύνδεση",
"navigation_bar.mutes": "Αποσιωπημένοι χρήστες",
- "navigation_bar.personal": "Personal",
+ "navigation_bar.personal": "Προσωπικά",
"navigation_bar.pins": "Καρφιτσωμένα τουτ",
"navigation_bar.preferences": "Προτιμήσεις",
"navigation_bar.public_timeline": "Ομοσπονδιακή ροή",
@@ -222,7 +223,7 @@
"privacy.private.short": "Μόνο ακόλουθοι",
"privacy.public.long": "Δημοσίευσε στις δημόσιες ροές",
"privacy.public.short": "Δημόσιο",
- "privacy.unlisted.long": "Do not show in public timelines",
+ "privacy.unlisted.long": "Μην δημοσιεύσεις στις δημόσιες ροές",
"privacy.unlisted.short": "Μη καταχωρημένα",
"regeneration_indicator.label": "Φορτώνει…",
"regeneration_indicator.sublabel": "Η αρχική σου ροή ετοιμάζεται!",
@@ -243,7 +244,7 @@
"search_popout.tips.full_text": "Απλό κείμενο που επιστρέφει καταστάσεις που έχεις γράψει, σημειώσει ως αγαπημένες, προωθήσει ή έχεις αναφερθεί σε αυτές, καθώς και όσα ονόματα χρηστών και ταμπέλες ταιριάζουν.",
"search_popout.tips.hashtag": "ταμπέλα",
"search_popout.tips.status": "status",
- "search_popout.tips.text": "Απλό κείμενο που επιστρέφει ταιριαστά ονόματα και ταμπέλες",
+ "search_popout.tips.text": "Απλό κείμενο που επιστρέφει ονόματα και ταμπέλες που ταιριάζουν",
"search_popout.tips.user": "χρήστης",
"search_results.accounts": "Άνθρωποι",
"search_results.hashtags": "Ταμπέλες",
@@ -273,7 +274,7 @@
"status.redraft": "Σβήσε & ξαναγράψε",
"status.reply": "Απάντησε",
"status.replyAll": "Απάντησε στην συζήτηση",
- "status.report": "Καταγγελία @{name}",
+ "status.report": "Κατάγγειλε @{name}",
"status.sensitive_toggle": "Κλικ για να δεις",
"status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
"status.share": "Μοιράσου",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index f8ded63e97..b103363db8 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -141,6 +141,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index be2bc3d65d..37a7cd8898 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Rapidklavo",
"keyboard_shortcuts.legend": "por montri ĉi tiun noton",
"keyboard_shortcuts.mention": "por mencii la aŭtoron",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "por respondi",
"keyboard_shortcuts.search": "por fokusigi la serĉilon",
"keyboard_shortcuts.toggle_hidden": "por montri/kaŝi tekston malantaŭ enhava averto",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index d4db8d15fb..8fcee87cda 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Tecla caliente",
"keyboard_shortcuts.legend": "para mostrar esta leyenda",
"keyboard_shortcuts.mention": "para mencionar al autor",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "para responder",
"keyboard_shortcuts.search": "para poner el foco en la búsqueda",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 33f477af38..55709acfc0 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Laster-tekla",
"keyboard_shortcuts.legend": "legenda hau bistaratzea",
"keyboard_shortcuts.mention": "egilea aipatzea",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "erantzutea",
"keyboard_shortcuts.search": "bilaketan fokua jartzea",
"keyboard_shortcuts.toggle_hidden": "testua erakustea/ezkutatzea abisu baten atzean",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index dba7149512..ea2fd3401f 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "میانبر",
"keyboard_shortcuts.legend": "برای نمایش این راهنما",
"keyboard_shortcuts.mention": "برای نامبردن از نویسنده",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "برای پاسخدادن",
"keyboard_shortcuts.search": "برای فعالکردن جستجو",
"keyboard_shortcuts.toggle_hidden": "برای نمایش/نهفتن نوشتهٔ پشت هشدار محتوا",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index dd7310a610..888f7a267c 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Pikanäppäin",
"keyboard_shortcuts.legend": "näytä tämä selite",
"keyboard_shortcuts.mention": "mainitse julkaisija",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "vastaa",
"keyboard_shortcuts.search": "siirry hakukenttään",
"keyboard_shortcuts.toggle_hidden": "näytä/piilota sisältövaroituksella merkitty teksti",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 41cea6a828..8a525e576f 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Raccourci",
"keyboard_shortcuts.legend": "pour afficher cette légende",
"keyboard_shortcuts.mention": "pour mentionner l'auteur",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "pour répondre",
"keyboard_shortcuts.search": "pour cibler la recherche",
"keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derrière CW",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index ff817d681f..64cab40c1e 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Tecla de acceso directo",
"keyboard_shortcuts.legend": "para mostrar esta lenda",
"keyboard_shortcuts.mention": "para mencionar o autor",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "para responder",
"keyboard_shortcuts.search": "para centrar a busca",
"keyboard_shortcuts.toggle_hidden": "mostrar/agochar un texto detrás do AC",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 952c3d6db0..033cf794a9 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "מקש קיצור",
"keyboard_shortcuts.legend": "להציג את הפירוש",
"keyboard_shortcuts.mention": "לאזכר את המחבר(ת)",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "לענות",
"keyboard_shortcuts.search": "להתמקד בחלון החיפוש",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index f8f1d0eb38..34ed197d41 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 1b2397f707..e2aa52c36a 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Gyorsbillentyű",
"keyboard_shortcuts.legend": "jelmagyarázat megjelenítése",
"keyboard_shortcuts.mention": "szerző megjelenítése",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "válaszolás",
"keyboard_shortcuts.search": "kereső kiemelése",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index d2e1bf03ef..207dd7eead 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Հատուկ ստեղն",
"keyboard_shortcuts.legend": "այս ձեռնարկը ցուցադրելու համար",
"keyboard_shortcuts.mention": "հեղինակին նշելու համար",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "պատասխանելու համար",
"keyboard_shortcuts.search": "որոնման դաշտին սեւեռվելու համար",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 06045ae998..260a5f8cad 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "untuk fokus mencari",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 5f9175c4f5..87ebe31d87 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index e16f9e2a00..5ee6f7d14c 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Tasto di scelta rapida",
"keyboard_shortcuts.legend": "per mostrare questa spiegazione",
"keyboard_shortcuts.mention": "per menzionare l'autore",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "per rispondere",
"keyboard_shortcuts.search": "per spostare il focus sulla ricerca",
"keyboard_shortcuts.toggle_hidden": "per mostrare/nascondere il testo dei CW",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 81ccd6255c..62f8518e4a 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -141,6 +141,7 @@
"keyboard_shortcuts.hotkey": "ホットキー",
"keyboard_shortcuts.legend": "この一覧を表示",
"keyboard_shortcuts.mention": "メンション",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "返信",
"keyboard_shortcuts.search": "検索欄に移動",
"keyboard_shortcuts.toggle_hidden": "CWで隠れた文を見る/隠す",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 8f4b57c2b6..206ebeefdf 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "핫키",
"keyboard_shortcuts.legend": "이 도움말 표시",
"keyboard_shortcuts.mention": "멘션",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "답장",
"keyboard_shortcuts.search": "검색창에 포커스",
"keyboard_shortcuts.toggle_hidden": "CW로 가려진 텍스트를 표시/비표시",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 07fac0da11..9ef0d9ed44 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Sneltoets",
"keyboard_shortcuts.legend": "om deze legenda te tonen",
"keyboard_shortcuts.mention": "om de auteur te vermelden",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "om te reageren",
"keyboard_shortcuts.search": "om het zoekvak te focussen",
"keyboard_shortcuts.toggle_hidden": "om tekst achter een waarschuwing (CW) te tonen/verbergen",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 31bbf76642..983a0b8f21 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Lyntast",
"keyboard_shortcuts.legend": "å vise denne forklaringen",
"keyboard_shortcuts.mention": "å nevne forfatter",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "for å svare",
"keyboard_shortcuts.search": "å fokusere søk",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index eff880165c..a7e51720f7 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Acorchis",
"keyboard_shortcuts.legend": "mostrar aquesta legenda",
"keyboard_shortcuts.mention": "mencionar l’autor",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "respondre",
"keyboard_shortcuts.search": "anar a la recèrca",
"keyboard_shortcuts.toggle_hidden": "mostrar/amagar lo tèxte dels avertiments",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index aaab1d85c7..81b829a2f3 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -141,6 +141,7 @@
"keyboard_shortcuts.hotkey": "Klawisz",
"keyboard_shortcuts.legend": "aby wyświetlić tą legendę",
"keyboard_shortcuts.mention": "aby wspomnieć o autorze",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "aby odpowiedzieć",
"keyboard_shortcuts.search": "aby przejść do pola wyszukiwania",
"keyboard_shortcuts.toggle_hidden": "aby wyświetlić lub ukryć wpis spod CW",
@@ -239,7 +240,7 @@
"reply_indicator.cancel": "Anuluj",
"report.forward": "Przekaż na {target}",
"report.forward_hint": "To konto znajduje się na innej instancji. Czy chcesz wysłać anonimową kopię zgłoszenia rnież na nią?",
- "report.hint": "Zgłoszenie zostanie wysłane moderatorom Twojej instancji. Poniżej możesz też umieścić wyjaśnieni dlaczego zgłaszasz to konto:",
+ "report.hint": "Zgłoszenie zostanie wysłane moderatorom Twojej instancji. Poniżej możesz też umieścić wyjaśnienie dlaczego zgłaszasz to konto:",
"report.placeholder": "Dodatkowe komentarze",
"report.submit": "Wyślij",
"report.target": "Zgłaszanie {target}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index f820d9cf9a..fa56e52fb4 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Atalho",
"keyboard_shortcuts.legend": "para mostrar essa legenda",
"keyboard_shortcuts.mention": "para mencionar o autor",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "para responder",
"keyboard_shortcuts.search": "para focar a pesquisa",
"keyboard_shortcuts.toggle_hidden": "mostrar/esconder o texto com aviso de conteúdo",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 686c05d729..802f22b455 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Atalho",
"keyboard_shortcuts.legend": "para mostrar esta legenda",
"keyboard_shortcuts.mention": "para mencionar o autor",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "para responder",
"keyboard_shortcuts.search": "para focar na pesquisa",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index ecde3fb2c0..ad2dcda124 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Гор. клавиша",
"keyboard_shortcuts.legend": "показать это окно",
"keyboard_shortcuts.mention": "упомянуть автора поста",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "ответить",
"keyboard_shortcuts.search": "перейти к поиску",
"keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 24ab1f83a2..54671b243a 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Klávesa",
"keyboard_shortcuts.legend": "zobraziť túto legendu",
"keyboard_shortcuts.mention": "spomenúť autora",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "odpovedať",
"keyboard_shortcuts.search": "zamerať sa na vyhľadávanie",
"keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 73f31e8cf8..2793f3cf1d 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hitra tipka",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index e3bf2189b4..9baeb4c772 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Prečica",
"keyboard_shortcuts.legend": "da prikažete ovaj podsetnik",
"keyboard_shortcuts.mention": "da pomenete autora",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "da odgovorite",
"keyboard_shortcuts.search": "da se prebacite na pretragu",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index ba84a4d24e..fc146686aa 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Пречица",
"keyboard_shortcuts.legend": "да прикажете овај подсетник",
"keyboard_shortcuts.mention": "да поменете аутора",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "да одговорите",
"keyboard_shortcuts.search": "да се пребаците на претрагу",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 64d488324f..2fd87cb3af 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Snabbvalstangent",
"keyboard_shortcuts.legend": "att visa denna översikt",
"keyboard_shortcuts.mention": "att nämna författaren",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "att svara",
"keyboard_shortcuts.search": "att fokusera sökfältet",
"keyboard_shortcuts.toggle_hidden": "att visa/gömma text bakom CW",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 7e405b8c29..48a6486227 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "హాట్ కీ",
"keyboard_shortcuts.legend": "ఈ లెజెండ్ ప్రదర్శించడానికి",
"keyboard_shortcuts.mention": "రచయితను ప్రస్తావించడానికి",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "ప్రత్యుత్తరం ఇవ్వడానికి",
"keyboard_shortcuts.search": "శోధనపై దృష్టి పెట్టండి",
"keyboard_shortcuts.toggle_hidden": "CW వెనుక ఉన్న పాఠ్యాన్ని చూపడానికి / దాచడానికి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 1d76735a23..09b48f5cd7 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 03a09019f8..c96eee7465 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 7bb2476d02..5b7b09a274 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
diff --git a/app/javascript/mastodon/locales/whitelist_ast.json b/app/javascript/mastodon/locales/whitelist_ast.json
new file mode 100644
index 0000000000..0d4f101c7a
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ast.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 8b73bb8f99..cc5f911c73 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "快捷键",
"keyboard_shortcuts.legend": "显示此列表",
"keyboard_shortcuts.mention": "提及嘟文作者",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "回复嘟文",
"keyboard_shortcuts.search": "选择搜索框",
"keyboard_shortcuts.toggle_hidden": "显示或隐藏被折叠的正文",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 21c3e61544..012790cc7d 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "快速鍵",
"keyboard_shortcuts.legend": "顯示這個說明",
"keyboard_shortcuts.mention": "提及作者",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "回覆",
"keyboard_shortcuts.search": "把標示移動到搜索",
"keyboard_shortcuts.toggle_hidden": "顯示或隱藏被標為敏感的文字",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index b4a70ef70a..2de00690b9 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -137,6 +137,7 @@
"keyboard_shortcuts.hotkey": "快速鍵",
"keyboard_shortcuts.legend": "顯示這個說明",
"keyboard_shortcuts.mention": "到提到的作者",
+ "keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "到回應",
"keyboard_shortcuts.search": "把滑鼠移動到搜尋",
"keyboard_shortcuts.toggle_hidden": "顯示或隱藏被標為敏感的嘟文",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 744f2561cd..48460d7608 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2011,6 +2011,7 @@ a.account__display-name {
cursor: pointer;
flex: 0 0 auto;
font-size: 16px;
+ line-height: inherit;
border: 0;
text-align: unset;
padding: 15px;
diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb
index e9e6b56e87..8d1e58b380 100644
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -16,7 +16,7 @@ class EmailMxValidator < ActiveModel::Validator
return true if domain.nil?
records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
- records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.exchange.to_s } if records.empty?
+ records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s } if records.empty?
records.empty? || on_blacklist?(records)
end
diff --git a/config/application.rb b/config/application.rb
index 2e75a01812..8dc0ddfbb5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -39,6 +39,7 @@ module Mastodon
config.i18n.available_locales = [
:en,
:ar,
+ :ast,
:bg,
:ca,
:co,
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index e0d263f16f..8532c9d9a2 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -9,6 +9,7 @@ Warden::Manager.after_set_user except: :fetch do |user, warden|
value: session_id,
expires: 1.year.from_now,
httponly: true,
+ secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
}
end
@@ -18,6 +19,7 @@ Warden::Manager.after_fetch do |user, warden|
value: warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'],
expires: 1.year.from_now,
httponly: true,
+ secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
}
else
warden.logout
diff --git a/config/locales/activerecord.ast.yml b/config/locales/activerecord.ast.yml
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/config/locales/activerecord.ast.yml
@@ -0,0 +1 @@
+{}
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index c1d7cca583..013bc70044 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -206,6 +206,18 @@ ar:
update_failed_msg: تعذرت عملية تحذيث ذاك الإيموجي
updated_msg: تم تحديث الإيموجي بنجاح !
upload: رفع
+ dashboard:
+ feature_invites: روابط الدعوات
+ feature_registrations: التسجيلات
+ feature_relay: المُرحّل الفديرالي
+ features: الميّزات
+ hidden_service: الفيديرالية مع الخدمات الخفية
+ search: البحث النصي الكامل
+ software: البرنامج
+ space: المساحة المستخدَمة
+ title: لوح المراقبة
+ week_users_active: نشط هذا الأسبوع
+ week_users_new: مستخدِمين هذا الأسبوع
domain_blocks:
add_new: إضافة نطاق جديد
created_msg: إنّ حجب النطاق حيز التشغيل
@@ -261,6 +273,12 @@ ar:
expired: المنتهي صلاحيتها
title: التصفية
title: الدعوات
+ relays:
+ add_new: إضافة مُرحّل جديد
+ inbox_url: رابط المُرحّل
+ setup: إعداد اتصال بمُرحّل
+ status: الحالة
+ title: المُرحّلات
report_notes:
created_msg: |-
41/5000
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
new file mode 100644
index 0000000000..4436c2d88b
--- /dev/null
+++ b/config/locales/ast.yml
@@ -0,0 +1,199 @@
+---
+ast:
+ about:
+ about_mastodon_html: Mastodon ye una rede social basada en protocolos abiertos y software de códigu llibre. Ye descentralizada, como'l corréu electrónicu.
+ contact_unavailable: N/D
+ description_headline: "¿Qué ye %{domain}?"
+ domain_count_after: otres instancies
+ features:
+ not_a_product_title: Yes una persona, non un productu
+ source_code: Códigu fonte
+ status_count_after: estaos
+ user_count_after: usuarios
+ what_is_mastodon: "¿Qué ye Mastodon?"
+ accounts:
+ followers: Siguidores
+ network_hidden: Esta información nun ta disponible
+ nothing_here: "¡Equí nun hai nada!"
+ people_followed_by: Persones a les que sigue %{name}
+ people_who_follow: Persones que siguen a %{name}
+ reserved_username: El nome d'usuariu ta acutáu
+ roles:
+ bot: Robó
+ admin:
+ accounts:
+ avatar: Avatar
+ by_domain: Dominiu
+ domain: Dominiu
+ followers: Siguidores
+ ip: IP
+ protocol: Protocolu
+ resend_confirmation:
+ already_confirmed: Esti usuariu yá ta confirmáu
+ role: Permisos
+ roles:
+ moderator: Llendador
+ username: Nome d'usuariu
+ web: Web
+ custom_emojis:
+ by_domain: Dominiu
+ copy_failed_msg: Nun pudo facese una copia llocal d'esi fustaxe
+ emoji: Fustaxe
+ update_failed_msg: Nun pudo anovase esi fustaxe
+ dashboard:
+ config: Configuración
+ features: Carauterístiques
+ hidden_service: Federación con servicios anubríos
+ software: Software
+ total_users: usuarios en total
+ domain_blocks:
+ domain: Dominiu
+ email_domain_blocks:
+ domain: Dominiu
+ instances:
+ account_count: Cuentes conocíes
+ domain_name: Dominiu
+ title: Instancies conocíes
+ invites:
+ filter:
+ available: Disponible
+ reports:
+ id: ID
+ statuses:
+ failed_to_execute: Fallu al executar
+ subscriptions:
+ title: WebSub
+ admin_mailer:
+ new_report:
+ body_remote: Daquién dende %{domain} informó de %{target}
+ application_mailer:
+ salutation: "%{name},"
+ applications:
+ invalid_url: La URL apurrida nun ye válida
+ auth:
+ change_password: Contraseña
+ forgot_password: "¿Escaeciesti la contraseña?"
+ providers:
+ cas: CAS
+ saml: SAML
+ security: Seguranza
+ authorize_follow:
+ already_following: Yá tas siguiendo a esta cuenta
+ error: Desafortunadamente, hebo un fallu guetando la cuenta remota
+ deletes:
+ confirm_password: Introduz la contraseña pa verificar la to identidá
+ errors:
+ '403': Nun tienes permisu pa ver esta páxina.
+ '404': La páxina que tabes guetando nun esiste.
+ '410': La páxina que tabes guetando yá nun esiste.
+ exports:
+ archive_takeout:
+ size: Tamañu
+ csv: CSV
+ filters:
+ contexts:
+ public: Llinies temporales públiques
+ followers:
+ domain: Dominiu
+ followers_count: Númberu de siguidores
+ generic:
+ powered_by: cola potencia de %{link}
+ invites:
+ expires_in:
+ '1800': 30 minutos
+ '21600': 6 hores
+ '3600': 1 hora
+ '43200': 12 hores
+ '604800': 1 selmana
+ '86400': 1 día
+ expires_in_prompt: Enxamás
+ max_uses:
+ one: 1 usu
+ other: "%{count} usos"
+ table:
+ uses: Usos
+ lists:
+ errors:
+ limit: Algamesti la cantidá máxima de llistes
+ media_attachments:
+ validations:
+ images_and_video: Nun pue axuntase un videu a un estáu que yá contién imáxenes
+ too_many: Nun puen axuntase más de 4 ficheros
+ migrations:
+ acct: nome_usuariu@dominiu de la cuenta nueva
+ notification_mailer:
+ digest:
+ mention: "%{name} mentóte en:"
+ follow:
+ title: Siguidor nuevu
+ follow_request:
+ body: "%{name} solicitó siguite"
+ title: Petición nueva de siguimientu
+ mention:
+ body: "%{name} mentóte en:"
+ subject: "%{name} mentóte"
+ title: Mención nueva
+ number:
+ human:
+ decimal_units:
+ format: "%n%u"
+ preferences:
+ languages: Llingües
+ web: Web
+ remote_follow:
+ prompt: 'Vas siguir a:'
+ remote_unfollow:
+ error: Fallu
+ sessions:
+ browser: Restolador
+ browsers:
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ electron: Electron
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ opera: Opera
+ phantom_js: PhantomJS
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ description: "%{browser} en %{platform}"
+ ip: IP
+ platforms:
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
+ title: Sesiones
+ settings:
+ preferences: Preferencies
+ statuses:
+ attached:
+ image:
+ one: "%{count} imaxe"
+ other: "%{count} imáxenes"
+ video:
+ one: "%{count} videu"
+ other: "%{count} vídeos"
+ title: "%{name}: «%{quote}»"
+ stream_entries:
+ click_to_show: Primi p'amosar
+ sensitive_content: Conteníu sensible
+ themes:
+ default: Mastodon
+ two_factor_authentication:
+ code_hint: Introduz el códigu xeneráu pola aplicación autenticadora pa confirmar
+ enabled: L'autenticación en dos pasos ta activada
+ user_mailer:
+ welcome:
+ full_handle_hint: Esto ye lo que-yos diríes a los collacios pa que puean unviate mensaxes o siguite dende otra instancia.
+ subject: Afáyate en Mastodon
+ tips: Conseyos
+ users:
+ invalid_email: La direición de corréu nun ye válida
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e299349f58..7f9cd1e1ef 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -215,10 +215,12 @@ da:
features: Funktioner
open_reports: åbne anmeldelser
recent_users: Seneste brugere
+ search: Søg på fuld tekst
software: Software
space: Brugt lagerplads
title: Betjeningspanel
total_users: samlede antal brugere
+ trends: Tendenser
week_interactions: interaktioner denne uge
week_users_active: aktive denne uge
week_users_new: brugere denne uge
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 30135cf79f..bab45223d7 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -206,6 +206,17 @@ de:
update_failed_msg: Konnte dieses Emoji nicht aktualisieren
updated_msg: Emoji erfolgreich aktualisiert!
upload: Hochladen
+ dashboard:
+ backlog: Unerledigte Jobs
+ config: Konfiguration
+ feature_invites: Einladungslinks
+ feature_registrations: Registrierung
+ features: Eigenschaften
+ open_reports: Offene Meldungen
+ search: Volltextsuche
+ space: Speicherverbrauch
+ title: Übersicht
+ total_users: Benutzer Insgesamt
domain_blocks:
add_new: Neu hinzufügen
created_msg: Die Domain-Blockade wird nun durchgeführt
@@ -261,6 +272,8 @@ de:
expired: Ausgelaufen
title: Filter
title: Einladungen
+ relays:
+ add_new: Neues Relay hinzufügen
report_notes:
created_msg: Meldungs-Kommentar erfolgreich erstellt!
destroyed_msg: Meldungs-Kommentar erfolgreich gelöscht!
diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/config/locales/devise.ast.yml
@@ -0,0 +1 @@
+{}
diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/config/locales/doorkeeper.ast.yml
@@ -0,0 +1 @@
+{}
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index 0967ef424b..c274570894 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -1 +1,6 @@
-{}
+---
+sl:
+ activerecord:
+ attributes:
+ doorkeeper/application:
+ name: Ime programa
diff --git a/config/locales/el.yml b/config/locales/el.yml
index fc73b60d4a..7fd48b7d20 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -629,7 +629,7 @@ el:
units:
billion: Δις.
million: Εκ.
- quadrillion: Τετρ.
+ quadrillion: Τετράκις.
thousand: Χ.
trillion: Τρις.
pagination:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 25f6a7b866..d20e1559d0 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -222,6 +222,7 @@ gl:
space: Uso de espazo
title: Taboleiro
total_users: total de usuarias
+ trends: Tendencias
week_interactions: interaccións en esta semana
week_users_active: activas estas semana
week_users_new: usuarias esta semana
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 7a2f031a65..5a85fac931 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -213,6 +213,7 @@ ja:
feature_registrations: 新規登録
feature_relay: 連合リレー
features: 機能
+ hidden_service: 秘匿サービスとの連合
open_reports: 未解決のレポート
recent_users: 最近登録したユーザー
search: 全文検索
@@ -221,7 +222,7 @@ ja:
space: ディスク使用量
title: ダッシュボード
total_users: 全ユーザー
- trends: トレンド
+ trends: トレンドタグ
week_interactions: 今週の交流数
week_users_active: 今週活動した人数
week_users_new: 今週登録した人数
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 1db8b68360..3f4342d8e8 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -206,6 +206,27 @@ nl:
update_failed_msg: Deze emoji kon niet worden bijgewerkt
updated_msg: Bijwerken van emoji is geslaagd!
upload: Uploaden
+ dashboard:
+ backlog: achterstallige taken
+ config: Configuratie
+ feature_deletions: Verwijderen van account
+ feature_invites: Uitnodigingen
+ feature_registrations: Registraties
+ feature_relay: Federatierelay
+ features: Functies
+ hidden_service: Federatie met verborgen diensten
+ open_reports: onopgeloste gerapporteerde toots
+ recent_users: Recente gebruikers
+ search: In volledige tekst zoeken
+ single_user_mode: Modus voor één gebruiker
+ software: Software
+ space: Ruimtegebruik
+ title: Dashboard
+ total_users: gebruikers in totaal
+ trends: Trends
+ week_interactions: interacties deze week
+ week_users_active: actieve gebruikers deze week
+ week_users_new: nieuwe gebruikers deze week
domain_blocks:
add_new: Nieuwe toevoegen
created_msg: Domeinblokkade wordt nu verwerkt
@@ -263,7 +284,7 @@ nl:
title: Uitnodigingen
relays:
add_new: Nieuwe relayserver toevoegen
- description_html: Een federatie-relay is een tussenliggende server die grote hoeveelheden openbare toots uitwisselt tussen servers die zich hierop hebben geabonneerd. Het kan kleine en middelgrote servers helpen om content uit de fediverse te ontdekken, waarvoor anders lokale gebruikers handmatig mensen van externe servers moeten volgen.
+ description_html: Een federatierelay is een tussenliggende server die grote hoeveelheden openbare toots uitwisselt tussen servers die zich hierop hebben geabonneerd. Het kan kleine en middelgrote servers helpen om content uit de fediverse te ontdekken, waarvoor anders lokale gebruikers handmatig mensen van externe servers moeten volgen.
enable_hint: Eenmaal ingeschakeld gaat jouw server zich op alle openbare toots van deze relayserver abonneren en stuurt het de openbare toots van jouw server naar de relayserver.
inbox_url: Relay-URL
setup: Een verbinding met een relayserver maken
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index bf353f5c04..f853d6cd4e 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -208,6 +208,7 @@ oc:
updated_msg: Emoji ben mes a jorn !
upload: Enviar
dashboard:
+ backlog: Accions en retard
config: Configuracion
feature_deletions: Supressions de comptes
feature_invites: Ligams convidat
@@ -823,7 +824,23 @@ oc:
- Per provesir la foncionament màger de Mastodon. Podètz pas qu’interagir amb lo contengut del monde e de vòstras publicacions quand sètz connectat. Per exemple, avètz la possibilitat de sègre de monde per veire lors publicacions amassadas dins vòstre flux d’actualitat personalizat.
- Per ajudar la moderacion de la comunitat, per exemple en comparant vòstra adreça IP amb d’autras per determinar d’ensages de contornament de bandiment e d’autras violéncias.
- - Per enviar periodicament de corrièls — Podèm utilizar l’adreça qu’avètz donada per vos enviar d’informacions e de notificacions que demandatz tocant de cambiaments dins los subjèctes del forum o en responsa a vòstre nom d’utilizaire, en responsa a una demanda, e/o tota autra question.
+ - Podèm utilizar l’adreça qu’avètz donada per vos enviar d’informacions e de notificacions que demandatz tocant de cambiaments dins los subjèctes del forum o en responsa a vòstre nom d’utilizaire, en responsa a una demanda, e/o tota autra question.
+
+
+
+
+ Cossí protegèm vòstras informacions ?
+
+ Apliquem tota una mena de mesuras de seguretat per manténer la fisança de vòstras informacions personalas quand las picatz, mandatz, o i accedètz. Entre aquelas, vòstre session de navigacion, coma lo trafic entre vòstra aplicacion e l’API, son securizats amb SSL e lo senhal es copat en tròces en emplegar un algorisme fòrt a sens unic. Podètz activar l’autentificacion en dos temps pels accèsses futurs a vòstre compte.
+
+
+ Quala es nòstra politica de conservacion de donadas ?
+
+ Farem esfòrces per :
+
+
+ - Gardar los jornals del servidor que contenon las adreças IP de totas las demandas al servidor pas mai de 90 jorns.
+ - Gardar las adreças IP ligadas als utilizaires e lors publicacions pas mai de 12 messes.
title: Condicions d’utilizacion e politica de confidencialitat de %{instance}
time:
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 5c0c0a57c8..8f3e685a60 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -76,6 +76,7 @@ ar:
type: صيغة الإستيراد
username: إسم المستخدم
username_or_email: إسم المستخدم أو كلمة السر
+ whole_word: الكلمة كاملة
interactions:
must_be_follower: حظر الإخطارات القادمة من حسابات لا تتبعك
must_be_following: حظر الإخطارات القادمة من الحسابات التي لا تتابعها
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/config/locales/simple_form.ast.yml
@@ -0,0 +1 @@
+{}
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 9e29a2824c..0c0679605a 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -39,7 +39,7 @@ de:
defaults:
autofollow: Einladen, um deinen Account zu folgen
avatar: Profilbild
- bot: Dies ist ein bot Benutzer
+ bot: Dieser Benutzer ist ein Bot
chosen_languages: Sprachen filtern
confirm_new_password: Neues Passwort bestätigen
confirm_password: Passwort bestätigen
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 293c5ac7c0..58bae8dc1e 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -4,7 +4,7 @@ el:
hints:
defaults:
autofollow: Όσοι εγγραφούν μέσω της πρόσκλησης θα σε ακολουθούν αυτόματα
- avatar: PNG, GIF ή JPG. Έως 2MB. Θα μειωθεί σε διάσταση 400x400px
+ avatar: PNG, GIF ή JPG. Έως 2MB. Θα περιοριστεί σε διάσταση 400x400px
bot: Ο λογαριασμός αυτός εκτελεί κυρίως αυτοματοποιημένες ενέργειες και ίσως να μην παρακολουθείται
context: Ένα ή περισσότερα πλαίσια στα οποία μπορεί να εφαρμόζεται αυτό το φίλτρο
digest: Αποστέλλεται μόνο μετά από μακρά περίοδο αδράνειας και μόνο αν έχεις λάβει προσωπικά μηνύματα κατά την απουσία σου
@@ -12,7 +12,7 @@ el:
one: απομένει 1 χαρακτήρας
other: απομένουν %{count} χαρακτήρες
fields: Μπορείς να έχεις έως 4 σημειώσεις σε μορφή πίνακα στο προφίλ σου
- header: PNG, GIF ή JPG. Έως 2MB. Θα μειωθεί σε διάσταση 700x335px
+ header: PNG, GIF ή JPG. Έως 2MB. Θα περιοριστεί σε διάσταση 700x335px
inbox_url: Αντέγραψε το URL της αρχικής σελίδας του ανταποκριτή (relay) που θέλεις να χρησιμοποιήσεις
irreversible: Τα φιλτραρισμένα τουτ θα εξαφανιστούν αμετάκλητα, ακόμα και αν το φίλτρο αργότερα αφαιρεθεί
locale: Η γλώσσα του περιβάλλοντος χρήσης, των email και των ειδοποιήσεων ώθησης
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index f6fd891e1a..16de1efd28 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -13,6 +13,7 @@ it:
other: %{count} caratteri rimanenti
fields: Puoi avere fino a 4 voci visualizzate come una tabella sul tuo profilo
header: PNG, GIF o JPG. Al massimo 2MB. Verranno scalate a 700x335px
+ inbox_url: Copia la URL dalla pagina iniziale del ripetitore che vuoi usare
irreversible: I toot filtrati scompariranno in modo irreversibile, anche se il filtro viene eliminato
locale: La lingua dell'interfaccia utente, di email e notifiche push
locked: Richiede che approvi i follower manualmente
@@ -52,6 +53,7 @@ it:
expires_in: Scade dopo
fields: Metadati del profilo
header: Header
+ inbox_url: URL della inbox del ripetitore
irreversible: Elimina invece di nascondere
locale: Lingua dell'interfaccia
locked: Blocca account