3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

signup-info-prompt
Jenkins 2018-03-13 18:17:20 +00:00
parent f8e934f955 fd385e256d
commit d75a6054a0
55 changed files with 441 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -51,5 +51,5 @@ before_script:
script: script:
- travis_retry bundle exec parallel_test spec/ --group-by filesize --type rspec - travis_retry bundle exec parallel_test spec/ --group-by filesize --type rspec
- yarn test - yarn run test:jest
- bundle exec i18n-tasks check-normalized && bundle exec i18n-tasks unused - bundle exec i18n-tasks check-normalized && bundle exec i18n-tasks unused

18
app/javascript/mastodon/actions/interactions.js
View File

@ -62,6 +62,7 @@ export function reblogRequest(status) {
return { return {
type: REBLOG_REQUEST, type: REBLOG_REQUEST,
status: status, status: status,
skipLoading: true,
}; };
}; };
@ -70,6 +71,7 @@ export function reblogSuccess(status, response) {
type: REBLOG_SUCCESS, type: REBLOG_SUCCESS,
status: status, status: status,
response: response, response: response,
skipLoading: true,
}; };
}; };
@ -78,6 +80,7 @@ export function reblogFail(status, error) {
type: REBLOG_FAIL, type: REBLOG_FAIL,
status: status, status: status,
error: error, error: error,
skipLoading: true,
}; };
}; };
@ -85,6 +88,7 @@ export function unreblogRequest(status) {
return { return {
type: UNREBLOG_REQUEST, type: UNREBLOG_REQUEST,
status: status, status: status,
skipLoading: true,
}; };
}; };
@ -93,6 +97,7 @@ export function unreblogSuccess(status, response) {
type: UNREBLOG_SUCCESS, type: UNREBLOG_SUCCESS,
status: status, status: status,
response: response, response: response,
skipLoading: true,
}; };
}; };
@ -101,6 +106,7 @@ export function unreblogFail(status, error) {
type: UNREBLOG_FAIL, type: UNREBLOG_FAIL,
status: status, status: status,
error: error, error: error,
skipLoading: true,
}; };
}; };
@ -132,6 +138,7 @@ export function favouriteRequest(status) {
return { return {
type: FAVOURITE_REQUEST, type: FAVOURITE_REQUEST,
status: status, status: status,
skipLoading: true,
}; };
}; };
@ -140,6 +147,7 @@ export function favouriteSuccess(status, response) {
type: FAVOURITE_SUCCESS, type: FAVOURITE_SUCCESS,
status: status, status: status,
response: response, response: response,
skipLoading: true,
}; };
}; };
@ -148,6 +156,7 @@ export function favouriteFail(status, error) {
type: FAVOURITE_FAIL, type: FAVOURITE_FAIL,
status: status, status: status,
error: error, error: error,
skipLoading: true,
}; };
}; };
@ -155,6 +164,7 @@ export function unfavouriteRequest(status) {
return { return {
type: UNFAVOURITE_REQUEST, type: UNFAVOURITE_REQUEST,
status: status, status: status,
skipLoading: true,
}; };
}; };
@ -163,6 +173,7 @@ export function unfavouriteSuccess(status, response) {
type: UNFAVOURITE_SUCCESS, type: UNFAVOURITE_SUCCESS,
status: status, status: status,
response: response, response: response,
skipLoading: true,
}; };
}; };
@ -171,6 +182,7 @@ export function unfavouriteFail(status, error) {
type: UNFAVOURITE_FAIL, type: UNFAVOURITE_FAIL,
status: status, status: status,
error: error, error: error,
skipLoading: true,
}; };
}; };
@ -258,6 +270,7 @@ export function pinRequest(status) {
return { return {
type: PIN_REQUEST, type: PIN_REQUEST,
status, status,
skipLoading: true,
}; };
}; };
@ -266,6 +279,7 @@ export function pinSuccess(status, response) {
type: PIN_SUCCESS, type: PIN_SUCCESS,
status, status,
response, response,
skipLoading: true,
}; };
}; };
@ -274,6 +288,7 @@ export function pinFail(status, error) {
type: PIN_FAIL, type: PIN_FAIL,
status, status,
error, error,
skipLoading: true,
}; };
}; };
@ -293,6 +308,7 @@ export function unpinRequest(status) {
return { return {
type: UNPIN_REQUEST, type: UNPIN_REQUEST,
status, status,
skipLoading: true,
}; };
}; };
@ -301,6 +317,7 @@ export function unpinSuccess(status, response) {
type: UNPIN_SUCCESS, type: UNPIN_SUCCESS,
status, status,
response, response,
skipLoading: true,
}; };
}; };
@ -309,5 +326,6 @@ export function unpinFail(status, error) {
type: UNPIN_FAIL, type: UNPIN_FAIL,
status, status,
error, error,
skipLoading: true,
}; };
}; };

2
app/javascript/mastodon/components/status_content.js
View File

@ -154,7 +154,7 @@ export default class StatusContent extends React.PureComponent {
} }
return ( return (
<div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}> <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
<p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}> <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
<span dangerouslySetInnerHTML={spoilerContent} /> <span dangerouslySetInnerHTML={spoilerContent} />
{' '} {' '}

5
app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
View File

@ -9,7 +9,8 @@ import spring from 'react-motion/lib/spring';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
const messages = defineMessages({ const messages = defineMessages({
title: { id: 'compose_form.sensitive', defaultMessage: 'Mark media as sensitive' }, marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' },
unmarked: { id: 'compose_form.sensitive.unmarked', defaultMessage: 'Media is not marked as sensitive' },
}); });
const mapStateToProps = state => ({ const mapStateToProps = state => ({
@ -50,7 +51,7 @@ class SensitiveButton extends React.PureComponent {
<div className={className} style={{ transform: `scale(${scale})` }}> <div className={className} style={{ transform: `scale(${scale})` }}>
<IconButton <IconButton
className='compose-form__sensitive-button__icon' className='compose-form__sensitive-button__icon'
title={intl.formatMessage(messages.title)} title={intl.formatMessage(active ? messages.marked : messages.unmarked)}
icon={icon} icon={icon}
onClick={onClick} onClick={onClick}
size={18} size={18}

5
app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
View File

@ -4,12 +4,13 @@ import { changeComposeSpoilerness } from '../../../actions/compose';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
const messages = defineMessages({ const messages = defineMessages({
title: { id: 'compose_form.spoiler', defaultMessage: 'Hide text behind warning' }, marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' },
unmarked: { id: 'compose_form.spoiler.unmarked', defaultMessage: 'Text is not hidden' },
}); });
const mapStateToProps = (state, { intl }) => ({ const mapStateToProps = (state, { intl }) => ({
label: 'CW', label: 'CW',
title: intl.formatMessage(messages.title), title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked),
active: state.getIn(['compose', 'spoiler']), active: state.getIn(['compose', 'spoiler']),
ariaControls: 'cw-spoiler-input', ariaControls: 'cw-spoiler-input',
}); });

6
app/javascript/mastodon/locales/ar.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "فيمَ تفكّر؟", "compose_form.placeholder": "فيمَ تفكّر؟",
"compose_form.publish": "بوّق", "compose_form.publish": "بوّق",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "ضع علامة على الوسيط باعتباره حسّاس", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "أخفِ النص واعرض تحذيرا", "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": "تنبيه عن المحتوى", "compose_form.spoiler_placeholder": "تنبيه عن المحتوى",
"confirmation_modal.cancel": "إلغاء", "confirmation_modal.cancel": "إلغاء",
"confirmations.block.confirm": "حجب", "confirmations.block.confirm": "حجب",

6
app/javascript/mastodon/locales/bg.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Какво си мислиш?", "compose_form.placeholder": "Какво си мислиш?",
"compose_form.publish": "Раздумай", "compose_form.publish": "Раздумай",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Отбележи съдържанието като деликатно", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Скрий текста зад предупреждение", "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": "Content warning", "compose_form.spoiler_placeholder": "Content warning",
"confirmation_modal.cancel": "Cancel", "confirmation_modal.cancel": "Cancel",
"confirmations.block.confirm": "Block", "confirmations.block.confirm": "Block",

6
app/javascript/mastodon/locales/ca.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "En què estàs pensant?", "compose_form.placeholder": "En què estàs pensant?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Marca el contingut multimèdia com a sensible", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Amaga el text darrera darrere un avís", "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": "Escriu l'avís aquí", "compose_form.spoiler_placeholder": "Escriu l'avís aquí",
"confirmation_modal.cancel": "Cancel·la", "confirmation_modal.cancel": "Cancel·la",
"confirmations.block.confirm": "Bloca", "confirmations.block.confirm": "Bloca",

6
app/javascript/mastodon/locales/de.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Worüber möchtest du schreiben?", "compose_form.placeholder": "Worüber möchtest du schreiben?",
"compose_form.publish": "Tröt", "compose_form.publish": "Tröt",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Medien als heikel markieren", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Text hinter Warnung verbergen", "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": "Inhaltswarnung", "compose_form.spoiler_placeholder": "Inhaltswarnung",
"confirmation_modal.cancel": "Abbrechen", "confirmation_modal.cancel": "Abbrechen",
"confirmations.block.confirm": "Blockieren", "confirmations.block.confirm": "Blockieren",

16
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -768,8 +768,12 @@
{ {
"descriptors": [ "descriptors": [
{ {
"defaultMessage": "Mark media as sensitive", "defaultMessage": "Media is marked as sensitive",
"id": "compose_form.sensitive" "id": "compose_form.sensitive.marked"
},
{
"defaultMessage": "Media is not marked as sensitive",
"id": "compose_form.sensitive.unmarked"
} }
], ],
"path": "app/javascript/mastodon/features/compose/containers/sensitive_button_container.json" "path": "app/javascript/mastodon/features/compose/containers/sensitive_button_container.json"
@ -777,8 +781,12 @@
{ {
"descriptors": [ "descriptors": [
{ {
"defaultMessage": "Hide text behind warning", "defaultMessage": "Text is hidden behind warning",
"id": "compose_form.spoiler" "id": "compose_form.spoiler.marked"
},
{
"defaultMessage": "Text is not hidden",
"id": "compose_form.spoiler.unmarked"
} }
], ],
"path": "app/javascript/mastodon/features/compose/containers/spoiler_button_container.json" "path": "app/javascript/mastodon/features/compose/containers/spoiler_button_container.json"

6
app/javascript/mastodon/locales/en.json
View File

@ -64,8 +64,10 @@
"compose_form.placeholder": "What is on your mind?", "compose_form.placeholder": "What is on your mind?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Mark media as sensitive", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Hide text behind warning", "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", "compose_form.spoiler_placeholder": "Write your warning here",
"confirmation_modal.cancel": "Cancel", "confirmation_modal.cancel": "Cancel",
"confirmations.block.confirm": "Block", "confirmations.block.confirm": "Block",

6
app/javascript/mastodon/locales/eo.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Pri kio vi pensas?", "compose_form.placeholder": "Pri kio vi pensas?",
"compose_form.publish": "Hup", "compose_form.publish": "Hup",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Marki aŭdovidaĵon tikla", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Kaŝi tekston malantaŭ averto", "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": "Skribu vian averton ĉi tie", "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie",
"confirmation_modal.cancel": "Nuligi", "confirmation_modal.cancel": "Nuligi",
"confirmations.block.confirm": "Bloki", "confirmations.block.confirm": "Bloki",

66
app/javascript/mastodon/locales/es.json
View File

@ -1,9 +1,9 @@
{ {
"account.block": "Bloquear", "account.block": "Bloquear",
"account.block_domain": "Ocultar todo de {domain}", "account.block_domain": "Ocultar todo de {domain}",
"account.blocked": "Blocked", "account.blocked": "Bloqueado",
"account.disclaimer_full": "La siguiente información del usuario puede estar incompleta.", "account.disclaimer_full": "La siguiente información del usuario puede estar incompleta.",
"account.domain_blocked": "Domain hidden", "account.domain_blocked": "Dominio oculto",
"account.edit_profile": "Editar perfil", "account.edit_profile": "Editar perfil",
"account.follow": "Seguir", "account.follow": "Seguir",
"account.followers": "Seguidores", "account.followers": "Seguidores",
@ -15,9 +15,9 @@
"account.moved_to": "{name} se ha mudado a:", "account.moved_to": "{name} se ha mudado a:",
"account.mute": "Silenciar a @{name}", "account.mute": "Silenciar a @{name}",
"account.mute_notifications": "Silenciar notificaciones de @{name}", "account.mute_notifications": "Silenciar notificaciones de @{name}",
"account.muted": "Muted", "account.muted": "Silenciado",
"account.posts": "Publicaciones", "account.posts": "Toots",
"account.posts_with_replies": "Toots with replies", "account.posts_with_replies": "Toots con respuestas",
"account.report": "Reportar a @{name}", "account.report": "Reportar a @{name}",
"account.requested": "Esperando aprobación", "account.requested": "Esperando aprobación",
"account.share": "Compartir el perfil de @{name}", "account.share": "Compartir el perfil de @{name}",
@ -54,14 +54,16 @@
"column_header.unpin": "Dejar de fijar", "column_header.unpin": "Dejar de fijar",
"column_subheading.navigation": "Navegación", "column_subheading.navigation": "Navegación",
"column_subheading.settings": "Ajustes", "column_subheading.settings": "Ajustes",
"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.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
"compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.", "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
"compose_form.lock_disclaimer.lock": "bloqueado", "compose_form.lock_disclaimer.lock": "bloqueado",
"compose_form.placeholder": "¿En qué estás pensando?", "compose_form.placeholder": "¿En qué estás pensando?",
"compose_form.publish": "Tootear", "compose_form.publish": "Tootear",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Marcar contenido como sensible", "compose_form.sensitive.marked": "Material marcado como sensible",
"compose_form.spoiler": "Ocultar texto tras una advertencia", "compose_form.sensitive.unmarked": "Material no marcado como sensible",
"compose_form.spoiler.marked": "Texto oculto tras la advertencia",
"compose_form.spoiler.unmarked": "Texto no oculto",
"compose_form.spoiler_placeholder": "Advertencia de contenido", "compose_form.spoiler_placeholder": "Advertencia de contenido",
"confirmation_modal.cancel": "Cancelar", "confirmation_modal.cancel": "Cancelar",
"confirmations.block.confirm": "Bloquear", "confirmations.block.confirm": "Bloquear",
@ -69,7 +71,7 @@
"confirmations.delete.confirm": "Eliminar", "confirmations.delete.confirm": "Eliminar",
"confirmations.delete.message": "¿Estás seguro de que quieres borrar este toot?", "confirmations.delete.message": "¿Estás seguro de que quieres borrar este toot?",
"confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.confirm": "Delete",
"confirmations.delete_list.message": "Are you sure you want to permanently delete this list?", "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
"confirmations.domain_block.confirm": "Ocultar dominio entero", "confirmations.domain_block.confirm": "Ocultar dominio entero",
"confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio entero? En algunos casos es preferible bloquear o silenciar objetivos determinados.", "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio entero? En algunos casos es preferible bloquear o silenciar objetivos determinados.",
"confirmations.mute.confirm": "Silenciar", "confirmations.mute.confirm": "Silenciar",
@ -132,18 +134,18 @@
"lightbox.close": "Cerrar", "lightbox.close": "Cerrar",
"lightbox.next": "Siguiente", "lightbox.next": "Siguiente",
"lightbox.previous": "Anterior", "lightbox.previous": "Anterior",
"lists.account.add": "Add to list", "lists.account.add": "Añadir a lista",
"lists.account.remove": "Remove from list", "lists.account.remove": "Quitar de lista",
"lists.delete": "Delete list", "lists.delete": "Delete list",
"lists.edit": "Edit list", "lists.edit": "Editar lista",
"lists.new.create": "Add list", "lists.new.create": "Añadir lista",
"lists.new.title_placeholder": "New list title", "lists.new.title_placeholder": "Título de la nueva lista",
"lists.search": "Search among people you follow", "lists.search": "Buscar entre la gente a la que sigues",
"lists.subheading": "Your lists", "lists.subheading": "Tus listas",
"loading_indicator.label": "Cargando…", "loading_indicator.label": "Cargando…",
"media_gallery.toggle_visible": "Cambiar visibilidad", "media_gallery.toggle_visible": "Cambiar visibilidad",
"missing_indicator.label": "No encontrado", "missing_indicator.label": "No encontrado",
"missing_indicator.sublabel": "This resource could not be found", "missing_indicator.sublabel": "No se encontró este recurso",
"mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?", "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
"navigation_bar.blocks": "Usuarios bloqueados", "navigation_bar.blocks": "Usuarios bloqueados",
"navigation_bar.community_timeline": "Historia local", "navigation_bar.community_timeline": "Historia local",
@ -152,7 +154,7 @@
"navigation_bar.follow_requests": "Solicitudes para seguirte", "navigation_bar.follow_requests": "Solicitudes para seguirte",
"navigation_bar.info": "Información adicional", "navigation_bar.info": "Información adicional",
"navigation_bar.keyboard_shortcuts": "Atajos de teclado", "navigation_bar.keyboard_shortcuts": "Atajos de teclado",
"navigation_bar.lists": "Lists", "navigation_bar.lists": "Listas",
"navigation_bar.logout": "Cerrar sesión", "navigation_bar.logout": "Cerrar sesión",
"navigation_bar.mutes": "Usuarios silenciados", "navigation_bar.mutes": "Usuarios silenciados",
"navigation_bar.pins": "Toots fijados", "navigation_bar.pins": "Toots fijados",
@ -179,8 +181,8 @@
"onboarding.page_four.home": "La línea de tiempo principal muestra toots de gente que sigues.", "onboarding.page_four.home": "La línea de tiempo principal muestra toots de gente que sigues.",
"onboarding.page_four.notifications": "Las notificaciones se muestran cuando alguien interactúa contigo.", "onboarding.page_four.notifications": "Las notificaciones se muestran cuando alguien interactúa contigo.",
"onboarding.page_one.federation": "Mastodon es una red de servidores federados que conforman una red social aún más grande. Llamamos a estos servidores instancias.", "onboarding.page_one.federation": "Mastodon es una red de servidores federados que conforman una red social aún más grande. Llamamos a estos servidores instancias.",
"onboarding.page_one.full_handle": "Your full handle", "onboarding.page_one.full_handle": "Tu sobrenombre completo",
"onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.", "onboarding.page_one.handle_hint": "Esto es lo que dirías a tus amistades que buscaran.",
"onboarding.page_one.welcome": "¡Bienvenido a Mastodon!", "onboarding.page_one.welcome": "¡Bienvenido a Mastodon!",
"onboarding.page_six.admin": "El administrador de tu instancia es {admin}.", "onboarding.page_six.admin": "El administrador de tu instancia es {admin}.",
"onboarding.page_six.almost_done": "Ya casi…", "onboarding.page_six.almost_done": "Ya casi…",
@ -203,28 +205,28 @@
"privacy.public.short": "Público", "privacy.public.short": "Público",
"privacy.unlisted.long": "No mostrar en la historia federada", "privacy.unlisted.long": "No mostrar en la historia federada",
"privacy.unlisted.short": "Sin federar", "privacy.unlisted.short": "Sin federar",
"regeneration_indicator.label": "Loading…", "regeneration_indicator.label": "Cargando…",
"regeneration_indicator.sublabel": "Your home feed is being prepared!", "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
"relative_time.days": "{number}d", "relative_time.days": "{number}d",
"relative_time.hours": "{number}h", "relative_time.hours": "{number}h",
"relative_time.just_now": "ahora", "relative_time.just_now": "ahora",
"relative_time.minutes": "{number}m", "relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s", "relative_time.seconds": "{number}s",
"reply_indicator.cancel": "Cancelar", "reply_indicator.cancel": "Cancelar",
"report.forward": "Forward to {target}", "report.forward": "Reenviar a {target}",
"report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?", "report.forward_hint": "Esta cuenta es de otro servidor. ¿Enviar una copia anonimizada del informe allí también?",
"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.hint": "El informe se enviará a los moderadores de tu instancia. Puedes proporcionar una explicación de por qué informas sobre esta cuenta a continuación:",
"report.placeholder": "Comentarios adicionales", "report.placeholder": "Comentarios adicionales",
"report.submit": "Publicar", "report.submit": "Publicar",
"report.target": "Reportando", "report.target": "Reportando",
"search.placeholder": "Buscar", "search.placeholder": "Buscar",
"search_popout.search_format": "Formato de búsqueda avanzada", "search_popout.search_format": "Formato de búsqueda avanzada",
"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.full_text": "Búsquedas de texto recuperan posts que has escrito, marcado como favoritos, retooteado o en los que has sido mencionado, así como usuarios, nombres y hashtags.",
"search_popout.tips.hashtag": "etiqueta", "search_popout.tips.hashtag": "etiqueta",
"search_popout.tips.status": "status", "search_popout.tips.status": "status",
"search_popout.tips.text": "El texto simple devuelve correspondencias de nombre, usuario y hashtag", "search_popout.tips.text": "El texto simple devuelve correspondencias de nombre, usuario y hashtag",
"search_popout.tips.user": "usuario", "search_popout.tips.user": "usuario",
"search_results.accounts": "People", "search_results.accounts": "Gente",
"search_results.hashtags": "Hashtags", "search_results.hashtags": "Hashtags",
"search_results.statuses": "Toots", "search_results.statuses": "Toots",
"search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
@ -238,11 +240,11 @@
"status.media_hidden": "Contenido multimedia oculto", "status.media_hidden": "Contenido multimedia oculto",
"status.mention": "Mencionar", "status.mention": "Mencionar",
"status.more": "Más", "status.more": "Más",
"status.mute": "Mute @{name}", "status.mute": "Silenciar @{name}",
"status.mute_conversation": "Silenciar conversación", "status.mute_conversation": "Silenciar conversación",
"status.open": "Expandir estado", "status.open": "Expandir estado",
"status.pin": "Fijar", "status.pin": "Fijar",
"status.pinned": "Pinned toot", "status.pinned": "Toot fijado",
"status.reblog": "Retootear", "status.reblog": "Retootear",
"status.reblogged_by": "Retooteado por {name}", "status.reblogged_by": "Retooteado por {name}",
"status.reply": "Responder", "status.reply": "Responder",
@ -252,9 +254,9 @@
"status.sensitive_warning": "Contenido sensible", "status.sensitive_warning": "Contenido sensible",
"status.share": "Compartir", "status.share": "Compartir",
"status.show_less": "Mostrar menos", "status.show_less": "Mostrar menos",
"status.show_less_all": "Show less for all", "status.show_less_all": "Mostrar menos para todo",
"status.show_more": "Mostrar más", "status.show_more": "Mostrar más",
"status.show_more_all": "Show more for all", "status.show_more_all": "Mostrar más para todo",
"status.unmute_conversation": "Dejar de silenciar conversación", "status.unmute_conversation": "Dejar de silenciar conversación",
"status.unpin": "Dejar de fijar", "status.unpin": "Dejar de fijar",
"tabs_bar.federated_timeline": "Federado", "tabs_bar.federated_timeline": "Federado",
@ -265,7 +267,7 @@
"upload_area.title": "Arrastra y suelta para subir", "upload_area.title": "Arrastra y suelta para subir",
"upload_button.label": "Subir multimedia", "upload_button.label": "Subir multimedia",
"upload_form.description": "Describir para los usuarios con dificultad visual", "upload_form.description": "Describir para los usuarios con dificultad visual",
"upload_form.focus": "Crop", "upload_form.focus": "Recortar",
"upload_form.undo": "Deshacer", "upload_form.undo": "Deshacer",
"upload_progress.label": "Subiendo…", "upload_progress.label": "Subiendo…",
"video.close": "Cerrar video", "video.close": "Cerrar video",

6
app/javascript/mastodon/locales/fa.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "تازه چه خبر؟", "compose_form.placeholder": "تازه چه خبر؟",
"compose_form.publish": "بوق", "compose_form.publish": "بوق",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "تصاویر حساس هستند", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "نوشته را پشت هشدار پنهان کنید", "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": "هشدار محتوا", "compose_form.spoiler_placeholder": "هشدار محتوا",
"confirmation_modal.cancel": "بی‌خیال", "confirmation_modal.cancel": "بی‌خیال",
"confirmations.block.confirm": "مسدود کن", "confirmations.block.confirm": "مسدود کن",

6
app/javascript/mastodon/locales/fi.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Mitä sinulla on mielessä?", "compose_form.placeholder": "Mitä sinulla on mielessä?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Merkitse media herkäksi", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Piiloita teksti varoituksen taakse", "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": "Content warning", "compose_form.spoiler_placeholder": "Content warning",
"confirmation_modal.cancel": "Peruuta", "confirmation_modal.cancel": "Peruuta",
"confirmations.block.confirm": "Estä", "confirmations.block.confirm": "Estä",

10
app/javascript/mastodon/locales/fr.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Qu’avez-vous en tête ?", "compose_form.placeholder": "Qu’avez-vous en tête ?",
"compose_form.publish": "Pouet", "compose_form.publish": "Pouet",
"compose_form.publish_loud": "{publish} !", "compose_form.publish_loud": "{publish} !",
"compose_form.sensitive": "Marquer le média comme sensible", "compose_form.sensitive.marked": "Média marqué comme sensible",
"compose_form.spoiler": "Masquer le texte derrière un avertissement", "compose_form.sensitive.unmarked": "Média non marqué comme sensible",
"compose_form.spoiler.marked": "Le texte est caché derrière un avertissement",
"compose_form.spoiler.unmarked": "Le texte n'est pas caché",
"compose_form.spoiler_placeholder": "Écrivez ici votre avertissement", "compose_form.spoiler_placeholder": "Écrivez ici votre avertissement",
"confirmation_modal.cancel": "Annuler", "confirmation_modal.cancel": "Annuler",
"confirmations.block.confirm": "Bloquer", "confirmations.block.confirm": "Bloquer",
@ -252,9 +254,9 @@
"status.sensitive_warning": "Contenu sensible", "status.sensitive_warning": "Contenu sensible",
"status.share": "Partager", "status.share": "Partager",
"status.show_less": "Replier", "status.show_less": "Replier",
"status.show_less_all": "Show less for all", "status.show_less_all": "Tout replier",
"status.show_more": "Déplier", "status.show_more": "Déplier",
"status.show_more_all": "Show more for all", "status.show_more_all": "Tout déplier",
"status.unmute_conversation": "Ne plus masquer la conversation", "status.unmute_conversation": "Ne plus masquer la conversation",
"status.unpin": "Retirer du profil", "status.unpin": "Retirer du profil",
"tabs_bar.federated_timeline": "Fil public global", "tabs_bar.federated_timeline": "Fil public global",

6
app/javascript/mastodon/locales/gl.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "A qué andas?", "compose_form.placeholder": "A qué andas?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Marcar medios como sensibles", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Agochar texto detrás de un aviso", "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": "Escriba o aviso aquí", "compose_form.spoiler_placeholder": "Escriba o aviso aquí",
"confirmation_modal.cancel": "Cancelar", "confirmation_modal.cancel": "Cancelar",
"confirmations.block.confirm": "Bloquear", "confirmations.block.confirm": "Bloquear",

6
app/javascript/mastodon/locales/he.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "מה עובר לך בראש?", "compose_form.placeholder": "מה עובר לך בראש?",
"compose_form.publish": "ללחוש", "compose_form.publish": "ללחוש",
"compose_form.publish_loud": "לחצרץ!", "compose_form.publish_loud": "לחצרץ!",
"compose_form.sensitive": "סימון תוכן כרגיש", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "הסתרה מאחורי אזהרת תוכן", "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": "אזהרת תוכן", "compose_form.spoiler_placeholder": "אזהרת תוכן",
"confirmation_modal.cancel": "ביטול", "confirmation_modal.cancel": "ביטול",
"confirmations.block.confirm": "לחסום", "confirmations.block.confirm": "לחסום",

6
app/javascript/mastodon/locales/hr.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Što ti je na umu?", "compose_form.placeholder": "Što ti je na umu?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Označi media sadržaj kao osjetljiv", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Sakrij text iza upozorenja", "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": "Upozorenje o sadržaju", "compose_form.spoiler_placeholder": "Upozorenje o sadržaju",
"confirmation_modal.cancel": "Otkaži", "confirmation_modal.cancel": "Otkaži",
"confirmations.block.confirm": "Blokiraj", "confirmations.block.confirm": "Blokiraj",

6
app/javascript/mastodon/locales/hu.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Mire gondolsz?", "compose_form.placeholder": "Mire gondolsz?",
"compose_form.publish": "Tülk", "compose_form.publish": "Tülk",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Tartalom érzékenynek jelölése", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Szöveg figyelmeztetés mögé rejtése", "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": "Figyelmeztetését írja ide", "compose_form.spoiler_placeholder": "Figyelmeztetését írja ide",
"confirmation_modal.cancel": "Bezár", "confirmation_modal.cancel": "Bezár",
"confirmations.block.confirm": "Letilt", "confirmations.block.confirm": "Letilt",

6
app/javascript/mastodon/locales/hy.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Ի՞նչ կա մտքիդ", "compose_form.placeholder": "Ի՞նչ կա մտքիդ",
"compose_form.publish": "Թթել", "compose_form.publish": "Թթել",
"compose_form.publish_loud": "Թթե՜լ", "compose_form.publish_loud": "Թթե՜լ",
"compose_form.sensitive": "Նշել բովանդակությունը որպես կասկածելի", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Թաքցնել տեքստը նախազգուշացման ետեւում", "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": "Գրիր նախազգուշացումդ այստեղ", "compose_form.spoiler_placeholder": "Գրիր նախազգուշացումդ այստեղ",
"confirmation_modal.cancel": "Չեղարկել", "confirmation_modal.cancel": "Չեղարկել",
"confirmations.block.confirm": "Արգելափակել", "confirmations.block.confirm": "Արգելափակել",

148
app/javascript/mastodon/locales/id.json
View File

@ -1,131 +1,133 @@
{ {
"account.block": "Blokir @{name}", "account.block": "Blokir @{name}",
"account.block_domain": "Hide everything from {domain}", "account.block_domain": "Sembunyikan segalanya dari {domain}",
"account.blocked": "Blocked", "account.blocked": "Terblokir",
"account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.disclaimer_full": "Informasi di bawah mungkin tidak mencerminkan profil user secara lengkap.",
"account.domain_blocked": "Domain hidden", "account.domain_blocked": "Domain disembunyikan",
"account.edit_profile": "Ubah profil", "account.edit_profile": "Ubah profil",
"account.follow": "Ikuti", "account.follow": "Ikuti",
"account.followers": "Pengikut", "account.followers": "Pengikut",
"account.follows": "Mengikuti", "account.follows": "Mengikuti",
"account.follows_you": "Mengikuti anda", "account.follows_you": "Mengikuti anda",
"account.hide_reblogs": "Hide boosts from @{name}", "account.hide_reblogs": "Sembunyikan boosts dari @{name}",
"account.media": "Media", "account.media": "Media",
"account.mention": "Balasan @{name}", "account.mention": "Balasan @{name}",
"account.moved_to": "{name} has moved to:", "account.moved_to": "{name} telah pindah ke:",
"account.mute": "Bisukan @{name}", "account.mute": "Bisukan @{name}",
"account.mute_notifications": "Mute notifications from @{name}", "account.mute_notifications": "Sembunyikan notifikasi dari @{name}",
"account.muted": "Muted", "account.muted": "Dibisukan",
"account.posts": "Postingan", "account.posts": "Toots",
"account.posts_with_replies": "Toots with replies", "account.posts_with_replies": "Postingan dengan balasan",
"account.report": "Laporkan @{name}", "account.report": "Laporkan @{name}",
"account.requested": "Menunggu persetujuan", "account.requested": "Menunggu persetujuan. Klik untuk membatalkan permintaan",
"account.share": "Share @{name}'s profile", "account.share": "Bagikan profil @{name}",
"account.show_reblogs": "Show boosts from @{name}", "account.show_reblogs": "Tampilkan boost dari @{name}",
"account.unblock": "Hapus blokir @{name}", "account.unblock": "Hapus blokir @{name}",
"account.unblock_domain": "Unhide {domain}", "account.unblock_domain": "Tampilkan {domain}",
"account.unfollow": "Berhenti mengikuti", "account.unfollow": "Berhenti mengikuti",
"account.unmute": "Berhenti membisukan @{name}", "account.unmute": "Berhenti membisukan @{name}",
"account.unmute_notifications": "Unmute notifications from @{name}", "account.unmute_notifications": "Munculkan notifikasi dari @{name}",
"account.view_full_profile": "View full profile", "account.view_full_profile": "Lihat profil lengkap",
"boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini", "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
"bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.body": "Kesalahan terjadi saat memuat komponen ini.",
"bundle_column_error.retry": "Try again", "bundle_column_error.retry": "Coba lagi",
"bundle_column_error.title": "Network error", "bundle_column_error.title": "Network error",
"bundle_modal_error.close": "Close", "bundle_modal_error.close": "Tutup",
"bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.message": "Kesalahan terjadi saat memuat komponen ini.",
"bundle_modal_error.retry": "Try again", "bundle_modal_error.retry": "Coba lagi",
"column.blocks": "Pengguna diblokir", "column.blocks": "Pengguna diblokir",
"column.community": "Linimasa Lokal", "column.community": "Linimasa Lokal",
"column.favourites": "Favorit", "column.favourites": "Favorit",
"column.follow_requests": "Permintaan mengikuti", "column.follow_requests": "Permintaan mengikuti",
"column.home": "Beranda", "column.home": "Beranda",
"column.lists": "Lists", "column.lists": "List",
"column.mutes": "Pengguna dibisukan", "column.mutes": "Pengguna yang dibisukan",
"column.notifications": "Notifikasi", "column.notifications": "Notifikasi",
"column.pins": "Pinned toot", "column.pins": "Pinned toot",
"column.public": "Linimasa gabunggan", "column.public": "Linimasa gabungan",
"column_back_button.label": "Kembali", "column_back_button.label": "Kembali",
"column_header.hide_settings": "Hide settings", "column_header.hide_settings": "Sembunyikan pengaturan",
"column_header.moveLeft_settings": "Move column to the left", "column_header.moveLeft_settings": "Pindahkan kolom ke kiri",
"column_header.moveRight_settings": "Move column to the right", "column_header.moveRight_settings": "Pindahkan kolom ke kanan",
"column_header.pin": "Pin", "column_header.pin": "Sematkan",
"column_header.show_settings": "Show settings", "column_header.show_settings": "Tampilkan pengaturan",
"column_header.unpin": "Unpin", "column_header.unpin": "Lepaskan",
"column_subheading.navigation": "Navigasi", "column_subheading.navigation": "Navigasi",
"column_subheading.settings": "Pengaturan", "column_subheading.settings": "Pengaturan",
"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.hashtag_warning": "Toot ini tidak akan ada dalam daftar tagar manapun karena telah di set sebagai tidak terdaftar. Hanya postingan publik yang bisa dicari dengan tagar.",
"compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.", "compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.",
"compose_form.lock_disclaimer.lock": "dikunci", "compose_form.lock_disclaimer.lock": "terkunci",
"compose_form.placeholder": "Apa yang ada di pikiran anda?", "compose_form.placeholder": "Apa yang ada di pikiran anda?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Tandai media sensitif", "compose_form.sensitive.marked": "Sumber ini telah ditandai sebagai sumber sensitif.",
"compose_form.spoiler": "Sembunyikan teks dibalik peringatan", "compose_form.sensitive.unmarked": "Sumber ini tidak ditandai sebagai sumber sensitif",
"compose_form.spoiler.marked": "Teks disembunyikan dibalik peringatan",
"compose_form.spoiler.unmarked": "Teks tidak tersembunyi",
"compose_form.spoiler_placeholder": "Peringatan konten", "compose_form.spoiler_placeholder": "Peringatan konten",
"confirmation_modal.cancel": "Batal", "confirmation_modal.cancel": "Batal",
"confirmations.block.confirm": "Blokir", "confirmations.block.confirm": "Blokir",
"confirmations.block.message": "Apa anda yakin ingin memblokir {name}?", "confirmations.block.message": "Apa anda yakin ingin memblokir {name}?",
"confirmations.delete.confirm": "Hapus", "confirmations.delete.confirm": "Hapus",
"confirmations.delete.message": "Apa anda yakin akan menghapus status ini?", "confirmations.delete.message": "Apa anda yakin untuk menghapus status ini?",
"confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.confirm": "Delete",
"confirmations.delete_list.message": "Are you sure you want to permanently delete this list?", "confirmations.delete_list.message": "Apakah anda yakin untuk menghapus daftar ini secara permanen?",
"confirmations.domain_block.confirm": "Hide entire domain", "confirmations.domain_block.confirm": "Sembunyikan keseluruhan 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.", "confirmations.domain_block.message": "Apakah anda benar benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
"confirmations.mute.confirm": "Bisukan", "confirmations.mute.confirm": "Bisukan",
"confirmations.mute.message": "Apa anda yakin ingin membisukan {name}?", "confirmations.mute.message": "Apa anda yakin ingin membisukan {name}?",
"confirmations.unfollow.confirm": "Unfollow", "confirmations.unfollow.confirm": "Berhenti mengikuti",
"confirmations.unfollow.message": "Are you sure you want to unfollow {name}?", "confirmations.unfollow.message": "Apakah anda ingin berhenti mengikuti {name}?",
"embed.instructions": "Embed this status on your website by copying the code below.", "embed.instructions": "Sematkan status ini di website anda dengan menyalin kode di bawah ini.",
"embed.preview": "Here is what it will look like:", "embed.preview": "Seperti ini nantinya:",
"emoji_button.activity": "Aktivitas", "emoji_button.activity": "Aktivitas",
"emoji_button.custom": "Custom", "emoji_button.custom": "Kustom",
"emoji_button.flags": "Bendera", "emoji_button.flags": "Bendera",
"emoji_button.food": "Makanan & Minuman", "emoji_button.food": "Makanan & Minuman",
"emoji_button.label": "Tambahkan emoji", "emoji_button.label": "Tambahkan emoji",
"emoji_button.nature": "Alam", "emoji_button.nature": "Alam",
"emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻", "emoji_button.not_found": "Katakan tidak pada emoji!! (╯°□°）╯︵ ┻━┻",
"emoji_button.objects": "Benda-benda", "emoji_button.objects": "Benda-benda",
"emoji_button.people": "Orang", "emoji_button.people": "Orang",
"emoji_button.recent": "Frequently used", "emoji_button.recent": "Yang sering digunakan",
"emoji_button.search": "Cari...", "emoji_button.search": "Cari...",
"emoji_button.search_results": "Search results", "emoji_button.search_results": "Hasil pencarian",
"emoji_button.symbols": "Simbol", "emoji_button.symbols": "Simbol",
"emoji_button.travel": "Tempat Wisata", "emoji_button.travel": "Tempat Wisata",
"empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!", "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!",
"empty_column.hashtag": "Tidak ada apapun dalam hashtag ini.", "empty_column.hashtag": "Tidak ada apapun dalam hashtag ini.",
"empty_column.home": "Anda sedang tidak mengikuti siapapun. Kunjungi {public} atau gunakan pencarian untuk memulai dan bertemu pengguna lain.", "empty_column.home": "Linimasa anda kosong! Kunjungi {public} atau gunakan pencarian untuk memulai dan bertemu pengguna lain.",
"empty_column.home.public_timeline": "linimasa publik", "empty_column.home.public_timeline": "linimasa publik",
"empty_column.list": "There is nothing in this list yet.", "empty_column.list": "Tidak ada postingan di list ini. Ketika anggota dari list ini memposting status baru, status tersebut akan tampil disini.",
"empty_column.notifications": "Anda tidak memiliki notifikasi apapun. Berinteraksi dengan orang lain untuk memulai percakapan.", "empty_column.notifications": "Anda tidak memiliki notifikasi apapun. Berinteraksi dengan orang lain untuk memulai percakapan.",
"empty_column.public": "Tidak ada apapun disini! Tulis sesuatu, atau ikuti pengguna lain dari server lain untuk mengisinya secara manual", "empty_column.public": "Tidak ada apapun disini! Tulis sesuatu, atau ikuti pengguna lain dari server lain untuk mengisi ini",
"follow_request.authorize": "Izinkan", "follow_request.authorize": "Izinkan",
"follow_request.reject": "Tolak", "follow_request.reject": "Tolak",
"getting_started.appsshort": "Apps", "getting_started.appsshort": "Aplikasi",
"getting_started.faq": "FAQ", "getting_started.faq": "FAQ",
"getting_started.heading": "Mulai", "getting_started.heading": "Mulai",
"getting_started.open_source_notice": "Mastodon adalah perangkat lunak yang bersifat open source. Anda dapat berkontribusi atau melaporkan permasalahan/bug di Github {github}.", "getting_started.open_source_notice": "Mastodon adalah perangkat lunak yang bersifat terbuka. Anda dapat berkontribusi atau melaporkan permasalahan/bug di Github {github}.",
"getting_started.userguide": "User Guide", "getting_started.userguide": "Panduan Pengguna",
"home.column_settings.advanced": "Tingkat Lanjut", "home.column_settings.advanced": "Tingkat Lanjut",
"home.column_settings.basic": "Dasar", "home.column_settings.basic": "Dasar",
"home.column_settings.filter_regex": "Penyaringan dengan Regular Expression", "home.column_settings.filter_regex": "Saring dengan regular expressions",
"home.column_settings.show_reblogs": "Tampilkan Boost", "home.column_settings.show_reblogs": "Tampilkan boost",
"home.column_settings.show_replies": "Tampilkan balasan", "home.column_settings.show_replies": "Tampilkan balasan",
"home.settings": "Pengaturan kolom", "home.settings": "Pengaturan kolom",
"keyboard_shortcuts.back": "to navigate back", "keyboard_shortcuts.back": "untuk kembali",
"keyboard_shortcuts.boost": "to boost", "keyboard_shortcuts.boost": "untuk menyebarkan",
"keyboard_shortcuts.column": "to focus a status in one of the columns", "keyboard_shortcuts.column": "untuk fokus kepada sebuah status di sebuah kolom",
"keyboard_shortcuts.compose": "to focus the compose textarea", "keyboard_shortcuts.compose": "untuk fokus ke area penulisan",
"keyboard_shortcuts.description": "Description", "keyboard_shortcuts.description": "Deskripsi",
"keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar",
"keyboard_shortcuts.enter": "to open status", "keyboard_shortcuts.enter": "untuk membuka status",
"keyboard_shortcuts.favourite": "to favourite", "keyboard_shortcuts.favourite": "untuk memfavoritkan",
"keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.heading": "Pintasan keyboard",
"keyboard_shortcuts.hotkey": "Hotkey", "keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend", "keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.mention": "to mention author", "keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.reply": "to reply", "keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.search": "untuk fokus mencari",
"keyboard_shortcuts.toot": "to start a brand new toot", "keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list", "keyboard_shortcuts.up": "to move up in the list",
@ -197,14 +199,14 @@
"privacy.change": "Tentukan privasi status", "privacy.change": "Tentukan privasi status",
"privacy.direct.long": "Kirim hanya ke pengguna yang disebut", "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
"privacy.direct.short": "Langsung", "privacy.direct.short": "Langsung",
"privacy.private.long": "Kirim hanya ke pengikut", "privacy.private.long": "Kirim postingan hanya kepada pengikut",
"privacy.private.short": "Pribadi", "privacy.private.short": "Pribadi",
"privacy.public.long": "Kirim ke linimasa publik", "privacy.public.long": "Kirim ke linimasa publik",
"privacy.public.short": "Publik", "privacy.public.short": "Publik",
"privacy.unlisted.long": "Tidak ditampilkan di linimasa publik", "privacy.unlisted.long": "Tidak ditampilkan di linimasa publik",
"privacy.unlisted.short": "Tak Terdaftar", "privacy.unlisted.short": "Tak Terdaftar",
"regeneration_indicator.label": "Loading…", "regeneration_indicator.label": "Loading…",
"regeneration_indicator.sublabel": "Your home feed is being prepared!", "regeneration_indicator.sublabel": "Linimasa anda sedang disiapkan!",
"relative_time.days": "{number}d", "relative_time.days": "{number}d",
"relative_time.hours": "{number}h", "relative_time.hours": "{number}h",
"relative_time.just_now": "now", "relative_time.just_now": "now",
@ -220,14 +222,14 @@
"search.placeholder": "Pencarian", "search.placeholder": "Pencarian",
"search_popout.search_format": "Advanced search format", "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.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.hashtag": "tagar",
"search_popout.tips.status": "status", "search_popout.tips.status": "status",
"search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags", "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.accounts": "People", "search_results.accounts": "People",
"search_results.hashtags": "Hashtags", "search_results.hashtags": "Hashtags",
"search_results.statuses": "Toots", "search_results.statuses": "Toots",
"search_results.total": "{count} {count, plural, one {hasil} other {hasil}}", "search_results.total": "{count, number} {count, plural, one {hasil} other {hasil}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}", "status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
@ -261,16 +263,16 @@
"tabs_bar.home": "Beranda", "tabs_bar.home": "Beranda",
"tabs_bar.local_timeline": "Lokal", "tabs_bar.local_timeline": "Lokal",
"tabs_bar.notifications": "Notifikasi", "tabs_bar.notifications": "Notifikasi",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.", "ui.beforeunload": "Naskah anda akan hilang jika anda keluar dari Mastodon.",
"upload_area.title": "Seret & lepaskan untuk mengunggah", "upload_area.title": "Seret & lepaskan untuk mengunggah",
"upload_button.label": "Tambahkan media", "upload_button.label": "Tambahkan media",
"upload_form.description": "Describe for the visually impaired", "upload_form.description": "Deskripsikan untuk mereka yang tidak bisa melihat dengan jelas",
"upload_form.focus": "Crop", "upload_form.focus": "Potong",
"upload_form.undo": "Undo", "upload_form.undo": "Undo",
"upload_progress.label": "Mengunggah...", "upload_progress.label": "Mengunggah...",
"video.close": "Close video", "video.close": "Close video",
"video.exit_fullscreen": "Exit full screen", "video.exit_fullscreen": "Keluar dari layar penuh",
"video.expand": "Expand video", "video.expand": "Perbesar video",
"video.fullscreen": "Full screen", "video.fullscreen": "Full screen",
"video.hide": "Hide video", "video.hide": "Hide video",
"video.mute": "Mute sound", "video.mute": "Mute sound",

6
app/javascript/mastodon/locales/io.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Quo esas en tua spirito?", "compose_form.placeholder": "Quo esas en tua spirito?",
"compose_form.publish": "Siflar", "compose_form.publish": "Siflar",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Markizar kontenajo kom trubliva", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Celar texto dop averto", "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": "Averto di kontenajo", "compose_form.spoiler_placeholder": "Averto di kontenajo",
"confirmation_modal.cancel": "Cancel", "confirmation_modal.cancel": "Cancel",
"confirmations.block.confirm": "Block", "confirmations.block.confirm": "Block",

6
app/javascript/mastodon/locales/it.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "A cosa stai pensando?", "compose_form.placeholder": "A cosa stai pensando?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Segnala file come sensibile", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Nascondi testo con avvertimento", "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": "Content warning", "compose_form.spoiler_placeholder": "Content warning",
"confirmation_modal.cancel": "Cancel", "confirmation_modal.cancel": "Cancel",
"confirmations.block.confirm": "Block", "confirmations.block.confirm": "Block",

10
app/javascript/mastodon/locales/ja.json
View File

@ -64,8 +64,10 @@
"compose_form.placeholder": "今なにしてる？", "compose_form.placeholder": "今なにしてる？",
"compose_form.publish": "トゥート", "compose_form.publish": "トゥート",
"compose_form.publish_loud": "{publish}！", "compose_form.publish_loud": "{publish}！",
"compose_form.sensitive": "メディアを閲覧注意としてマークする", "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
"compose_form.spoiler": "テキストを隠す", "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
"compose_form.spoiler.marked": "閲覧注意が設定されています",
"compose_form.spoiler.unmarked": "閲覧注意が設定されていません",
"compose_form.spoiler_placeholder": "ここに警告を書いてください", "compose_form.spoiler_placeholder": "ここに警告を書いてください",
"confirmation_modal.cancel": "キャンセル", "confirmation_modal.cancel": "キャンセル",
"confirmations.block.confirm": "ブロック", "confirmations.block.confirm": "ブロック",
@ -259,9 +261,9 @@
"status.sensitive_warning": "閲覧注意", "status.sensitive_warning": "閲覧注意",
"status.share": "共有", "status.share": "共有",
"status.show_less": "隠す", "status.show_less": "隠す",
"status.show_less_all": "Show less for all", "status.show_less_all": "全て隠す",
"status.show_more": "もっと見る", "status.show_more": "もっと見る",
"status.show_more_all": "Show more for all", "status.show_more_all": "全て見る",
"status.unmute_conversation": "会話のミュートを解除", "status.unmute_conversation": "会話のミュートを解除",
"status.unpin": "プロフィールの固定表示を解除", "status.unpin": "プロフィールの固定表示を解除",
"tabs_bar.federated_timeline": "連合", "tabs_bar.federated_timeline": "連合",

6
app/javascript/mastodon/locales/ko.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "지금 무엇을 하고 있나요?", "compose_form.placeholder": "지금 무엇을 하고 있나요?",
"compose_form.publish": "툿", "compose_form.publish": "툿",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "이 미디어를 민감한 미디어로 취급", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "텍스트 숨기기", "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": "경고", "compose_form.spoiler_placeholder": "경고",
"confirmation_modal.cancel": "취소", "confirmation_modal.cancel": "취소",
"confirmations.block.confirm": "차단", "confirmations.block.confirm": "차단",

12
app/javascript/mastodon/locales/nl.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Wat wil je kwijt?", "compose_form.placeholder": "Wat wil je kwijt?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Media als gevoelig markeren (nsfw)", "compose_form.sensitive.marked": "Media is als gevoelig gemarkeerd",
"compose_form.spoiler": "Tekst achter waarschuwing verbergen", "compose_form.sensitive.unmarked": "Media is niet als gevoelig gemarkeerd",
"compose_form.spoiler.marked": "Tekst is achter een waarschuwing verborgen",
"compose_form.spoiler.unmarked": "Tekst is niet verborgen",
"compose_form.spoiler_placeholder": "Waarschuwingstekst", "compose_form.spoiler_placeholder": "Waarschuwingstekst",
"confirmation_modal.cancel": "Annuleren", "confirmation_modal.cancel": "Annuleren",
"confirmations.block.confirm": "Blokkeren", "confirmations.block.confirm": "Blokkeren",
@ -219,7 +221,7 @@
"report.target": "Rapporteer {target}", "report.target": "Rapporteer {target}",
"search.placeholder": "Zoeken", "search.placeholder": "Zoeken",
"search_popout.search_format": "Geavanceerd zoeken", "search_popout.search_format": "Geavanceerd zoeken",
"search_popout.tips.full_text": "Gebruik gewone tekst om te zoeken naar toots die jij hebt geschreven, als favoriet markeerde, hebt geboost of waarin jij bent vermeldt, en ook om te zoeken naar gebruikersnamen, weergavenamen en hashtags.", "search_popout.tips.full_text": "Gebruik gewone tekst om te zoeken naar jouw toots, gebooste toots, favorieten en naar toots waarin jij bent vermeldt, en naar gebruikersnamen, weergavenamen en hashtags.",
"search_popout.tips.hashtag": "hashtag", "search_popout.tips.hashtag": "hashtag",
"search_popout.tips.status": "toot", "search_popout.tips.status": "toot",
"search_popout.tips.text": "Gebruik gewone tekst om te zoeken op weergavenamen, gebruikersnamen en hashtags", "search_popout.tips.text": "Gebruik gewone tekst om te zoeken op weergavenamen, gebruikersnamen en hashtags",
@ -252,9 +254,9 @@
"status.sensitive_warning": "Gevoelige inhoud", "status.sensitive_warning": "Gevoelige inhoud",
"status.share": "Delen", "status.share": "Delen",
"status.show_less": "Minder tonen", "status.show_less": "Minder tonen",
"status.show_less_all": "Show less for all", "status.show_less_all": "Alles minder tonen",
"status.show_more": "Meer tonen", "status.show_more": "Meer tonen",
"status.show_more_all": "Show more for all", "status.show_more_all": "Alles meer tonen",
"status.unmute_conversation": "Conversatie niet meer negeren", "status.unmute_conversation": "Conversatie niet meer negeren",
"status.unpin": "Van profielpagina losmaken", "status.unpin": "Van profielpagina losmaken",
"tabs_bar.federated_timeline": "Globaal", "tabs_bar.federated_timeline": "Globaal",

6
app/javascript/mastodon/locales/no.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Hva har du på hjertet?", "compose_form.placeholder": "Hva har du på hjertet?",
"compose_form.publish": "Tut", "compose_form.publish": "Tut",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Merk media som følsomt", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Skjul tekst bak advarsel", "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": "Innholdsadvarsel", "compose_form.spoiler_placeholder": "Innholdsadvarsel",
"confirmation_modal.cancel": "Avbryt", "confirmation_modal.cancel": "Avbryt",
"confirmations.block.confirm": "Blokkèr", "confirmations.block.confirm": "Blokkèr",

6
app/javascript/mastodon/locales/oc.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "A de qué pensatz ?", "compose_form.placeholder": "A de qué pensatz ?",
"compose_form.publish": "Tut", "compose_form.publish": "Tut",
"compose_form.publish_loud": "{publish} !", "compose_form.publish_loud": "{publish} !",
"compose_form.sensitive": "Marcar lo mèdia coma sensible", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Rescondre lo tèxte darrièr un avertiment", "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": "Escrivètz l’avertiment aquí", "compose_form.spoiler_placeholder": "Escrivètz l’avertiment aquí",
"confirmation_modal.cancel": "Anullar", "confirmation_modal.cancel": "Anullar",
"confirmations.block.confirm": "Blocar", "confirmations.block.confirm": "Blocar",

6
app/javascript/mastodon/locales/pl.json
View File

@ -64,8 +64,10 @@
"compose_form.placeholder": "Co Ci chodzi po głowie?", "compose_form.placeholder": "Co Ci chodzi po głowie?",
"compose_form.publish": "Wyślij", "compose_form.publish": "Wyślij",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Oznacz treści jako wrażliwe", "compose_form.sensitive.marked": "Zawartość multimedia jest oznaczona jako wrażliwa",
"compose_form.spoiler": "Ukryj tekst za ostrzeżeniem", "compose_form.sensitive.unmarked": "Zawartość multimedialna nie jest oznaczona jako wrażliwa",
"compose_form.spoiler.marked": "Tekst jest ukryty za ostrzeżeniem",
"compose_form.spoiler.unmarked": "Tekst nie jest ukryty",
"compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości", "compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości",
"confirmation_modal.cancel": "Anuluj", "confirmation_modal.cancel": "Anuluj",
"confirmations.block.confirm": "Zablokuj", "confirmations.block.confirm": "Zablokuj",

10
app/javascript/mastodon/locales/pt-BR.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "No que você está pensando?", "compose_form.placeholder": "No que você está pensando?",
"compose_form.publish": "Publicar", "compose_form.publish": "Publicar",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Marcar mídia como conteúdo sensível", "compose_form.sensitive.marked": "Mídia está marcada como sensível",
"compose_form.spoiler": "Esconder texto com aviso de conteúdo", "compose_form.sensitive.unmarked": "Mídia não está marcada como sensível",
"compose_form.spoiler.marked": "O texto está escondido por um aviso de conteúdo",
"compose_form.spoiler.unmarked": "O texto não está escondido",
"compose_form.spoiler_placeholder": "Aviso de conteúdo", "compose_form.spoiler_placeholder": "Aviso de conteúdo",
"confirmation_modal.cancel": "Cancelar", "confirmation_modal.cancel": "Cancelar",
"confirmations.block.confirm": "Bloquear", "confirmations.block.confirm": "Bloquear",
@ -252,9 +254,9 @@
"status.sensitive_warning": "Conteúdo sensível", "status.sensitive_warning": "Conteúdo sensível",
"status.share": "Compartilhar", "status.share": "Compartilhar",
"status.show_less": "Mostrar menos", "status.show_less": "Mostrar menos",
"status.show_less_all": "Show less for all", "status.show_less_all": "Mostrar menos para todas as mensagens",
"status.show_more": "Mostrar mais", "status.show_more": "Mostrar mais",
"status.show_more_all": "Show more for all", "status.show_more_all": "Mostrar mais para todas as mensagens",
"status.unmute_conversation": "Desativar silêncio desta conversa", "status.unmute_conversation": "Desativar silêncio desta conversa",
"status.unpin": "Desafixar do perfil", "status.unpin": "Desafixar do perfil",
"tabs_bar.federated_timeline": "Global", "tabs_bar.federated_timeline": "Global",

6
app/javascript/mastodon/locales/pt.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Em que estás a pensar?", "compose_form.placeholder": "Em que estás a pensar?",
"compose_form.publish": "Publicar", "compose_form.publish": "Publicar",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Marcar media como conteúdo sensível", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Esconder texto com aviso", "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": "Aviso de conteúdo", "compose_form.spoiler_placeholder": "Aviso de conteúdo",
"confirmation_modal.cancel": "Cancelar", "confirmation_modal.cancel": "Cancelar",
"confirmations.block.confirm": "Block", "confirmations.block.confirm": "Block",

6
app/javascript/mastodon/locales/ru.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "О чем Вы думаете?", "compose_form.placeholder": "О чем Вы думаете?",
"compose_form.publish": "Трубить", "compose_form.publish": "Трубить",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Отметить как чувствительный контент", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Скрыть текст за предупреждением", "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": "Напишите свое предупреждение здесь", "compose_form.spoiler_placeholder": "Напишите свое предупреждение здесь",
"confirmation_modal.cancel": "Отмена", "confirmation_modal.cancel": "Отмена",
"confirmations.block.confirm": "Заблокировать", "confirmations.block.confirm": "Заблокировать",

6
app/javascript/mastodon/locales/sk.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Na čo myslíš?", "compose_form.placeholder": "Na čo myslíš?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Označ médiá ako chúlostivé", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Skryť text za varovanie", "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": "Sem napíšte vaše varovanie", "compose_form.spoiler_placeholder": "Sem napíšte vaše varovanie",
"confirmation_modal.cancel": "Zrušiť", "confirmation_modal.cancel": "Zrušiť",
"confirmations.block.confirm": "Blokovať", "confirmations.block.confirm": "Blokovať",

6
app/javascript/mastodon/locales/sr-Latn.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Šta Vam je na umu?", "compose_form.placeholder": "Šta Vam je na umu?",
"compose_form.publish": "Tutni", "compose_form.publish": "Tutni",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Obeleži multimediju kao osetljivu", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Sakrij tekst ispod upozorenja", "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": "Ovde upišite upozorenje", "compose_form.spoiler_placeholder": "Ovde upišite upozorenje",
"confirmation_modal.cancel": "Poništi", "confirmation_modal.cancel": "Poništi",
"confirmations.block.confirm": "Blokiraj", "confirmations.block.confirm": "Blokiraj",

6
app/javascript/mastodon/locales/sr.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Шта Вам је на уму?", "compose_form.placeholder": "Шта Вам је на уму?",
"compose_form.publish": "Тутни", "compose_form.publish": "Тутни",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Обележи мултимедију као осетљиву", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Сакриј текст испод упозорења", "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": "Овде упишите упозорење", "compose_form.spoiler_placeholder": "Овде упишите упозорење",
"confirmation_modal.cancel": "Поништи", "confirmation_modal.cancel": "Поништи",
"confirmations.block.confirm": "Блокирај", "confirmations.block.confirm": "Блокирај",

6
app/javascript/mastodon/locales/sv.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Vad funderar du på?", "compose_form.placeholder": "Vad funderar du på?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Markera media som känslig", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Dölj text bakom varning", "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": "Skriv din varning här", "compose_form.spoiler_placeholder": "Skriv din varning här",
"confirmation_modal.cancel": "Ångra", "confirmation_modal.cancel": "Ångra",
"confirmations.block.confirm": "Blockera", "confirmations.block.confirm": "Blockera",

6
app/javascript/mastodon/locales/th.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "What is on your mind?", "compose_form.placeholder": "What is on your mind?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Mark media as sensitive", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Hide text behind warning", "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": "Content warning", "compose_form.spoiler_placeholder": "Content warning",
"confirmation_modal.cancel": "Cancel", "confirmation_modal.cancel": "Cancel",
"confirmations.block.confirm": "Block", "confirmations.block.confirm": "Block",

6
app/javascript/mastodon/locales/tr.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Ne düşünüyorsun?", "compose_form.placeholder": "Ne düşünüyorsun?",
"compose_form.publish": "Toot", "compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Görseli hassas olarak işaretle", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Metni uyarı arkasına gizle", "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": "İçerik uyarısı", "compose_form.spoiler_placeholder": "İçerik uyarısı",
"confirmation_modal.cancel": "İptal", "confirmation_modal.cancel": "İptal",
"confirmations.block.confirm": "Engelle", "confirmations.block.confirm": "Engelle",

6
app/javascript/mastodon/locales/uk.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "Що у Вас на думці?", "compose_form.placeholder": "Що у Вас на думці?",
"compose_form.publish": "Дмухнути", "compose_form.publish": "Дмухнути",
"compose_form.publish_loud": "{publish}!", "compose_form.publish_loud": "{publish}!",
"compose_form.sensitive": "Відмітити як непристойний зміст", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "Приховати текст за попередженням", "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": "Попередження щодо прихованого тексту", "compose_form.spoiler_placeholder": "Попередження щодо прихованого тексту",
"confirmation_modal.cancel": "Відмінити", "confirmation_modal.cancel": "Відмінити",
"confirmations.block.confirm": "Заблокувати", "confirmations.block.confirm": "Заблокувати",

6
app/javascript/mastodon/locales/zh-CN.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "在想啥？", "compose_form.placeholder": "在想啥？",
"compose_form.publish": "嘟嘟", "compose_form.publish": "嘟嘟",
"compose_form.publish_loud": "{publish}！", "compose_form.publish_loud": "{publish}！",
"compose_form.sensitive": "将媒体文件标记为敏感内容", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "折叠嘟文内容", "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": "折叠部分的警告消息", "compose_form.spoiler_placeholder": "折叠部分的警告消息",
"confirmation_modal.cancel": "取消", "confirmation_modal.cancel": "取消",
"confirmations.block.confirm": "屏蔽", "confirmations.block.confirm": "屏蔽",

6
app/javascript/mastodon/locales/zh-HK.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "你在想甚麼？", "compose_form.placeholder": "你在想甚麼？",
"compose_form.publish": "發文", "compose_form.publish": "發文",
"compose_form.publish_loud": "{publish}！", "compose_form.publish_loud": "{publish}！",
"compose_form.sensitive": "將媒體檔案標示為「敏感內容」", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "將部份文字藏於警告訊息之後", "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": "敏感警告訊息", "compose_form.spoiler_placeholder": "敏感警告訊息",
"confirmation_modal.cancel": "取消", "confirmation_modal.cancel": "取消",
"confirmations.block.confirm": "封鎖", "confirmations.block.confirm": "封鎖",

6
app/javascript/mastodon/locales/zh-TW.json
View File

@ -60,8 +60,10 @@
"compose_form.placeholder": "在想些什麼？", "compose_form.placeholder": "在想些什麼？",
"compose_form.publish": "貼掉", "compose_form.publish": "貼掉",
"compose_form.publish_loud": "{publish}！", "compose_form.publish_loud": "{publish}！",
"compose_form.sensitive": "將此媒體標為敏感", "compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.spoiler": "將訊息隱藏在警告訊息之後", "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": "內容警告", "compose_form.spoiler_placeholder": "內容警告",
"confirmation_modal.cancel": "取消", "confirmation_modal.cancel": "取消",
"confirmations.block.confirm": "封鎖", "confirmations.block.confirm": "封鎖",

4
app/javascript/mastodon/reducers/statuses.js
View File

@ -56,6 +56,9 @@ const normalizeStatus = (state, status) => {
normalStatus.reblog = status.reblog.id; normalStatus.reblog = status.reblog.id;
} }
// Only calculate these values when status first encountered
// Otherwise keep the ones already in the reducer
if (!state.has(status.id)) {
const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n'); const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
const emojiMap = normalStatus.emojis.reduce((obj, emoji) => { const emojiMap = normalStatus.emojis.reduce((obj, emoji) => {
@ -67,6 +70,7 @@ const normalizeStatus = (state, status) => {
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap); normalStatus.contentHtml = emojify(normalStatus.content, emojiMap);
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap); normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap);
normalStatus.hidden = normalStatus.sensitive; normalStatus.hidden = normalStatus.sensitive;
}
return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus))); return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus)));
}; };

16
app/javascript/styles/mastodon/rtl.scss
View File

@ -1,6 +1,22 @@
body.rtl { body.rtl {
direction: rtl; direction: rtl;
.column-header > button {
text-align: right;
padding-left: 0;
padding-right: 15px;
}
.landing-page__logo {
margin-right: 0;
margin-left: 20px;
}
.landing-page .features-list .features-list__row .visual {
margin-left: 0;
margin-right: 15px;
}
.column-link__icon, .column-link__icon,
.column-header__icon { .column-header__icon {
margin-right: 0; margin-right: 0;

2
app/views/about/show.html.haml
View File

@ -49,7 +49,7 @@
%p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
.landing-page__call-to-action .landing-page__call-to-action{ dir: 'ltr' }
.row .row
.row__information-board .row__information-board
.information-board__section .information-board__section

11
app/workers/backup_worker.rb
View File

@ -3,7 +3,16 @@
class BackupWorker class BackupWorker
include Sidekiq::Worker include Sidekiq::Worker
sidekiq_options queue: 'pull' sidekiq_options queue: 'pull', backtrace: true, retry: 5, dead: false
sidekiq_retries_exhausted do |msg|
backup_id = msg['args'].first
ActiveRecord::Base.connection_pool.with_connection do
backup = Backup.find(backup_id)
backup&.destroy
end
end
def perform(backup_id) def perform(backup_id)
backup = Backup.find(backup_id) backup = Backup.find(backup_id)

2
boxfile.yml
View File

@ -193,7 +193,7 @@ data.db:
- id: backup - id: backup
schedule: '0 3 * * *' schedule: '0 3 * * *'
command: | command: |
PGPASSWORD=${DATA_POSTGRES_PASS} pg_dump -U ${DATA_POSTGRES_USER} -w -Fc -O gonano | PGPASSWORD=${DATA_DB_PASS} pg_dump -U ${DATA_DB_USER} -w -Fc -O gonano |
gzip | gzip |
curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).sql.gz --data-binary @- && curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).sql.gz --data-binary @- &&
curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ | curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |

16
config/locales/ar.yml
View File

@ -1,6 +1,7 @@
--- ---
ar: ar:
about: about:
about_hashtag_html: هذه هي الرسائل العامة مع الكلمات الدلالية <strong> 1#%{hashtag}</strong>. يمكنك التفاعل معهم إذا كان لديك حساب في أي مكان على الإنترنت المتحد.
about_mastodon_html: ماستدون شبكة إجتماعية <em>حرة و مفتوحة المصدر</em>. هو بديل <em>لامركزي</em> لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في <em>الشبكات الاجتماعية</em> بكل شفافية. about_mastodon_html: ماستدون شبكة إجتماعية <em>حرة و مفتوحة المصدر</em>. هو بديل <em>لامركزي</em> لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في <em>الشبكات الاجتماعية</em> بكل شفافية.
about_this: عن مثيل الخادوم هذا about_this: عن مثيل الخادوم هذا
closed_registrations: التسجيلات في مثيل الخادوم هذا مُغلقة حاليًا. closed_registrations: التسجيلات في مثيل الخادوم هذا مُغلقة حاليًا.
@ -10,6 +11,9 @@ ar:
description_headline: ما هو %{domain}? description_headline: ما هو %{domain}?
domain_count_after: خوادم أخرى domain_count_after: خوادم أخرى
domain_count_before: متصل بـ domain_count_before: متصل بـ
extended_description_html: |
<h3>مكان جيد للقواعد</h3>
<p>لا يوجد تفصيل طويل حتى الآن.</p>
features: features:
humane_approach_body: تعلُّمًا مِن فشل الشبكات الأخرى، غاية ماستدون هي بلوغ الخيارات الأخلاقية في التصميم لمُحارَبة إسائة إستعمال شبكات التواصل الإجتماعية. humane_approach_body: تعلُّمًا مِن فشل الشبكات الأخرى، غاية ماستدون هي بلوغ الخيارات الأخلاقية في التصميم لمُحارَبة إسائة إستعمال شبكات التواصل الإجتماعية.
humane_approach_title: أسلوب يعيد الإعتبار للإنسان humane_approach_title: أسلوب يعيد الإعتبار للإنسان
@ -73,13 +77,16 @@ ar:
followers: المتابِعون followers: المتابِعون
followers_url: عنوان رابط المتابِعين followers_url: عنوان رابط المتابِعين
follows: يتابع follows: يتابع
inbox_url: رابط صندوق الوارد
ip: عنوان الإيبي ip: عنوان الإيبي
location: location:
all: الكل all: الكل
local: المحلي local: المحلي
remote: عن بُعد remote: عن بُعد
title: الموقع title: الموقع
login_status: وضع الدخول
media_attachments: الوسائط المرفقة media_attachments: الوسائط المرفقة
memorialize: تحول إلى صفحة للذاكرة
moderation: moderation:
all: الكل all: الكل
silenced: تم كتمه silenced: تم كتمه
@ -88,17 +95,22 @@ ar:
moderation_notes: ملاحظات الإشراف moderation_notes: ملاحظات الإشراف
most_recent_activity: آخر نشاط حديث most_recent_activity: آخر نشاط حديث
most_recent_ip: أحدث عنوان إيبي most_recent_ip: أحدث عنوان إيبي
not_subscribed: غير مشترك
order: order:
alphabetic: أبجديًا alphabetic: أبجديًا
most_recent: الأحدث most_recent: الأحدث
title: الترتيب title: الترتيب
outbox_url: رابط صندوق الصادر
perform_full_suspension: تعطيل الحساب بالكامل
profile_url: رابط الملف الشخصي profile_url: رابط الملف الشخصي
promote: ترقية promote: ترقية
protocol: البروتوكول protocol: البروتوكول
public: عمومي public: عمومي
push_subscription_expires: انتهاء الاشتراك ”PuSH“
redownload: تحديث الصورة الرمزية redownload: تحديث الصورة الرمزية
reset: إعادة التعيين reset: إعادة التعيين
reset_password: إعادة ضبط كلمة السر reset_password: إعادة ضبط كلمة السر
resubscribe: اشترك مرة أخرى
role: التصريحات role: التصريحات
roles: roles:
admin: مدير admin: مدير
@ -111,9 +123,13 @@ ar:
created_reports: البلاغات التي أنشأها هذا الحساب created_reports: البلاغات التي أنشأها هذا الحساب
report: التقرير report: التقرير
targeted_reports: التقريرات التي أُنشِأت ضد هذا الحساب targeted_reports: التقريرات التي أُنشِأت ضد هذا الحساب
silence: سكتهم
statuses: المنشورات statuses: المنشورات
subscribe: اشترك
title: الحسابات title: الحسابات
undo_silenced: رفع الصمت
undo_suspension: إلغاء تعليق الحساب undo_suspension: إلغاء تعليق الحساب
unsubscribe: إلغاء الاشتراك
username: إسم المستخدم username: إسم المستخدم
web: الويب web: الويب
action_logs: action_logs:

2
config/locales/devise.ar.yml
View File

@ -2,7 +2,7 @@
ar: ar:
devise: devise:
confirmations: confirmations:
confirmed: تم التحقق من عنوان بريدك الإلكتروني بنجاح. confirmed: تم تأكيد عنوان بريدك الإلكتروني.
send_instructions: سوف تتلقى بعد بضع دقائق رسالةً إلكترونيةً تضم تعليمات التأكيد. إن لم تتلق الرسالة، الرجاء التحقق من إنها ليست ضمن ملف الرسائل غير المرغوب فيها. send_instructions: سوف تتلقى بعد بضع دقائق رسالةً إلكترونيةً تضم تعليمات التأكيد. إن لم تتلق الرسالة، الرجاء التحقق من إنها ليست ضمن ملف الرسائل غير المرغوب فيها.
send_paranoid_instructions: إن كان عنوان بريدك الإلكتروني موجودا في قاعدة بياناتنا سوف تتلقّى الإرشادات اللازمة لتأكيده خلال بضع دقائق. يُرجى الإطلاع على الرسائل المتلقاة في البريد غير المرغوب فيه أيضا للتحقق من تلقي الرسالة. send_paranoid_instructions: إن كان عنوان بريدك الإلكتروني موجودا في قاعدة بياناتنا سوف تتلقّى الإرشادات اللازمة لتأكيده خلال بضع دقائق. يُرجى الإطلاع على الرسائل المتلقاة في البريد غير المرغوب فيه أيضا للتحقق من تلقي الرسالة.
failure: failure:

18
config/locales/doorkeeper.id.yml
View File

@ -3,17 +3,19 @@ id:
activerecord: activerecord:
attributes: attributes:
doorkeeper/application: doorkeeper/application:
name: Nama name: Nama aplikasi
redirect_uri: URI Pengalihan (Redirect) redirect_uri: URI Pengalihan
scopes: Cakupan
website: Website aplikasi
errors: errors:
models: models:
doorkeeper/application: doorkeeper/application:
attributes: attributes:
redirect_uri: redirect_uri:
fragment_present: tidak dapat mengandung fragmen. fragment_present: tidak dapat mengandung sebuah pecahan.
invalid_uri: URI harus valid. invalid_uri: harus URI yang valid.
relative_uri: URI harus absolut. relative_uri: harus URI yang absolut.
secured_uri: URI harus berupa HTTPS/SSL. secured_uri: harus berupa URI HTTPS/SSL.
doorkeeper: doorkeeper:
applications: applications:
buttons: buttons:
@ -23,11 +25,11 @@ id:
edit: Ubah edit: Ubah
submit: Kirim submit: Kirim
confirmations: confirmations:
destroy: Anda yakin? destroy: Apakah anda yakin?
edit: edit:
title: Ubah aplikasi title: Ubah aplikasi
form: form:
error: Oh tidak! Cek kembali kemungkinan kesalahan pada formulir anda error: Oops! Cek kembali kemungkinan kesalahan pada formulir anda
help: help:
native_redirect_uri: Gunakan %{native_redirect_uri} sebagai tes lokal native_redirect_uri: Gunakan %{native_redirect_uri} sebagai tes lokal
redirect_uri: Gunakan satu baris per URI redirect_uri: Gunakan satu baris per URI

35
config/locales/es.yml
View File

@ -273,6 +273,8 @@ es:
contact_information: contact_information:
email: Correo de trabajo email: Correo de trabajo
username: Nombre de usuario username: Nombre de usuario
hero:
desc_html: Mostrado en la página principal. Recomendable al menos 600x100px. Por defecto se establece a la miniatura de la instancia
peers_api_enabled: peers_api_enabled:
desc_html: Nombres de dominio que esta instancia ha encontrado en el fediverso desc_html: Nombres de dominio que esta instancia ha encontrado en el fediverso
title: Publicar lista de instancias descubiertas title: Publicar lista de instancias descubiertas
@ -289,6 +291,9 @@ es:
open: open:
desc_html: Permite a cualquiera a registrar una cuenta desc_html: Permite a cualquiera a registrar una cuenta
title: Registro abierto title: Registro abierto
show_known_fediverse_at_about_page:
desc_html: Cuando esté activado, se mostrarán toots de todo el fediverso conocido en la vista previa. En otro caso, se mostrarán solamente toots locales.
title: Mostrar fediverso conocido en la vista previa de la historia
show_staff_badge: show_staff_badge:
desc_html: Mostrar un parche de staff en la página de un usuario desc_html: Mostrar un parche de staff en la página de un usuario
title: Mostrar parche de staff title: Mostrar parche de staff
@ -353,6 +358,8 @@ es:
your_token: Tu token de acceso your_token: Tu token de acceso
auth: auth:
agreement_html: Al registrarte, acepta seguir <a href="%{rules_path}">las reglas de la instancia</a> y <a href="%{terms_path}">nuestros términos de servicio</a>. agreement_html: Al registrarte, acepta seguir <a href="%{rules_path}">las reglas de la instancia</a> y <a href="%{terms_path}">nuestros términos de servicio</a>.
change_password: Contraseña
confirm_email: Confirmar email
delete_account: Borrar cuenta delete_account: Borrar cuenta
delete_account_html: Si desea eliminar su cuenta, puede <a href="%{path}">proceder aquí</a>. Será pedido de una confirmación. delete_account_html: Si desea eliminar su cuenta, puede <a href="%{path}">proceder aquí</a>. Será pedido de una confirmación.
didnt_get_confirmation: "¿No recibió el correo de confirmación?" didnt_get_confirmation: "¿No recibió el correo de confirmación?"
@ -362,7 +369,13 @@ es:
logout: Cerrar sesión logout: Cerrar sesión
migrate_account: Mudarse a otra cuenta migrate_account: Mudarse a otra cuenta
migrate_account_html: Si deseas redireccionar esta cuenta a otra distinta, puedes <a href="%{path}">configurarlo aquí</a>. migrate_account_html: Si deseas redireccionar esta cuenta a otra distinta, puedes <a href="%{path}">configurarlo aquí</a>.
or: o
or_log_in_with: O inicia sesión con
providers:
cas: CAS
saml: SAML
register: Registrarse register: Registrarse
register_elsewhere: Registrarse en otro servidor
resend_confirmation: Volver a enviar el correo de confirmación resend_confirmation: Volver a enviar el correo de confirmación
reset_password: Restablecer contraseña reset_password: Restablecer contraseña
security: Cambiar contraseña security: Cambiar contraseña
@ -412,6 +425,13 @@ es:
title: Esta página no es correcta title: Esta página no es correcta
noscript_html: Para usar la aplicación web de Mastodon, por favor activa Javascript. Alternativamente, prueba alguna de las <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">aplicaciones nativas</a> para Mastodon para tu plataforma. noscript_html: Para usar la aplicación web de Mastodon, por favor activa Javascript. Alternativamente, prueba alguna de las <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">aplicaciones nativas</a> para Mastodon para tu plataforma.
exports: exports:
archive_takeout:
date: Fecha
download: Descargar tu archivo
hint_html: Puedes solicitar un archivo de tus <strong>toots y materiales subidos</strong>. Los datos exportados estarán en formato ActivityPub, legibles por cualquier software compatible.
in_progress: Recopilando tu archivo...
request: Solicitar tu archivo
size: Tamaño
blocks: Personas que has bloqueado blocks: Personas que has bloqueado
csv: CSV csv: CSV
follows: Personas que sigues follows: Personas que sigues
@ -527,7 +547,9 @@ es:
trillion: T trillion: T
unit: '' unit: ''
pagination: pagination:
newer: Más nuevo
next: Próximo next: Próximo
older: Más antiguo
prev: Anterior prev: Anterior
truncate: "&hellip;" truncate: "&hellip;"
preferences: preferences:
@ -722,23 +744,30 @@ es:
setup: Configurar setup: Configurar
wrong_code: "¡El código ingresado es inválido! ¿El dispositivo y tiempo del servidor están correctos?" wrong_code: "¡El código ingresado es inválido! ¿El dispositivo y tiempo del servidor están correctos?"
user_mailer: user_mailer:
backup_ready:
explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
subject: Tu archivo está preparado para descargar
title: Recogida del archivo
welcome: welcome:
edit_profile_action: Configurar el perfil edit_profile_action: Configurar el perfil
explanation: Aquí hay algunos consejos para iniciar edit_profile_step: Puedes personalizar tu perfil subiendo un avatar, cabecera, cambiando tu nombre para mostrar y más. Si te gustaría revisar seguidores antes de autorizarlos a que te sigan, puedes bloquear tu cuenta.
explanation: Aquí hay algunos consejos para empezar
final_action: Empezar a publicar final_action: Empezar a publicar
final_step: '¡Empieza a publicar! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea de tiempo local y con "hashtags". Podrías querer introducirte con el "hashtag" #introductions.' final_step: '¡Empieza a publicar! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea de tiempo local y con "hashtags". Podrías querer introducirte con el "hashtag" #introductions.'
full_handle: Su sobrenombre completo full_handle: Su sobrenombre completo
full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia. full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia.
review_preferences_action: Cambiar preferencias review_preferences_action: Cambiar preferencias
review_preferences_step: Asegurate de poner tus preferencias, como que correos te gustaría recibir, o que nivel de privacidad te gustaría que tus publicaciones tengan por defecto. Si no tienes mareos, podrías elegir habilitar la reproducción automática de "GIFs". review_preferences_step: Asegúrate de poner tus preferencias, como que correos te gustaría recibir, o que nivel de privacidad te gustaría que tus publicaciones tengan por defecto. Si no tienes mareos, podrías elegir habilitar la reproducción automática de "GIFs".
subject: Bienvenido a Mastodon subject: Bienvenido a Mastodon
tip_bridge_html: Si esta viniendo desde Twitter, puedes encontrar a tus amigos en Mastodon usando la <a href="%{bridge_url}">aplicación puente</a>. Aunque solo funciona si ellos también usaron la aplicación puente! tip_bridge_html: Si esta viniendo desde Twitter, puedes encontrar a tus amigos en Mastodon usando la <a href="%{bridge_url}">aplicación puente</a>. Aunque solo funciona si ellos también usaron la aplicación puente!
tip_federated_timeline: La historia federada es una vista de toda la red Mastodon conocida. Sólo incluye gente a la que se han suscrito personas de tu instancia, así que no está completa.
tip_following: Sigues a tus administradores de servidor por defecto. Para encontrar más gente interesante, revisa las lineas de tiempo local y federada. tip_following: Sigues a tus administradores de servidor por defecto. Para encontrar más gente interesante, revisa las lineas de tiempo local y federada.
tip_local_timeline: La linea de tiempo local is una vista de la gente en %{instance}. Estos son tus vecinos inmediatos! tip_local_timeline: La linea de tiempo local is una vista de la gente en %{instance}. Estos son tus vecinos inmediatos!
tip_mobile_webapp: Si el navegador de tu dispositivo móvil ofrece agregar Mastodon a tu página de inicio, puedes recibir notificaciones. Actúa como una aplicación nativa en muchas formas! tip_mobile_webapp: Si el navegador de tu dispositivo móvil ofrece agregar Mastodon a tu página de inicio, puedes recibir notificaciones. Actúa como una aplicación nativa en muchas formas!
tips: Tips tips: Tips
title: Bienvenido a bordo, %{name}! title: Te damos la bienvenida a bordo, %{name}!
users: users:
invalid_email: La dirección de correo es incorrecta invalid_email: La dirección de correo es incorrecta
invalid_otp_token: Código de dos factores incorrecto invalid_otp_token: Código de dos factores incorrecto
seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
signed_in_as: 'Sesión iniciada como:' signed_in_as: 'Sesión iniciada como:'

41
config/locales/ru.yml
View File

@ -160,6 +160,7 @@ ru:
update_status: "%{name} изменил(а) статус пользователя %{target}" update_status: "%{name} изменил(а) статус пользователя %{target}"
title: Журнал событий title: Журнал событий
custom_emojis: custom_emojis:
by_domain: Домен
copied_msg: Локальная копия эмодзи успешно создана copied_msg: Локальная копия эмодзи успешно создана
copy: Скопироват copy: Скопироват
copy_failed_msg: Не удалось создать локальную копию эмодзи copy_failed_msg: Не удалось создать локальную копию эмодзи
@ -342,6 +343,7 @@ ru:
salutation: "%{name}," salutation: "%{name},"
settings: 'Изменить настройки e-mail: %{link}' settings: 'Изменить настройки e-mail: %{link}'
view: 'Просмотр:' view: 'Просмотр:'
view_profile: Просмотреть профиль
view_status: Просмотреть статус view_status: Просмотреть статус
applications: applications:
created: Приложение успешно создано created: Приложение успешно создано
@ -353,6 +355,8 @@ ru:
your_token: Ваш токен доступа your_token: Ваш токен доступа
auth: auth:
agreement_html: Создавая аккаунт, вы соглашаетесь с <a href="%{rules_path}">правилами узла</a> и <a href="%{terms_path}">нашими условиями обслуживания</a>. agreement_html: Создавая аккаунт, вы соглашаетесь с <a href="%{rules_path}">правилами узла</a> и <a href="%{terms_path}">нашими условиями обслуживания</a>.
change_password: Пароль
confirm_email: Подтвердите email
delete_account: Удалить аккаунт delete_account: Удалить аккаунт
delete_account_html: Если Вы хотите удалить свой аккаунт, вы можете <a href="%{path}">перейти сюда</a>. У Вас будет запрошено подтверждение. delete_account_html: Если Вы хотите удалить свой аккаунт, вы можете <a href="%{path}">перейти сюда</a>. У Вас будет запрошено подтверждение.
didnt_get_confirmation: Не получили инструкцию для подтверждения? didnt_get_confirmation: Не получили инструкцию для подтверждения?
@ -362,7 +366,10 @@ ru:
logout: Выйти logout: Выйти
migrate_account: Перенести аккаунт migrate_account: Перенести аккаунт
migrate_account_html: Если Вы хотите перенести этот аккаунт на другой, вы можете <a href="%{path}">сделать это здесь</a>. migrate_account_html: Если Вы хотите перенести этот аккаунт на другой, вы можете <a href="%{path}">сделать это здесь</a>.
or: или
or_log_in_with: Или войти с помощью
register: Зарегистрироваться register: Зарегистрироваться
register_elsewhere: Зарегистрироваться на другом сервере
resend_confirmation: Повторить отправку инструкции для подтверждения resend_confirmation: Повторить отправку инструкции для подтверждения
reset_password: Сбросить пароль reset_password: Сбросить пароль
security: Изменить пароль security: Изменить пароль
@ -412,6 +419,13 @@ ru:
title: Страница неверна title: Страница неверна
noscript_html: Для работы с Mastodon, пожалуйста, включите JavaScript. Кроме того, вы можете использовать одно из <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">приложений</a> Mastodon для Вашей платформы. noscript_html: Для работы с Mastodon, пожалуйста, включите JavaScript. Кроме того, вы можете использовать одно из <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">приложений</a> Mastodon для Вашей платформы.
exports: exports:
archive_takeout:
date: Дата
download: Скачать ваш архив
hint_html: Вы можете запросить архив своих <strong>статусов и загруженных медиа-файлов</strong>. Экспортированные данные будут в формате ActivityPub, который можно прочесть любой соответствующей программой.
in_progress: Собирается ваш архив...
request: Запросить ваш архив
size: Размер
blocks: Список блокировки blocks: Список блокировки
csv: CSV csv: CSV
follows: Подписки follows: Подписки
@ -483,33 +497,40 @@ ru:
title: Модерация title: Модерация
notification_mailer: notification_mailer:
digest: digest:
body: 'Кратко о пропущенном Вами на %{instance} с Вашего последнего захода %{since}:' action: Просмотреть все уведомления
body: Кратко о пропущенных Вами сообщениях с Вашего последнего захода %{since}
mention: "%{name} упомянул(а) Вас в:" mention: "%{name} упомянул(а) Вас в:"
new_followers_summary: new_followers_summary:
few: У Вас появилось %{count} новых подписчика! Отлично! few: У Вас появилось %{count} новых подписчика! Отлично!
many: У Вас появилось %{count} новых подписчиков! Отлично! many: У Вас появилось %{count} новых подписчиков! Отлично!
one: У Вас появился новый подписчик! Ура! one: Также, пока вас не было, у Вас появился новый подписчик! Ура!
other: У Вас появилось %{count} новых подписчиков! Отлично! other: Также, пока вас не было, у Вас появилось %{count} новых подписчиков! Отлично!
subject: subject:
few: "%{count} новых уведомления с Вашего последнего захода \U0001F418" few: "%{count} новых уведомления с Вашего последнего захода \U0001F418"
many: "%{count} новых уведомлений с Вашего последнего захода \U0001F418" many: "%{count} новых уведомлений с Вашего последнего захода \U0001F418"
one: "1 новое уведомление с Вашего последнего захода \U0001F418" one: "1 новое уведомление с Вашего последнего захода \U0001F418"
other: "%{count} новых уведомлений с Вашего последнего захода \U0001F418" other: "%{count} новых уведомлений с Вашего последнего захода \U0001F418"
title: В ваше отсутствие…
favourite: favourite:
body: 'Ваш статус понравился %{name}:' body: 'Ваш статус понравился %{name}:'
subject: "%{name} понравился Ваш статус" subject: "%{name} понравился Ваш статус"
follow: follow:
body: "%{name} теперь подписан(а) на Вас!" body: "%{name} теперь подписан(а) на Вас!"
subject: "%{name} теперь подписан(а) на Вас" subject: "%{name} теперь подписан(а) на Вас"
title: Новый подписчик
follow_request: follow_request:
body: "%{name} запросил Вас о подписке" body: "%{name} запросил Вас о подписке"
subject: "%{name} хочет подписаться на Вас" subject: "%{name} хочет подписаться на Вас"
title: Новый запрос о подписке
mention: mention:
action: Ответить
body: 'Вас упомянул(а) %{name} в:' body: 'Вас упомянул(а) %{name} в:'
subject: Вы были упомянуты %{name} subject: Вы были упомянуты %{name}
title: Новое упоминание
reblog: reblog:
body: 'Ваш статус был продвинут %{name}:' body: 'Ваш статус был продвинут %{name}:'
subject: "%{name} продвинул(а) Ваш статус" subject: "%{name} продвинул(а) Ваш статус"
title: Новое продвижение
number: number:
human: human:
decimal_units: decimal_units:
@ -522,7 +543,9 @@ ru:
trillion: трлн trillion: трлн
unit: '' unit: ''
pagination: pagination:
newer: Новее
next: След next: След
older: Старше
prev: Пред prev: Пред
truncate: "&hellip;" truncate: "&hellip;"
preferences: preferences:
@ -687,6 +710,18 @@ ru:
recovery_instructions_html: В случае утери доступа к Вашему телефону Вы можете использовать один из кодов восстановления, указанных ниже, чтобы вернуть доступ к аккаунту. Держите коды восстановления в безопасности, например, распечатав их и храня с другими важными документами. recovery_instructions_html: В случае утери доступа к Вашему телефону Вы можете использовать один из кодов восстановления, указанных ниже, чтобы вернуть доступ к аккаунту. Держите коды восстановления в безопасности, например, распечатав их и храня с другими важными документами.
setup: Настроить setup: Настроить
wrong_code: Введенный код неверен! Правильно ли установлены серверное время и время устройства? wrong_code: Введенный код неверен! Правильно ли установлены серверное время и время устройства?
user_mailer:
backup_ready:
explanation: Вы запросили полный архив вашего аккаунта Mastodon. Он готов к загрузке!
subject: Ваш архив готов к загрузке
title: Вынос архива
welcome:
edit_profile_action: Настроить профиль
final_action: Начать постить
review_preferences_action: Изменить настройки
subject: Добро пожаловать на Mastodon
tips: Советы
title: Добро пожаловать на борт, %{name}!
users: users:
invalid_email: Введенный e-mail неверен invalid_email: Введенный e-mail неверен
invalid_otp_token: Введен неверный код invalid_otp_token: Введен неверный код

10
config/locales/simple_form.es.yml
View File

@ -4,21 +4,21 @@ es:
hints: hints:
defaults: defaults:
avatar: PNG, GIF o JPG. Máximo 2MB. Será escalado a 400x400px avatar: PNG, GIF o JPG. Máximo 2MB. Será escalado a 400x400px
digest: Solo enviado tras un largo periodo de inactividad y solo si usted ha recibido mensajes personales durante su ausencia digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
display_name: display_name:
one: <span class="name-counter">1</span> caracter restante one: <span class="name-counter">1</span> caracter restante
other: <span class="name-counter">%{count}</span> caracteres restantes other: <span class="name-counter">%{count}</span> caracteres restantes
header: PNG, GIF o JPG. Máximo 2MB. Será escalado a 700x335px header: PNG, GIF o JPG. Máximo 2MB. Será escalado a 700x335px
locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores
note: note:
one: <span class="name-counter">1</span> caracter restante one: <span class="name-counter">1</span> carácter restante
other: <span class="name-counter">%{count}</span> caracteres restantes other: <span class="name-counter">%{count}</span> caracteres restantes
setting_noindex: Afecta a tu perfil público y páginas de estado setting_noindex: Afecta a tu perfil público y páginas de estado
setting_theme: Afecta al aspecto de Mastodon cuando te identificas desde cualquier dispositivo. setting_theme: Afecta al aspecto de Mastodon cuando te identificas desde cualquier dispositivo.
imports: imports:
data: Archivo CSV exportado desde otra instancia de Mastodon data: Archivo CSV exportado desde otra instancia de Mastodon
sessions: sessions:
otp: Ingresa el código de autenticación de dos factores de tu teléfono o usa uno de tus códigos de recuperación. otp: Introduce el código de autenticación de dos factores de tu teléfono o usa uno de tus códigos de recuperación.
user: user:
filtered_languages: Los idiomas seleccionados dejarán de mostrarse para ti en las líneas de tiempo públicas filtered_languages: Los idiomas seleccionados dejarán de mostrarse para ti en las líneas de tiempo públicas
labels: labels:
@ -28,7 +28,7 @@ es:
confirm_password: Confirmar contraseña confirm_password: Confirmar contraseña
current_password: Contraseña actual current_password: Contraseña actual
data: Información data: Información
display_name: Mostrar nombre display_name: Nombre para mostrar
email: Dirección de correo electrónico email: Dirección de correo electrónico
expires_in: Expirar tras expires_in: Expirar tras
filtered_languages: Idiomas filtrados filtered_languages: Idiomas filtrados
@ -45,6 +45,7 @@ es:
setting_default_privacy: Privacidad de publicaciones setting_default_privacy: Privacidad de publicaciones
setting_default_sensitive: Marcar siempre imágenes como sensibles setting_default_sensitive: Marcar siempre imágenes como sensibles
setting_delete_modal: Mostrar diálogo de confirmación antes de borrar un toot setting_delete_modal: Mostrar diálogo de confirmación antes de borrar un toot
setting_display_sensitive_media: Mostrar siempre material marcado como sensible
setting_noindex: Excluirse del indexado de motores de búsqueda setting_noindex: Excluirse del indexado de motores de búsqueda
setting_reduce_motion: Reducir el movimiento de las animaciones setting_reduce_motion: Reducir el movimiento de las animaciones
setting_system_font_ui: Utilizar la tipografía por defecto del sistema setting_system_font_ui: Utilizar la tipografía por defecto del sistema
@ -53,6 +54,7 @@ es:
severity: Severidad severity: Severidad
type: Importar tipo type: Importar tipo
username: Nombre de usuario username: Nombre de usuario
username_or_email: Usuario o Email
interactions: interactions:
must_be_follower: Bloquear notificaciones de personas que no te siguen must_be_follower: Bloquear notificaciones de personas que no te siguen
must_be_following: Bloquear notificaciones de personas que no sigues must_be_following: Bloquear notificaciones de personas que no sigues

2
lib/mastodon/version.rb
View File

@ -21,7 +21,7 @@ module Mastodon
end end
def flags def flags
'rc2' ''
end end
def to_a def to_a