diff options
35 files changed, 144 insertions, 25 deletions
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js index 5b2a4d84c..89e2f9189 100644 --- a/app/javascript/mastodon/components/column_header.js +++ b/app/javascript/mastodon/components/column_header.js @@ -1,8 +1,14 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, defineMessages } from 'react-intl'; +const messages = defineMessages({ + show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' }, + hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' }, +}); + +@injectIntl export default class ColumnHeader extends React.PureComponent { static contextTypes = { @@ -10,6 +16,7 @@ export default class ColumnHeader extends React.PureComponent { }; static propTypes = { + intl: PropTypes.object.isRequired, title: PropTypes.node.isRequired, icon: PropTypes.string.isRequired, active: PropTypes.bool, @@ -54,7 +61,7 @@ export default class ColumnHeader extends React.PureComponent { } render () { - const { title, icon, active, children, pinned, onPin, multiColumn, showBackButton } = this.props; + const { title, icon, active, children, pinned, onPin, multiColumn, showBackButton, intl: { formatMessage } } = this.props; const { collapsed, animating } = this.state; const wrapperClassName = classNames('column-header__wrapper', { @@ -116,7 +123,7 @@ export default class ColumnHeader extends React.PureComponent { } if (children || multiColumn) { - collapseButton = <button className={collapsibleButtonClassName} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>; + collapseButton = <button className={collapsibleButtonClassName} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>; } return ( diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js index e3cf2d33b..b3f410f3b 100644 --- a/app/javascript/mastodon/features/compose/index.js +++ b/app/javascript/mastodon/features/compose/index.js @@ -64,23 +64,23 @@ export default class Compose extends React.PureComponent { if (multiColumn) { const { columns } = this.props; header = ( - <div className='drawer__header'> - <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)}><i role='img' aria-label={intl.formatMessage(messages.start)} className='fa fa-fw fa-asterisk' /></Link> + <nav className='drawer__header'> + <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)}><i role='img' className='fa fa-fw fa-asterisk' /></Link> {!columns.some(column => column.get('id') === 'HOME') && ( - <Link to='/timelines/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)}><i role='img' className='fa fa-fw fa-home' aria-label={intl.formatMessage(messages.home_timeline)} /></Link> + <Link to='/timelines/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)}><i role='img' className='fa fa-fw fa-home' /></Link> )} {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && ( - <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)}><i role='img' className='fa fa-fw fa-bell' aria-label={intl.formatMessage(messages.notifications)} /></Link> + <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)}><i role='img' className='fa fa-fw fa-bell' /></Link> )} {!columns.some(column => column.get('id') === 'COMMUNITY') && ( - <Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)}><i role='img' aria-label={intl.formatMessage(messages.community)} className='fa fa-fw fa-users' /></Link> + <Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)}><i role='img' className='fa fa-fw fa-users' /></Link> )} {!columns.some(column => column.get('id') === 'PUBLIC') && ( - <Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)}><i role='img' aria-label={intl.formatMessage(messages.public)} className='fa fa-fw fa-globe' /></Link> + <Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)}><i role='img' className='fa fa-fw fa-globe' /></Link> )} - <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)}><i role='img' aria-label={intl.formatMessage(messages.preferences)} className='fa fa-fw fa-cog' /></a> - <a href='/auth/sign_out' className='drawer__tab' data-method='delete' title={intl.formatMessage(messages.logout)}><i role='img' aria-label={intl.formatMessage(messages.logout)} className='fa fa-fw fa-sign-out' /></a> - </div> + <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)}><i role='img' className='fa fa-fw fa-cog' /></a> + <a href='/auth/sign_out' className='drawer__tab' data-method='delete' title={intl.formatMessage(messages.logout)}><i role='img' className='fa fa-fw fa-sign-out' /></a> + </nav> ); } diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js index baec86d0d..4d488f82d 100644 --- a/app/javascript/mastodon/features/ui/components/tabs_bar.js +++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js @@ -1,16 +1,17 @@ import React from 'react'; +import PropTypes from 'prop-types'; import NavLink from 'react-router-dom/NavLink'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl } from 'react-intl'; export const links = [ - <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new' data-preview-title-id='tabs_bar.compose' data-preview-icon='pencil' ><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>, - <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>, - <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>, + <NavLink className='tabs-bar__link primary' to='/statuses/new' data-preview-title-id='tabs_bar.compose' data-preview-icon='pencil' ><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>, + <NavLink className='tabs-bar__link primary' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>, + <NavLink className='tabs-bar__link primary' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>, - <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>, - <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>, + <NavLink className='tabs-bar__link secondary' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>, + <NavLink className='tabs-bar__link secondary' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>, - <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='tabs_bar.federated_timeline' data-preview-icon='asterisk' ><i className='fa fa-fw fa-asterisk' /></NavLink>, + <NavLink className='tabs-bar__link primary' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='asterisk' ><i className='fa fa-fw fa-asterisk' /></NavLink>, ]; export function getIndex (path) { @@ -21,13 +22,20 @@ export function getLink (index) { return links[index].props.to; } +@injectIntl export default class TabsBar extends React.Component { + static propTypes = { + intl: PropTypes.object.isRequired, + } + render () { + const { intl: { formatMessage } } = this.props; + return ( - <div className='tabs-bar'> - {React.Children.toArray(links)} - </div> + <nav className='tabs-bar'> + {links.map(link => React.cloneElement(link, { key: link.props.to, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))} + </nav> ); } diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 7f27d78cd..8ce254bde 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -34,7 +34,9 @@ "column.notifications": "الإشعارات", "column.public": "الخيط العام الموحد", "column_back_button.label": "العودة", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "التصفح", "column_subheading.settings": "الإعدادات", @@ -168,6 +170,7 @@ "status.report": "إبلِغ عن @{name}", "status.sensitive_toggle": "اضغط للعرض", "status.sensitive_warning": "محتوى حساس", + "status.share": "Share", "status.show_less": "إعرض أقلّ", "status.show_more": "أظهر المزيد", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 68aaf56b0..e3db1c7e1 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -34,7 +34,9 @@ "column.notifications": "Известия", "column.public": "Публичен канал", "column_back_button.label": "Назад", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Report @{name}", "status.sensitive_toggle": "Покажи", "status.sensitive_warning": "Деликатно съдържание", + "status.share": "Share", "status.show_less": "Show less", "status.show_more": "Show more", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 6fdcde4b4..2bb51653f 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -34,7 +34,9 @@ "column.notifications": "Notificacions", "column.public": "Línia de temps federada", "column_back_button.label": "Enrere", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navegació", "column_subheading.settings": "Configuració", @@ -168,6 +170,7 @@ "status.report": "Informar sobre @{name}", "status.sensitive_toggle": "Clic per veure", "status.sensitive_warning": "Contingut sensible", + "status.share": "Share", "status.show_less": "Mostra menys", "status.show_more": "Mostra més", "status.unmute_conversation": "Activar conversació", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index f911c7b75..eb67b5a06 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -34,7 +34,9 @@ "column.notifications": "Mitteilungen", "column.public": "Gesamtes bekanntes Netz", "column_back_button.label": "Zurück", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "@{name} melden", "status.sensitive_toggle": "Klicke, um sie zu sehen", "status.sensitive_warning": "Heikle Inhalte", + "status.share": "Share", "status.show_less": "Weniger anzeigen", "status.show_more": "Mehr anzeigen", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 047a89ebb..89538f8c3 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -54,6 +54,14 @@ { "descriptors": [ { + "defaultMessage": "Show settings", + "id": "column_header.show_settings" + }, + { + "defaultMessage": "Hide settings", + "id": "column_header.hide_settings" + }, + { "defaultMessage": "Unpin", "id": "column_header.unpin" }, @@ -139,6 +147,10 @@ "id": "status.reply" }, { + "defaultMessage": "Share", + "id": "status.share" + }, + { "defaultMessage": "Reply to thread", "id": "status.replyAll" }, diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 3a201b9c1..816ce68ae 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -34,7 +34,9 @@ "column.notifications": "Notifications", "column.public": "Federated timeline", "column_back_button.label": "Back", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "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_more": "Show more", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 0bb5159c8..a9a6ad150 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -34,7 +34,9 @@ "column.notifications": "Sciigoj", "column.public": "Fratara tempolinio", "column_back_button.label": "Reveni", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Report @{name}", "status.sensitive_toggle": "Alklaki por vidi", "status.sensitive_warning": "Tikla enhavo", + "status.share": "Share", "status.show_less": "Show less", "status.show_more": "Show more", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index a39b608c6..a3c2cae3a 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -34,7 +34,9 @@ "column.notifications": "Notificaciones", "column.public": "Historia federada", "column_back_button.label": "Atrás", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Reportar", "status.sensitive_toggle": "Click para ver", "status.sensitive_warning": "Contenido sensible", + "status.share": "Share", "status.show_less": "Mostrar menos", "status.show_more": "Mostrar más", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 6842558d9..cb918d414 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -34,7 +34,9 @@ "column.notifications": "اعلانها", "column.public": "نوشتههای همهجا", "column_back_button.label": "بازگشت", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "گشت و گذار", "column_subheading.settings": "تنظیمات", @@ -168,6 +170,7 @@ "status.report": "گزارش دادن @{name}", "status.sensitive_toggle": "برای دیدن کلیک کنید", "status.sensitive_warning": "محتوای حساس", + "status.share": "Share", "status.show_less": "نهفتن", "status.show_more": "نمایش", "status.unmute_conversation": "باصداکردن گفتگو", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index efc9b1053..0ad2c5bb9 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -34,7 +34,9 @@ "column.notifications": "Ilmoitukset", "column.public": "Yleinen aikajana", "column_back_button.label": "Takaisin", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Report @{name}", "status.sensitive_toggle": "Klikkaa nähdäksesi", "status.sensitive_warning": "Arkaluontoista sisältöä", + "status.share": "Share", "status.show_less": "Show less", "status.show_more": "Show more", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 3cc1f152a..9ae9b2d39 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -17,7 +17,7 @@ "account.unblock_domain": "Ne plus masquer {domain}", "account.unfollow": "Ne plus suivre", "account.unmute": "Ne plus masquer", -"account.view_full_profile": "Afficher le profil complet", + "account.view_full_profile": "Afficher le profil complet", "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois", "bundle_column_error.body": "Une erreur s'est produite lors du chargement de ce composant.", "bundle_column_error.retry": "Réessayer", @@ -34,7 +34,9 @@ "column.notifications": "Notifications", "column.public": "Fil public global", "column_back_button.label": "Retour", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Épingler", + "column_header.show_settings": "Show settings", "column_header.unpin": "Retirer", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Paramètres", @@ -168,6 +170,7 @@ "status.report": "Signaler @{name}", "status.sensitive_toggle": "Cliquer pour afficher", "status.sensitive_warning": "Contenu sensible", + "status.share": "Share", "status.show_less": "Replier", "status.show_more": "Déplier", "status.unmute_conversation": "Ne plus masquer la conversation", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 36be0842b..eb3c5d9da 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -34,7 +34,9 @@ "column.notifications": "התראות", "column.public": "בפרהסיה", "column_back_button.label": "חזרה", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "ניווט", "column_subheading.settings": "אפשרויות", @@ -168,6 +170,7 @@ "status.report": "דיווח על @{name}", "status.sensitive_toggle": "לחצו כדי לראות", "status.sensitive_warning": "תוכן רגיש", + "status.share": "Share", "status.show_less": "הראה פחות", "status.show_more": "הראה יותר", "status.unmute_conversation": "הסרת השתקת שיחה", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 363c4c490..099f3a7ae 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -34,7 +34,9 @@ "column.notifications": "Notifikacije", "column.public": "Federalni timeline", "column_back_button.label": "Natrag", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigacija", "column_subheading.settings": "Postavke", @@ -168,6 +170,7 @@ "status.report": "Prijavi @{name}", "status.sensitive_toggle": "Klikni da bi vidio", "status.sensitive_warning": "Osjetljiv sadržaj", + "status.share": "Share", "status.show_less": "Pokaži manje", "status.show_more": "Pokaži više", "status.unmute_conversation": "Poništi utišavanje razgovora", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index d43570f0d..c2d6dd672 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -34,7 +34,9 @@ "column.notifications": "Értesítések", "column.public": "Nyilvános", "column_back_button.label": "Vissza", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Report @{name}", "status.sensitive_toggle": "Katt a megtekintéshez", "status.sensitive_warning": "Érzékeny tartalom", + "status.share": "Share", "status.show_less": "Show less", "status.show_more": "Show more", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 916f313bb..7c9e75892 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -34,7 +34,9 @@ "column.notifications": "Notifikasi", "column.public": "Linimasa gabunggan", "column_back_button.label": "Kembali", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigasi", "column_subheading.settings": "Pengaturan", @@ -168,6 +170,7 @@ "status.report": "Laporkan @{name}", "status.sensitive_toggle": "Klik untuk menampilkan", "status.sensitive_warning": "Konten sensitif", + "status.share": "Share", "status.show_less": "Tampilkan lebih sedikit", "status.show_more": "Tampilkan semua", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index a87cc9328..e961a8c39 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -34,7 +34,9 @@ "column.notifications": "Savigi", "column.public": "Federata tempolineo", "column_back_button.label": "Retro", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Denuncar @{name}", "status.sensitive_toggle": "Kliktar por vidar", "status.sensitive_warning": "Trubliva kontenajo", + "status.share": "Share", "status.show_less": "Montrar mine", "status.show_more": "Montrar plue", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 243ed7344..b7d2c1d8c 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -34,7 +34,9 @@ "column.notifications": "Notifiche", "column.public": "Timeline federata", "column_back_button.label": "Indietro", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Segnala @{name}", "status.sensitive_toggle": "Clicca per vedere", "status.sensitive_warning": "Materiale sensibile", + "status.share": "Share", "status.show_less": "Mostra meno", "status.show_more": "Mostra di più", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index ca36122f7..8e0f9f4fa 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -34,7 +34,9 @@ "column.notifications": "通知", "column.public": "連合タイムライン", "column_back_button.label": "戻る", + "column_header.hide_settings": "Hide settings", "column_header.pin": "ピン留めする", + "column_header.show_settings": "Show settings", "column_header.unpin": "ピン留めを外す", "column_subheading.navigation": "ナビゲーション", "column_subheading.settings": "設定", @@ -168,6 +170,7 @@ "status.report": "通報", "status.sensitive_toggle": "クリックして表示", "status.sensitive_warning": "閲覧注意", + "status.share": "Share", "status.show_less": "隠す", "status.show_more": "もっと見る", "status.unmute_conversation": "会話のミュートを解除", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 768efa37d..817e53718 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -34,7 +34,9 @@ "column.notifications": "알림", "column.public": "연합 타임라인", "column_back_button.label": "돌아가기", + "column_header.hide_settings": "Hide settings", "column_header.pin": "고정하기", + "column_header.show_settings": "Show settings", "column_header.unpin": "고정 해제", "column_subheading.navigation": "내비게이션", "column_subheading.settings": "설정", @@ -168,6 +170,7 @@ "status.report": "신고", "status.sensitive_toggle": "클릭해서 표시하기", "status.sensitive_warning": "민감한 미디어", + "status.share": "Share", "status.show_less": "숨기기", "status.show_more": "더 보기", "status.unmute_conversation": "이 대화의 뮤트 해제하기", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index fbfabc5d1..70be3275b 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -17,7 +17,7 @@ "account.unblock_domain": "{domain} niet meer negeren", "account.unfollow": "Ontvolgen", "account.unmute": "@{name} niet meer negeren", - "account.view_full_profile": "Volledig profiel tonen", + "account.view_full_profile": "Volledig profiel tonen", "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan", "bundle_column_error.body": "Tijdens het laden van dit onderdeel is er iets fout gegaan.", "bundle_column_error.retry": "Opnieuw proberen", @@ -34,7 +34,9 @@ "column.notifications": "Meldingen", "column.public": "Globale tijdlijn", "column_back_button.label": "terug", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Vastmaken", + "column_header.show_settings": "Show settings", "column_header.unpin": "Losmaken", "column_subheading.navigation": "Navigatie", "column_subheading.settings": "Instellingen", @@ -147,12 +149,12 @@ "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen", "privacy.unlisted.short": "Minder openbaar", "reply_indicator.cancel": "Annuleren", - "report.heading": "Rapporteren", "report.placeholder": "Extra opmerkingen", "report.submit": "Verzenden", "report.target": "Rapporteren van", "search.placeholder": "Zoeken", "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}", + "standalone.public_title": "A look inside...", "status.cannot_reblog": "Deze toot kan niet geboost worden", "status.delete": "Verwijderen", "status.favourite": "Favoriet", @@ -168,6 +170,7 @@ "status.report": "Rapporteer @{name}", "status.sensitive_toggle": "Klik om te zien", "status.sensitive_warning": "Gevoelige inhoud", + "status.share": "Share", "status.show_less": "Minder tonen", "status.show_more": "Meer tonen", "status.unmute_conversation": "Conversatie niet meer negeren", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index 8727f6147..e74ffb3fb 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -34,7 +34,9 @@ "column.notifications": "Varsler", "column.public": "Felles tidslinje", "column_back_button.label": "Tilbake", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigasjon", "column_subheading.settings": "Innstillinger", @@ -168,6 +170,7 @@ "status.report": "Rapporter @{name}", "status.sensitive_toggle": "Klikk for å vise", "status.sensitive_warning": "Følsomt innhold", + "status.share": "Share", "status.show_less": "Vis mindre", "status.show_more": "Vis mer", "status.unmute_conversation": "Ikke demp samtale", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index c39d57333..21e434ead 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -34,7 +34,9 @@ "column.notifications": "Notificacions", "column.public": "Flux public global", "column_back_button.label": "Tornar", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Penjar", + "column_header.show_settings": "Show settings", "column_header.unpin": "Despenjar", "column_subheading.navigation": "Navigacion", "column_subheading.settings": "Paramètres", @@ -168,6 +170,7 @@ "status.report": "Senhalar @{name}", "status.sensitive_toggle": "Clicar per mostrar", "status.sensitive_warning": "Contengut sensible", + "status.share": "Share", "status.show_less": "Tornar plegar", "status.show_more": "Desplegar", "status.unmute_conversation": "Conversacions amb silenci levat", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 29e6ca471..60689372e 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -34,7 +34,9 @@ "column.notifications": "Powiadomienia", "column.public": "Globalna oś czasu", "column_back_button.label": "Wróć", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Przypnij", + "column_header.show_settings": "Show settings", "column_header.unpin": "Cofnij przypięcie", "column_subheading.navigation": "Nawigacja", "column_subheading.settings": "Ustawienia", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 86da7c4e6..ac3675909 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -34,7 +34,9 @@ "column.notifications": "Notificações", "column.public": "Global", "column_back_button.label": "Voltar", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Denúnciar @{name}", "status.sensitive_toggle": "Clique para ver", "status.sensitive_warning": "Conteúdo sensível", + "status.share": "Share", "status.show_less": "Mostrar menos", "status.show_more": "Mostrar mais", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index 86da7c4e6..ac3675909 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -34,7 +34,9 @@ "column.notifications": "Notificações", "column.public": "Global", "column_back_button.label": "Voltar", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "status.report": "Denúnciar @{name}", "status.sensitive_toggle": "Clique para ver", "status.sensitive_warning": "Conteúdo sensível", + "status.share": "Share", "status.show_less": "Mostrar menos", "status.show_more": "Mostrar mais", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 16af3fe7e..e9bddf918 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -34,7 +34,9 @@ "column.notifications": "Уведомления", "column.public": "Глобальная лента", "column_back_button.label": "Назад", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Закрепить", + "column_header.show_settings": "Show settings", "column_header.unpin": "Открепить", "column_subheading.navigation": "Навигация", "column_subheading.settings": "Настройки", @@ -168,6 +170,7 @@ "status.report": "Пожаловаться", "status.sensitive_toggle": "Нажмите для просмотра", "status.sensitive_warning": "Чувствительный контент", + "status.share": "Share", "status.show_less": "Свернуть", "status.show_more": "Развернуть", "status.unmute_conversation": "Снять глушение с треда", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index be5c0815d..e41f4193c 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -34,7 +34,9 @@ "column.notifications": "Notifications", "column.public": "Federated timeline", "column_back_button.label": "Back", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Settings", @@ -168,6 +170,7 @@ "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_more": "Show more", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 9d4d5fa17..aafa6739c 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -34,7 +34,9 @@ "column.notifications": "Bildirimler", "column.public": "Federe zaman tüneli", "column_back_button.label": "Geri", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Navigasyon", "column_subheading.settings": "Ayarlar", @@ -168,6 +170,7 @@ "status.report": "@{name}'i raporla", "status.sensitive_toggle": "Görmek için tıklayınız", "status.sensitive_warning": "Hassas içerik", + "status.share": "Share", "status.show_less": "Daha azı", "status.show_more": "Daha fazlası", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 60a551bb6..3f496d953 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -34,7 +34,9 @@ "column.notifications": "Сповіщення", "column.public": "Глобальна стрічка", "column_back_button.label": "Назад", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "Навігація", "column_subheading.settings": "Налаштування", @@ -168,6 +170,7 @@ "status.report": "Поскаржитися", "status.sensitive_toggle": "Натисніть, щоб подивитися", "status.sensitive_warning": "Непристойний зміст", + "status.share": "Share", "status.show_less": "Згорнути", "status.show_more": "Розгорнути", "status.unmute_conversation": "Зняти глушення з діалогу", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 97f1f5e27..e27061d95 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -34,7 +34,9 @@ "column.notifications": "通知", "column.public": "跨站公共时间轴", "column_back_button.label": "Back", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "导航", "column_subheading.settings": "设置", @@ -168,6 +170,7 @@ "status.report": "举报 @{name}", "status.sensitive_toggle": "点击显示", "status.sensitive_warning": "敏感内容", + "status.share": "Share", "status.show_less": "减少显示", "status.show_more": "显示更多", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index c65c3d45c..1ce4153bf 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -34,7 +34,9 @@ "column.notifications": "通知", "column.public": "跨站時間軸", "column_back_button.label": "返回", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "瀏覽", "column_subheading.settings": "設定", @@ -168,6 +170,7 @@ "status.report": "舉報 @{name}", "status.sensitive_toggle": "點擊顯示", "status.sensitive_warning": "敏感內容", + "status.share": "Share", "status.show_less": "減少顯示", "status.show_more": "顯示更多", "status.unmute_conversation": "Unmute conversation", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 12e840b16..6b1310463 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -34,7 +34,9 @@ "column.notifications": "通知", "column.public": "聯盟時間軸", "column_back_button.label": "上一頁", + "column_header.hide_settings": "Hide settings", "column_header.pin": "Pin", + "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.navigation": "瀏覽", "column_subheading.settings": "設定", @@ -168,6 +170,7 @@ "status.report": "通報 @{name}", "status.sensitive_toggle": "點來看", "status.sensitive_warning": "敏感內容", + "status.share": "Share", "status.show_less": "看少點", "status.show_more": "看更多", "status.unmute_conversation": "不消音對話", |