marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream 

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
staging
Thibaut Girka 2018-08-27 17:30:42 +02:00
parent af934b9071 81697997a3
commit 53b7bb9d04
83 changed files with 900 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.rubocop.yml
View File

@ -62,6 +62,9 @@ Metrics/ParameterLists:
Metrics/PerceivedComplexity:
Max: 20
Naming/MemoizedInstanceVariableName:
Enabled: false
Rails:
Enabled: true
@ -71,6 +74,9 @@ Rails/HasAndBelongsToMany:
Rails/SkipsModelValidations:
Enabled: false
Rails/HttpStatus:
Enabled: false
Style/ClassAndModuleChildren:
Enabled: false

1
Gemfile
View File

@ -7,6 +7,7 @@ gem 'pkg-config', '~> 1.3'
gem 'puma', '~> 3.11'
gem 'rails', '~> 5.2.1'
gem 'thor', '~> 0.20'
gem 'hamlit-rails', '~> 0.2'
gem 'pg', '~> 1.0'

1
Gemfile.lock
View File

@ -755,6 +755,7 @@ DEPENDENCIES
stoplight (~> 2.1.3)
streamio-ffmpeg (~> 3.0)
strong_migrations (~> 0.2)
thor (~> 0.20)
tty-command (~> 0.8)
tty-prompt (~> 0.16)
twitter-text (~> 1.14)

2
app/controllers/api/v1/lists/accounts_controller.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
class Api::V1::Lists::AccountsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
before_action :require_user!

2
app/controllers/api/v1/lists_controller.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
class Api::V1::ListsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:index, :show]
before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:index, :show]
before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:index, :show]
before_action :require_user!

24
app/controllers/api/v1/mutes_controller.rb
View File

@ -20,11 +20,7 @@ class Api::V1::MutesController < Api::BaseController
private
def load_accounts
default_accounts.merge(paginated_mutes).to_a
end
def default_accounts
Account.includes(:muted_by).references(:muted_by)
paginated_mutes.map(&:target_account)
end
def load_mutes
@ -32,11 +28,13 @@ class Api::V1::MutesController < Api::BaseController
end
def paginated_mutes
Mute.where(account: current_account).paginate_by_max_id(
limit_param(DEFAULT_ACCOUNTS_LIMIT),
params[:max_id],
params[:since_id]
)
@paginated_mutes ||= Mute.eager_load(:target_account)
.where(account: current_account)
.paginate_by_max_id(
limit_param(DEFAULT_ACCOUNTS_LIMIT),
params[:max_id],
params[:since_id]
)
end
def insert_pagination_headers
@ -50,7 +48,7 @@ class Api::V1::MutesController < Api::BaseController
end
def prev_path
unless@data.empty?
unless @data.empty?
url_for pagination_params(since_id: pagination_since_id)
end
end
@ -59,7 +57,7 @@ class Api::V1::MutesController < Api::BaseController
if params[:action] == "details"
@mutes.last.id
else
@accounts.last.muted_by_ids.last
paginated_mutes.last.id
end
end
@ -67,7 +65,7 @@ class Api::V1::MutesController < Api::BaseController
if params[:action] == "details"
@mutes.first.id
else
@accounts.first.muted_by_ids.first
paginated_mutes.first.id
end
end

6
app/helpers/stream_entries_helper.rb
View File

@ -62,17 +62,17 @@ module StreamEntriesHelper
prepend_str = [
[
number_to_human(account.statuses_count, strip_insignificant_zeros: true),
I18n.t('accounts.posts'),
I18n.t('accounts.posts', count: account.statuses_count),
].join(' '),
[
number_to_human(account.following_count, strip_insignificant_zeros: true),
I18n.t('accounts.following'),
I18n.t('accounts.following', count: account.following_count),
].join(' '),
[
number_to_human(account.followers_count, strip_insignificant_zeros: true),
I18n.t('accounts.followers'),
I18n.t('accounts.followers', count: account.followers_count),
].join(' '),
].join(', ')

2
app/javascript/mastodon/features/compose/components/upload_button.js
View File

@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import ImmutablePropTypes from 'react-immutable-proptypes';
const messages = defineMessages({
upload: { id: 'upload_button.label', defaultMessage: 'Add media (JPEG, PNG, GIF, WebM, MP4)' },
upload: { id: 'upload_button.label', defaultMessage: 'Add media (JPEG, PNG, GIF, WebM, MP4, MOV)' },
});
const makeMapStateToProps = () => {

48
app/javascript/mastodon/features/keyboard_shortcuts/index.js
View File

@ -92,6 +92,54 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
<td><kbd>esc</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.unfocus' defaultMessage='to un-focus compose textarea/search' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>h</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.home' defaultMessage='to open home timeline' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>n</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.notifications' defaultMessage='to open notifications column' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>l</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.local' defaultMessage='to open local timeline' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>t</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.federated' defaultMessage='to open federated timeline' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>d</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.direct' defaultMessage='to open direct messages column' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>s</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.start' defaultMessage='to open "get started" column' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>f</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.favourites' defaultMessage='to open favourites list' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>p</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned toots list' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>u</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.my_profile' defaultMessage='to open your profile' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>b</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.blocked' defaultMessage='to open blocked users list' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>m</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.muted' defaultMessage='to open muted users list' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>r</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.requests' defaultMessage='to open follow requests list' /></td>
</tr>
<tr>
<td><kbd>?</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.legend' defaultMessage='to display this legend' /></td>

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "عرض الترقيات",
"home.column_settings.show_replies": "عرض الردود",
"keyboard_shortcuts.back": "للعودة",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "للترقية",
"keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
"keyboard_shortcuts.compose": "للتركيز على نافذة تحرير النصوص",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "للإنتقال إلى أسفل القائمة",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "للإضافة إلى المفضلة",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "مفتاح الإختصار",
"keyboard_shortcuts.legend": "لعرض هذا المفتاح",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "لذِكر الناشر",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "لفتح رابط الناشر",
"keyboard_shortcuts.reply": "للردّ",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "للتركيز على البحث",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "لعرض أو إخفاء النص مِن وراء التحذير",
"keyboard_shortcuts.toot": "لتحرير تبويق جديد",
"keyboard_shortcuts.unfocus": "لإلغاء التركيز على حقل النص أو نافذة البحث",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
"keyboard_shortcuts.compose": "to focus the compose textarea",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "to move down in the list",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
"keyboard_shortcuts.compose": "to focus the compose textarea",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "to move down in the list",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Mostrar impulsos",
"home.column_settings.show_replies": "Mostrar respostes",
"keyboard_shortcuts.back": "navegar enrera",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "impulsar",
"keyboard_shortcuts.column": "per centrar un estat en una de les columnes",
"keyboard_shortcuts.compose": "per centrar l'area de composició de text",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "per baixar en la llista",
"keyboard_shortcuts.enter": "ampliar estat",
"keyboard_shortcuts.favourite": "afavorir",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Tecla d'accés directe",
"keyboard_shortcuts.legend": "per a mostrar aquesta llegenda",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "per esmentar l'autor",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "respondre",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "per centrar la cerca",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "per a mostrar/amagar text sota CW",
"keyboard_shortcuts.toot": "per a començar un toot nou de trinca",
"keyboard_shortcuts.unfocus": "descentrar l'area de composició de text/cerca",

26
app/javascript/mastodon/locales/co.json
View File

@ -7,7 +7,7 @@
"account.disclaimer_full": "Ghjè pussibule chì l’infurmazione quì sottu ùn rifletta micca u prufile sanu di l’utilizatore.",
"account.domain_blocked": "Duminiu piattatu",
"account.edit_profile": "Mudificà u prufile",
"account.endorse": "Feature on profile",
"account.endorse": "Fà figurà nant'à u prufilu",
"account.follow": "Siguità",
"account.followers": "Abbunati",
"account.followers.empty": "No one follows this user yet.",
@ -29,7 +29,7 @@
"account.show_reblogs": "Vede spartere da @{name}",
"account.unblock": "Sbluccà @{name}",
"account.unblock_domain": "Ùn piattà più {domain}",
"account.unendorse": "Don't feature on profile",
"account.unendorse": "Ùn fà figurà nant'à u prufilu",
"account.unfollow": "Ùn siguità più",
"account.unmute": "Ùn piattà più @{name}",
"account.unmute_notifications": "Ùn piattà più nutificazione da @{name}",
@ -89,7 +89,7 @@
"confirmations.mute.confirm": "Piattà",
"confirmations.mute.message": "Site sicuru·a che vulete piattà @{name}?",
"confirmations.redraft.confirm": "Sguassà è riscrive",
"confirmations.redraft.message": "Site sicuru·a chè vulete sguassà stu statutu è riscrivelu? Tutti i favuriti, risposte è spartere saranu persi.",
"confirmations.redraft.message": "Site sicuru·a chè vulete sguassà stu statutu è riscrivelu? I favuriti è spartere saranu persi, è e risposte diventeranu orfane.",
"confirmations.unfollow.confirm": "Disabbunassi",
"confirmations.unfollow.message": "Site sicuru·a ch'ùn vulete più siguità @{name}?",
"embed.instructions": "Integrà stu statutu à u vostru situ cù u codice quì sottu.",
@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Vede e spartere",
"home.column_settings.show_replies": "Vede e risposte",
"keyboard_shortcuts.back": "rivultà",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "sparte",
"keyboard_shortcuts.column": "fucalizà un statutu indè una colonna",
"keyboard_shortcuts.compose": "fucalizà nant'à l'area di ridazzione",
"keyboard_shortcuts.description": "Descrizzione",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "falà indè a lista",
"keyboard_shortcuts.enter": "apre u statutu",
"keyboard_shortcuts.favourite": "aghjunghje à i favuriti",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Accorte cù a tastera",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Accorta",
"keyboard_shortcuts.legend": "vede a legenda",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "mintuvà l'autore",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "per apre u prufile di l'autore",
"keyboard_shortcuts.reply": "risponde",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "fucalizà nant'à l'area di circata",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "vede/piattà u testu daretu à l'avertimentu CW",
"keyboard_shortcuts.toot": "scrive un novu statutu",
"keyboard_shortcuts.unfocus": "ùn fucalizà più l'area di testu",
@ -171,10 +183,10 @@
"missing_indicator.label": "Micca trovu",
"missing_indicator.sublabel": "Ùn era micca pussivule di truvà sta risorsa",
"mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
"navigation_bar.apps": "Mobile apps",
"navigation_bar.apps": "Applicazione per u telefuninu",
"navigation_bar.blocks": "Utilizatori bluccati",
"navigation_bar.community_timeline": "Linea pubblica lucale",
"navigation_bar.compose": "Compose new toot",
"navigation_bar.compose": "Scrive un novu statutu",
"navigation_bar.direct": "Missaghji diretti",
"navigation_bar.discover": "Scopre",
"navigation_bar.domain_blocks": "Duminii piattati",
@ -268,7 +280,7 @@
"status.cancel_reblog_private": "Ùn sparte più",
"status.cannot_reblog": "Stu statutu ùn pò micca esse spartutu",
"status.delete": "Toglie",
"status.detailed_status": "Detailed conversation view",
"status.detailed_status": "Vista in ditagliu di a cunversazione",
"status.direct": "Mandà un missaghju @{name}",
"status.embed": "Integrà",
"status.favourite": "Aghjunghje à i favuriti",
@ -307,7 +319,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} parlanu",
"ui.beforeunload": "A bruttacopia sarà persa s'ellu hè chjosu Mastodon.",
"upload_area.title": "Drag & drop per caricà un fugliale",
"upload_button.label": "Aghjunghje un media",
"upload_button.label": "Aghjunghje un media (JPEG, PNG, GIF, WebM, MP4)",
"upload_form.description": "Discrive per i malvistosi",
"upload_form.focus": "Riquatrà",
"upload_form.undo": "Sguassà",

20
app/javascript/mastodon/locales/cs.json
View File

@ -89,7 +89,7 @@
"confirmations.mute.confirm": "Ignorovat",
"confirmations.mute.message": "Jste si jistý/á, že chcete ignorovat uživatele {name}?",
"confirmations.redraft.confirm": "Vymazat a přepsat",
"confirmations.redraft.message": "Jste si jistý/á, že chcete vymazat a přepsat tento příspěvek? Ztratíte všechny jeho odpovědi, boosty a oblíbení.",
"confirmations.redraft.message": "Jste si jistý/á, že chcete vymazat a přepsat tento příspěvek? Oblíbení a boosty budou ztraceny a odpovědi na původní příspěvek budou opuštěny.",
"confirmations.unfollow.confirm": "Přestat sledovat",
"confirmations.unfollow.message": "jste si jistý/á, že chcete přestat sledovat uživatele {name}?",
"embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.",
@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Zobrazit boosty",
"home.column_settings.show_replies": "Zobrazit odpovědi",
"keyboard_shortcuts.back": "k návratu zpět",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "k boostnutí",
"keyboard_shortcuts.column": "k zaměření na příspěvek v jednom ze sloupců",
"keyboard_shortcuts.compose": "k zaměření na psací prostor",
"keyboard_shortcuts.description": "Popis",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "k přesunutí dolů v seznamu",
"keyboard_shortcuts.enter": "k otevření příspěvku",
"keyboard_shortcuts.favourite": "k oblíbení",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Klávesové zkratky",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Horká klávesa",
"keyboard_shortcuts.legend": "k zobrazení této legendy",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "ke zmínění autora",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "k otevření autorova profilu",
"keyboard_shortcuts.reply": "k odpovězení",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "k zaměření na vyhledávání",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "k zobrazení/skrytí textu za CW",
"keyboard_shortcuts.toot": "k napsání úplně nového tootu",
"keyboard_shortcuts.unfocus": "ke zrušení soustředění na psací prostor/hledání",
@ -174,7 +186,7 @@
"navigation_bar.apps": "Mobilní aplikace",
"navigation_bar.blocks": "Blokovaní uživatelé",
"navigation_bar.community_timeline": "Místní časová osa",
"navigation_bar.compose": "Compose new toot",
"navigation_bar.compose": "Vytvořit nový toot",
"navigation_bar.direct": "Přímé zprávy",
"navigation_bar.discover": "Objevujte",
"navigation_bar.domain_blocks": "Skryté domény",
@ -268,7 +280,7 @@
"status.cancel_reblog_private": "Zrušit boost",
"status.cannot_reblog": "Tento příspěvek nemůže být boostnutý",
"status.delete": "Delete",
"status.detailed_status": "Detailed conversation view",
"status.detailed_status": "Detailní zobrazení konverzace",
"status.direct": "Poslat přímou zprávu uživateli @{name}",
"status.embed": "Vložit",
"status.favourite": "Oblíbit",
@ -307,7 +319,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {člověk} other {lidí}} diskutuje",
"ui.beforeunload": "Váš koncept se ztratí, pokud Mastodon opustíte.",
"upload_area.title": "Přetažením nahrajete",
"upload_button.label": "Přidat média",
"upload_button.label": "Přidat média (JPEG, PNG, GIF, WebM, MP4)",
"upload_form.description": "Popis pro zrakově postižené",
"upload_form.focus": "Vystřihnout",
"upload_form.undo": "Smazat",

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

@ -89,7 +89,7 @@
"confirmations.mute.confirm": "Dæmp",
"confirmations.mute.message": "Er du sikker på, du vil dæmpe {name}?",
"confirmations.redraft.confirm": "Slet & omskriv",
"confirmations.redraft.message": "Er du sikker på, du vil slette denne status og omskrive den? Du vil miste alle svar, fremhævelser og favoritter der medfølger.",
"confirmations.redraft.message": "Er du sikker på, du vil slette denne status og omskrive den? Favoritter og fremhævelser vil gå tabt og svar til det oprindelige opslag vil blive forældreløse.",
"confirmations.unfollow.confirm": "Følg ikke længere",
"confirmations.unfollow.message": "Er du sikker på, du ikke længere vil følge {name}?",
"embed.instructions": "Indlejre denne status på din side ved at kopiere nedenstående kode.",
@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Vis fremhævelser",
"home.column_settings.show_replies": "Vis svar",
"keyboard_shortcuts.back": "for at navigere dig tilbage",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "for at fremhæve",
"keyboard_shortcuts.column": "for at fokusere på en status i en af kolonnerne",
"keyboard_shortcuts.compose": "for at fokusere på skriveområdet",
"keyboard_shortcuts.description": "Beskrivelse",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "for at rykke ned ad listen",
"keyboard_shortcuts.enter": "for at åbne status",
"keyboard_shortcuts.favourite": "for at favorisere",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Tastaturgenveje",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hurtigtast",
"keyboard_shortcuts.legend": "for at vise denne legende",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "for at nævne forfatteren",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "til profil af åben forfatter",
"keyboard_shortcuts.reply": "for at svare",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "for at fokusere søgningen",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW",
"keyboard_shortcuts.toot": "for at påbegynde et helt nyt trut",
"keyboard_shortcuts.unfocus": "for at fjerne fokus fra skriveområde/søgning",
@ -307,7 +319,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} snakker",
"ui.beforeunload": "Din kladde vil gå tabt hvis du forlader Mastodon.",
"upload_area.title": "Træk og slip for at uploade",
"upload_button.label": "Tilføj medie",
"upload_button.label": "Tilføj medie (JPEG, PNG, GIF, WebM, MP4)",
"upload_form.description": "Beskriv for de svagtseende",
"upload_form.focus": "Beskær",
"upload_form.undo": "Slet",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
"home.column_settings.show_replies": "Antworten anzeigen",
"keyboard_shortcuts.back": "zurück navigieren",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "boosten",
"keyboard_shortcuts.column": "einen Status in einer der Spalten fokussieren",
"keyboard_shortcuts.compose": "um das Textfeld zu fokussieren",
"keyboard_shortcuts.description": "Beschreibung",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "sich in der Liste hinunter bewegen",
"keyboard_shortcuts.enter": "um den Status zu öffnen",
"keyboard_shortcuts.favourite": "um zu favorisieren",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Tastenkombinationen",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Tastenkürzel",
"keyboard_shortcuts.legend": "um diese Übersicht anzuzeigen",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "um Autor_in zu erwähnen",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "um Profil des Autors zu öffnen",
"keyboard_shortcuts.reply": "um zu antworten",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "um die Suche zu fokussieren",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "um den Text hinter einer Inhaltswarnung zu verstecken oder ihn anzuzeigen",
"keyboard_shortcuts.toot": "um einen neuen Toot zu beginnen",
"keyboard_shortcuts.unfocus": "um das Textfeld/die Suche nicht mehr zu fokussieren",

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

@ -911,7 +911,7 @@
{
"descriptors": [
{
"defaultMessage": "Add media",
"defaultMessage": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
"id": "upload_button.label"
}
],
@ -1365,6 +1365,54 @@
"defaultMessage": "to un-focus compose textarea/search",
"id": "keyboard_shortcuts.unfocus"
},
{
"defaultMessage": "to open home timeline",
"id": "keyboard_shortcuts.home"
},
{
"defaultMessage": "to open notifications column",
"id": "keyboard_shortcuts.notifications"
},
{
"defaultMessage": "to open local timeline",
"id": "keyboard_shortcuts.local"
},
{
"defaultMessage": "to open federated timeline",
"id": "keyboard_shortcuts.federated"
},
{
"defaultMessage": "to open direct messages column",
"id": "keyboard_shortcuts.direct"
},
{
"defaultMessage": "to open \"get started\" column",
"id": "keyboard_shortcuts.start"
},
{
"defaultMessage": "to open favourites list",
"id": "keyboard_shortcuts.favourites"
},
{
"defaultMessage": "to open pinned toots list",
"id": "keyboard_shortcuts.pinned"
},
{
"defaultMessage": "to open your profile",
"id": "keyboard_shortcuts.my_profile"
},
{
"defaultMessage": "to open blocked users list",
"id": "keyboard_shortcuts.blocked"
},
{
"defaultMessage": "to open muted users list",
"id": "keyboard_shortcuts.muted"
},
{
"defaultMessage": "to open follow requests list",
"id": "keyboard_shortcuts.requests"
},
{
"defaultMessage": "to display this legend",
"id": "keyboard_shortcuts.legend"
@ -2080,4 +2128,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
]
]

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

@ -89,7 +89,7 @@
"confirmations.mute.confirm": "Αποσιώπηση",
"confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις τον/την {name};",
"confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
"confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την κατάσταση και να την γράψεις ξανά; Θα χάσεις όλες τις απαντήσεις, αναφορές και τα αγαπημένα προς αυτή.",
"confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την κατάσταση και να την ξαναγράψεις; Οι αναφορές και τα αγαπημένα της θα χαθούν ενώ οι απαντήσεις προς αυτή θα μείνουν ορφανές.",
"confirmations.unfollow.confirm": "Διακοπή παρακολούθησης",
"confirmations.unfollow.message": "Σίγουρα θες να πάψεις να ακολουθείς τον/την {name};",
"embed.instructions": "Ενσωματώστε αυτή την κατάσταση στην ιστοσελίδα σας αντιγράφοντας τον παρακάτω κώδικα.",
@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
"home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
"keyboard_shortcuts.back": "για επιστροφή πίσω",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "για προώθηση",
"keyboard_shortcuts.column": "για εστίαση μιας κατάστασης σε μια από τις στήλες",
"keyboard_shortcuts.compose": "για εστίαση στην περιοχή κειμένου συγγραφής",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "για κίνηση προς τα κάτω στη λίστα",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "για σημείωση αγαπημένου",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Συντόμευση",
"keyboard_shortcuts.legend": "για να εμφανίσεις αυτόν τον οδηγό",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "για να αναφέρεις το συγγραφέα",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "για απάντηση",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "για εστίαση αναζήτησης",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "για εμφάνιση/απόκρυψη κειμένου πίσω από την προειδοποίηση",
"keyboard_shortcuts.toot": "για δημιουργία ολοκαίνουριου τουτ",
"keyboard_shortcuts.unfocus": "για την απο-εστίαση του πεδίου σύνθεσης/αναζήτησης",
@ -307,7 +319,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} μιλάνε",
"ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.",
"upload_area.title": "Drag & drop για να ανεβάσεις",
"upload_button.label": "Πρόσθεσε πολυμέσα",
"upload_button.label": "Πρόσθεσε πολυμέσα (JPEG, PNG, GIF, WebM, MP4)",
"upload_form.description": "Περιέγραψε για όσους & όσες έχουν προβλήματα όρασης",
"upload_form.focus": "Περικοπή",
"upload_form.undo": "Διαγραφή",

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

@ -141,20 +141,32 @@
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
"keyboard_shortcuts.compose": "to focus the compose textarea",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "to move down in the list",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@ -312,7 +324,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
"upload_area.title": "Drag & drop to upload",
"upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4)",
"upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_form.description": "Describe for the visually impaired",
"upload_form.focus": "Crop",
"upload_form.undo": "Delete",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Montri diskonigojn",
"home.column_settings.show_replies": "Montri respondojn",
"keyboard_shortcuts.back": "por reveni",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "por diskonigi",
"keyboard_shortcuts.column": "por fokusigi mesaĝon en unu el la kolumnoj",
"keyboard_shortcuts.compose": "por fokusigi la tekstujon",
"keyboard_shortcuts.description": "Priskribo",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "por iri suben en la listo",
"keyboard_shortcuts.enter": "por malfermi mesaĝon",
"keyboard_shortcuts.favourite": "por stelumi",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Klavaraj mallongigoj",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Rapidklavo",
"keyboard_shortcuts.legend": "por montri ĉi tiun noton",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "por mencii la aŭtoron",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "por malfermi la profilon de la aŭtoro",
"keyboard_shortcuts.reply": "por respondi",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "por fokusigi la serĉilon",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "por montri/kaŝi tekston malantaŭ enhava averto",
"keyboard_shortcuts.toot": "por komenci tute novan mesaĝon",
"keyboard_shortcuts.unfocus": "por malfokusigi la tekstujon aŭ la serĉilon",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Mostrar retoots",
"home.column_settings.show_replies": "Mostrar respuestas",
"keyboard_shortcuts.back": "volver atrás",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "retootear",
"keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
"keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "mover hacia abajo en la lista",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "añadir a favoritos",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Tecla caliente",
"keyboard_shortcuts.legend": "para mostrar esta leyenda",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "para mencionar al autor",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "para responder",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "para poner el foco en la búsqueda",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "para comenzar un nuevo toot",
"keyboard_shortcuts.unfocus": "para retirar el foco de la caja de redacción/búsqueda",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Erakutsi bultzadak",
"home.column_settings.show_replies": "Erakutsi erantzunak",
"keyboard_shortcuts.back": "atzera nabigatzeko",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "bultzada ematea",
"keyboard_shortcuts.column": "mezu bat zutabe batean fokatzea",
"keyboard_shortcuts.compose": "testua konposatzeko arean fokatzea",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "zerrendan behera mugitzea",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "gogoko egitea",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Laster-tekla",
"keyboard_shortcuts.legend": "legenda hau bistaratzea",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "egilea aipatzea",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "egilearen profila irekitzeko",
"keyboard_shortcuts.reply": "erantzutea",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "bilaketan fokua jartzea",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "testua erakustea/ezkutatzea abisu baten atzean",
"keyboard_shortcuts.toot": "toot berria hastea",
"keyboard_shortcuts.unfocus": "testua konposatzeko area / bilaketatik fokua kentzea",

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

@ -89,7 +89,7 @@
"confirmations.mute.confirm": "بی‌صدا کن",
"confirmations.mute.message": "آیا واقعاً می‌خواهید {name} را بی‌صدا کنید؟",
"confirmations.redraft.confirm": "پاک‌کردن و بازنویسی",
"confirmations.redraft.message": "آیا واقعاً می‌خواهید این نوشته را پاک کنید و آن را از نو بنویسید؟ با این کار همهٔ پاسخ‌ها، بازبوق‌ها، و پسندیده‌شدن‌های آن از دست می‌رود.",
"confirmations.redraft.message": "آیا واقعاً می‌خواهید این نوشته را پاک کنید و آن را از نو بنویسید؟ با این کار بازبوق‌ها و پسندیده‌شدن‌های آن از دست می‌رود و پاسخ‌ها به آن بی‌مرجع می‌شود.",
"confirmations.unfollow.confirm": "لغو پیگیری",
"confirmations.unfollow.message": "آیا واقعاً می‌خواهید به پیگیری از {name} پایان دهید؟",
"embed.instructions": "برای جاگذاری این نوشته در سایت خودتان، کد زیر را کپی کنید.",
@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "نمایش بازبوق‌ها",
"home.column_settings.show_replies": "نمایش پاسخ‌ها",
"keyboard_shortcuts.back": "برای بازگشت",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "برای بازبوقیدن",
"keyboard_shortcuts.column": "برای برجسته‌کردن یک نوشته در یکی از ستون‌ها",
"keyboard_shortcuts.compose": "برای فعال‌کردن کادر نوشتهٔ تازه",
"keyboard_shortcuts.description": "توضیح",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "برای پایین‌رفتن در فهرست",
"keyboard_shortcuts.enter": "برای گشودن نوشته",
"keyboard_shortcuts.favourite": "برای پسندیدن",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "میان‌برهای صفحه‌کلید",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "میان‌بر",
"keyboard_shortcuts.legend": "برای نمایش این راهنما",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "برای نام‌بردن از نویسنده",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "گشودن نمایهٔ نویسنده",
"keyboard_shortcuts.reply": "برای پاسخ‌دادن",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "برای فعال‌کردن جستجو",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "برای نمایش/نهفتن نوشتهٔ پشت هشدار محتوا",
"keyboard_shortcuts.toot": "برای آغاز یک بوق تازه",
"keyboard_shortcuts.unfocus": "برای برداشتن توجه از نوشتن/جستجو",
@ -307,7 +319,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {نفر نوشته است} other {نفر نوشته‌اند}}",
"ui.beforeunload": "اگر از ماستدون خارج شوید پیش‌نویس شما پاک خواهد شد.",
"upload_area.title": "برای بارگذاری به این‌جا بکشید",
"upload_button.label": "افزودن تصویر",
"upload_button.label": "افزودن عکس و ویدیو (JPEG, PNG, GIF, WebM, MP4)",
"upload_form.description": "نوشتهٔ توضیحی برای کم‌بینایان و نابینایان",
"upload_form.focus": "بریدن لبه‌ها",
"upload_form.undo": "حذف",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Näytä buustaukset",
"home.column_settings.show_replies": "Näytä vastaukset",
"keyboard_shortcuts.back": "liiku taaksepäin",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "buustaa",
"keyboard_shortcuts.column": "siirrä fokus tietyn sarakkeen tilapäivitykseen",
"keyboard_shortcuts.compose": "siirry tekstinsyöttöön",
"keyboard_shortcuts.description": "Kuvaus",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "siirry listassa alaspäin",
"keyboard_shortcuts.enter": "avaa tilapäivitys",
"keyboard_shortcuts.favourite": "tykkää",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Näppäinkomennot",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Pikanäppäin",
"keyboard_shortcuts.legend": "näytä tämä selite",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "mainitse julkaisija",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "vastaa",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "siirry hakukenttään",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "näytä/piilota sisältövaroituksella merkitty teksti",
"keyboard_shortcuts.toot": "ala kirjoittaa uutta tuuttausta",
"keyboard_shortcuts.unfocus": "siirry pois tekstikentästä tai hakukentästä",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Afficher les partages",
"home.column_settings.show_replies": "Afficher les réponses",
"keyboard_shortcuts.back": "revenir en arrière",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "partager",
"keyboard_shortcuts.column": "focaliser un statut dans l’une des colonnes",
"keyboard_shortcuts.compose": "pour centrer la zone de rédaction",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "pour descendre dans la liste",
"keyboard_shortcuts.enter": "pour ouvrir le statut",
"keyboard_shortcuts.favourite": "vers les favoris",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Raccourcis clavier",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Raccourci",
"keyboard_shortcuts.legend": "pour afficher cette légende",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "pour mentionner l’auteur·rice",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "pour ouvrir le profil de l’auteur·rice",
"keyboard_shortcuts.reply": "pour répondre",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "pour cibler la recherche",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derrière CW",
"keyboard_shortcuts.toot": "pour démarrer un tout nouveau pouet",
"keyboard_shortcuts.unfocus": "pour recentrer composer textarea/search",
@ -174,7 +186,7 @@
"navigation_bar.apps": "Applications mobiles",
"navigation_bar.blocks": "Comptes bloqués",
"navigation_bar.community_timeline": "Fil public local",
"navigation_bar.compose": "Compose new toot",
"navigation_bar.compose": "Rédiger un nouveau toot",
"navigation_bar.direct": "Messages directs",
"navigation_bar.discover": "Découvrir",
"navigation_bar.domain_blocks": "Domaines cachés",
@ -268,7 +280,7 @@
"status.cancel_reblog_private": "Dé-booster",
"status.cannot_reblog": "Cette publication ne peut être boostée",
"status.delete": "Effacer",
"status.detailed_status": "Detailed conversation view",
"status.detailed_status": "Vue détaillée de la conversation",
"status.direct": "Envoyer un message direct à @{name}",
"status.embed": "Intégrer",
"status.favourite": "Ajouter aux favoris",
@ -307,7 +319,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {personne} other {personnes}} discutent",
"ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
"upload_area.title": "Glissez et déposez pour envoyer",
"upload_button.label": "Joindre un média",
"upload_button.label": "Joindre un média (JPEG, PNG, GIF, WebM, MP4)",
"upload_form.description": "Décrire pour les malvoyant·e·s",
"upload_form.focus": "Recadrer",
"upload_form.undo": "Supprimer",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Mostrar repeticións",
"home.column_settings.show_replies": "Mostrar respostas",
"keyboard_shortcuts.back": "voltar atrás",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "promover",
"keyboard_shortcuts.column": "destacar un estado en unha das columnas",
"keyboard_shortcuts.compose": "Foco no área de escritura",
"keyboard_shortcuts.description": "Descrición",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "ir hacia abaixo na lista",
"keyboard_shortcuts.enter": "abrir estado",
"keyboard_shortcuts.favourite": "marcar como favorito",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Atallos do teclado",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Tecla de acceso directo",
"keyboard_shortcuts.legend": "para mostrar esta lenda",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "para mencionar o autor",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "para responder",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "para centrar a busca",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "mostrar/agochar un texto detrás do AC",
"keyboard_shortcuts.toot": "escribir un toot novo",
"keyboard_shortcuts.unfocus": "quitar o foco do área de escritura/busca",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "הצגת הדהודים",
"home.column_settings.show_replies": "הצגת תגובות",
"keyboard_shortcuts.back": "ניווט חזרה",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "להדהד",
"keyboard_shortcuts.column": "להתמקד בהודעה באחד מהטורים",
"keyboard_shortcuts.compose": "להתמקד בתיבת חיבור ההודעות",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "לנוע במורד הרשימה",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "לחבב",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "מקש קיצור",
"keyboard_shortcuts.legend": "להציג את הפירוש",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "לאזכר את המחבר(ת)",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "לענות",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "להתמקד בחלון החיפוש",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "להתחיל חיצרוץ חדש",
"keyboard_shortcuts.unfocus": "לצאת מתיבת חיבור/חיפוש",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Pokaži boostove",
"home.column_settings.show_replies": "Pokaži odgovore",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
"keyboard_shortcuts.compose": "to focus the compose textarea",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "to move down in the list",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Ismétlések mutatása",
"home.column_settings.show_replies": "Válaszok mutatása",
"keyboard_shortcuts.back": "vissza navigálás",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "ismétlés",
"keyboard_shortcuts.column": "összpontosítson egy státuszra az egyik oszlopban",
"keyboard_shortcuts.compose": "fókuszálja a szerkesztési szövegdobozt",
"keyboard_shortcuts.description": "Leírás",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "lefele navigálás a listában",
"keyboard_shortcuts.enter": "státusz megnyitása",
"keyboard_shortcuts.favourite": "kedvenccé tétel",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Billentyű rövidítések",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Gyorsbillentyű",
"keyboard_shortcuts.legend": "jelmagyarázat megjelenítése",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "szerző megjelenítése",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "válaszolás",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "kereső kiemelése",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "új tülk megkezdése",
"keyboard_shortcuts.unfocus": "tülk szerkesztés/keresés fókuszpontból való kivétele",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
"home.column_settings.show_replies": "Ցուցադրել պատասխանները",
"keyboard_shortcuts.back": "ետ նավարկելու համար",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "տարածելու համար",
"keyboard_shortcuts.column": "սյուներից մեկի վրա սեւեռվելու համար",
"keyboard_shortcuts.compose": "շարադրման տիրույթին սեւեռվելու համար",
"keyboard_shortcuts.description": "Նկարագրություն",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "ցանկով ներքեւ շարժվելու համար",
"keyboard_shortcuts.enter": "թութը բացելու համար",
"keyboard_shortcuts.favourite": "հավանելու համար",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Ստեղնաշարի կարճատներ",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Հատուկ ստեղն",
"keyboard_shortcuts.legend": "այս ձեռնարկը ցուցադրելու համար",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "հեղինակին նշելու համար",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "պատասխանելու համար",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "որոնման դաշտին սեւեռվելու համար",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "թարմ թութ սկսելու համար",
"keyboard_shortcuts.unfocus": "տեքստի/որոնման տիրույթից ապասեւեռվելու համար",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Tampilkan boost",
"home.column_settings.show_replies": "Tampilkan balasan",
"keyboard_shortcuts.back": "untuk kembali",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "untuk menyebarkan",
"keyboard_shortcuts.column": "untuk fokus kepada sebuah status di sebuah kolom",
"keyboard_shortcuts.compose": "untuk fokus ke area penulisan",
"keyboard_shortcuts.description": "Deskripsi",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar",
"keyboard_shortcuts.enter": "untuk membuka status",
"keyboard_shortcuts.favourite": "untuk memfavoritkan",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Pintasan keyboard",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "untuk fokus mencari",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Montrar repeti",
"home.column_settings.show_replies": "Montrar respondi",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
"keyboard_shortcuts.compose": "to focus the compose textarea",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "to move down in the list",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Mostra post condivisi",
"home.column_settings.show_replies": "Mostra risposte",
"keyboard_shortcuts.back": "per tornare indietro",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "per condividere",
"keyboard_shortcuts.column": "per portare il focus su uno status in una delle colonne",
"keyboard_shortcuts.compose": "per portare il focus nell'area di composizione",
"keyboard_shortcuts.description": "Descrizione",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "per spostarsi in basso nella lista",
"keyboard_shortcuts.enter": "per aprire lo status",
"keyboard_shortcuts.favourite": "per segnare come apprezzato",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Tasti di scelta rapida",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Tasto di scelta rapida",
"keyboard_shortcuts.legend": "per mostrare questa spiegazione",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "per menzionare l'autore",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "per aprire il profilo dell'autore",
"keyboard_shortcuts.reply": "per rispondere",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "per spostare il focus sulla ricerca",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "per mostrare/nascondere il testo dei CW",
"keyboard_shortcuts.toot": "per iniziare a scrivere un toot completamente nuovo",
"keyboard_shortcuts.unfocus": "per uscire dall'area di composizione o dalla ricerca",

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

@ -93,7 +93,7 @@
"confirmations.mute.confirm": "ミュート",
"confirmations.mute.message": "本当に{name}さんをミュートしますか？",
"confirmations.redraft.confirm": "削除して下書きに戻す",
"confirmations.redraft.message": "本当にこのトゥートを削除して下書きに戻しますか？ このトゥートへの全ての返信やブースト、お気に入り登録を失うことになります。",
"confirmations.redraft.message": "本当にこのトゥートを削除して下書きに戻しますか？ このトゥートへのお気に入り登録やブーストは失われ、リプライは孤立することになります。",
"confirmations.unfollow.confirm": "フォロー解除",
"confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
"embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。",
@ -141,20 +141,32 @@
"home.column_settings.show_reblogs": "ブースト表示",
"home.column_settings.show_replies": "返信表示",
"keyboard_shortcuts.back": "戻る",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "ブースト",
"keyboard_shortcuts.column": "左からn番目のカラム内最新トゥートに移動",
"keyboard_shortcuts.compose": "トゥート入力欄に移動",
"keyboard_shortcuts.description": "説明",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "カラム内一つ下に移動",
"keyboard_shortcuts.enter": "トゥートの詳細を表示",
"keyboard_shortcuts.favourite": "お気に入り",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "キーボードショートカット",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "ホットキー",
"keyboard_shortcuts.legend": "この一覧を表示",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "メンション",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "プロフィールを開く",
"keyboard_shortcuts.reply": "返信",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "検索欄に移動",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "CWで隠れた文を見る/隠す",
"keyboard_shortcuts.toot": "新規トゥート",
"keyboard_shortcuts.unfocus": "トゥート入力欄・検索欄から離れる",
@ -312,7 +324,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {人} other {人}} がトゥート",
"ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
"upload_area.title": "ドラッグ＆ドロップでアップロード",
"upload_button.label": "メディアを追加",
"upload_button.label": "メディアを追加 (JPEG, PNG, GIF, WebM, MP4)",
"upload_form.description": "視覚障害者のための説明",
"upload_form.focus": "焦点",
"upload_form.undo": "削除",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "ბუსტების ჩვენება",
"home.column_settings.show_replies": "პასუხების ჩვენება",
"keyboard_shortcuts.back": "უკან გადასასვლელად",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "დასაბუსტად",
"keyboard_shortcuts.column": "ერთ-ერთი სვეტში სტატუსზე ფოკუსირებისთვის",
"keyboard_shortcuts.compose": "შედგენის ტექსტ-არეაზე ფოკუსირებისთვის",
"keyboard_shortcuts.description": "აღწერილობა",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "სიაში ქვემოთ გადასაადგილებლად",
"keyboard_shortcuts.enter": "სტატუსის გასახსნელად",
"keyboard_shortcuts.favourite": "ფავორიტად ქცევისთვის",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "კლავიატურის სწრაფი ბმულები",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "ცხელი კლავიში",
"keyboard_shortcuts.legend": "ამ ლეგენდის გამოსაჩენად",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "ავტორის დასახელებლად",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "ავტორის პროფილის გასახსნელად",
"keyboard_shortcuts.reply": "პასუხისთვის",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "ძიებაზე ფოკუსირებისთვის",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "გაფრთხილების უკან ტექსტის გამოსაჩენად/დასამალვად",
"keyboard_shortcuts.toot": "ახალი ტუტის დასაწყებად",
"keyboard_shortcuts.unfocus": "შედგენის ტექსტ-არეაზე ფოკუსის მოსაშორებლად",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "부스트 표시",
"home.column_settings.show_replies": "답글 표시",
"keyboard_shortcuts.back": "뒤로가기",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "부스트",
"keyboard_shortcuts.column": "해당 열에 포커스",
"keyboard_shortcuts.compose": "작성창으로 포커스",
"keyboard_shortcuts.description": "설명",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "리스트에서 아래로 이동",
"keyboard_shortcuts.enter": "열기",
"keyboard_shortcuts.favourite": "관심글 지정",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "키보드 단축키",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "핫키",
"keyboard_shortcuts.legend": "이 도움말 표시",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "멘션",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "프로필 열기",
"keyboard_shortcuts.reply": "답장",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "검색창에 포커스",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "CW로 가려진 텍스트를 표시/비표시",
"keyboard_shortcuts.toot": "새 툿 작성",
"keyboard_shortcuts.unfocus": "작성창에서 포커스 해제",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Boosts tonen",
"home.column_settings.show_replies": "Reacties tonen",
"keyboard_shortcuts.back": "om terug te gaan",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "om te boosten",
"keyboard_shortcuts.column": "om op een toot te focussen in één van de kolommen",
"keyboard_shortcuts.compose": "om het tekstvak voor toots te focussen",
"keyboard_shortcuts.description": "Omschrijving",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "om naar beneden door de lijst te bewegen",
"keyboard_shortcuts.enter": "om toot volledig te tonen",
"keyboard_shortcuts.favourite": "om als favoriet te markeren",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Sneltoetsen",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Sneltoets",
"keyboard_shortcuts.legend": "om deze legenda te tonen",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "om de auteur te vermelden",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "om het gebruikersprofiel te openen",
"keyboard_shortcuts.reply": "om te reageren",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "om het zoekvak te focussen",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "om tekst achter een waarschuwing (CW) te tonen/verbergen",
"keyboard_shortcuts.toot": "om een nieuwe toot te starten",
"keyboard_shortcuts.unfocus": "om het tekst- en zoekvak te ontfocussen",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Vis fremhevinger",
"home.column_settings.show_replies": "Vis svar",
"keyboard_shortcuts.back": "for å navigere tilbake",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "å fremheve",
"keyboard_shortcuts.column": "å fokusere en status i en av kolonnene",
"keyboard_shortcuts.compose": "å fokusere komponeringsfeltet",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "for å flytte ned i listen",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "for å favorittmarkere",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Lyntast",
"keyboard_shortcuts.legend": "å vise denne forklaringen",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "å nevne forfatter",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "for å svare",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "å fokusere søk",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "å starte en helt ny tut",
"keyboard_shortcuts.unfocus": "å ufokusere komponerings-/søkefeltet",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Mostrar los partatges",
"home.column_settings.show_replies": "Mostrar las responsas",
"keyboard_shortcuts.back": "anar enrèire",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "partejar",
"keyboard_shortcuts.column": "centrar un estatut a una colomna",
"keyboard_shortcuts.compose": "anar al camp tèxte",
"keyboard_shortcuts.description": "Descripcion",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "far davalar dins la lista",
"keyboard_shortcuts.enter": "dobrir los estatuts",
"keyboard_shortcuts.favourite": "apondre als favorits",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Acorchis clavièr",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Acorchis",
"keyboard_shortcuts.legend": "mostrar aquesta legenda",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "mencionar l’autor",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "per dobrir lo perfil de l’autor",
"keyboard_shortcuts.reply": "respondre",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "anar a la recèrca",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "mostrar/amagar lo tèxte dels avertiments",
"keyboard_shortcuts.toot": "començar un estatut tot novèl",
"keyboard_shortcuts.unfocus": "quitar lo camp tèxte/de recèrca",

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

@ -10,9 +10,9 @@
"account.endorse": "Polecaj na profilu",
"account.follow": "Śledź",
"account.followers": "Śledzący",
"account.followers.empty": "No one follows this user yet.",
"account.followers.empty": "Nikt jeszcze nie śledzi tego użytkownika.",
"account.follows": "Śledzeni",
"account.follows.empty": "This user doesn't follow anyone yet.",
"account.follows.empty": "Ten użytkownik nie śledzi jeszcze nikogo.",
"account.follows_you": "Śledzi Cię",
"account.hide_reblogs": "Ukryj podbicia od @{name}",
"account.media": "Zawartość multimedialna",
@ -93,7 +93,7 @@
"confirmations.mute.confirm": "Wycisz",
"confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
"confirmations.redraft.confirm": "Usuń i przeredaguj",
"confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Utracisz wszystkie odpowiedzi, podbicia i polubienia dotyczące go.",
"confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Polubienia i podbicia zostaną utracone, a odpowiedzi do oryginalnego wpisu zostaną osierocone.",
"confirmations.unfollow.confirm": "Przestań śledzić",
"confirmations.unfollow.message": "Czy na pewno zamierzasz przestać śledzić {name}?",
"embed.instructions": "Osadź ten wpis na swojej stronie wklejając poniższy kod.",
@ -112,19 +112,19 @@
"emoji_button.search_results": "Wyniki wyszukiwania",
"emoji_button.symbols": "Symbole",
"emoji_button.travel": "Podróże i miejsca",
"empty_column.blocks": "You haven't blocked any users yet.",
"empty_column.blocks": "Nie zablokowałeś(-aś) jeszcze żadnego użytkownika.",
"empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby zagaić!",
"empty_column.direct": "Nie masz żadnych wiadomości bezpośrednich. Kiedy dostaniesz lub wyślesz jakąś, pojawi się ona tutaj.",
"empty_column.domain_blocks": "There are no hidden domains yet.",
"empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
"empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
"empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
"empty_column.domain_blocks": "Brak ukrytych domen.",
"empty_column.favourited_statuses": "Nie dodałeś(-aś) żadnego wpisu do ulubionych. Kiedy to zrobisz, pojawi się on tutaj.",
"empty_column.favourites": "Nikt nie dodał tego wpisu do ulubionych. Gdy ktoś to zrobi, pojawi się tutaj.",
"empty_column.follow_requests": "Nie masz żadnych próśb o możliwość śledzenia. Kiedy ktoś utworzy ją, pojawi się tutaj.",
"empty_column.hashtag": "Nie ma wpisów oznaczonych tym hashtagiem. Możesz napisać pierwszy(-a)!",
"empty_column.home": "Nie śledzisz nikogo. Odwiedź globalną oś czasu lub użyj wyszukiwarki, aby znaleźć interesujące Cię profile.",
"empty_column.home.public_timeline": "globalna oś czasu",
"empty_column.list": "Nie ma nic na tej liście. Kiedy członkowie listy dodadzą nowe wpisy, pojawia się one tutaj.",
"empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
"empty_column.mutes": "You haven't muted any users yet.",
"empty_column.lists": "Nie masz żadnych list. Kiedy utworzysz jedną, pojawi się tutaj.",
"empty_column.mutes": "Nie wyciszyłeś(-aś) jeszcze żadnego użytkownika.",
"empty_column.notifications": "Nie masz żadnych powiadomień. Rozpocznij interakcje z innymi użytkownikami.",
"empty_column.public": "Tu nic nie ma! Napisz coś publicznie, lub dodaj ludzi z innych instancji, aby to wyświetlić",
"follow_request.authorize": "Autoryzuj",
@ -141,20 +141,32 @@
"home.column_settings.show_reblogs": "Pokazuj podbicia",
"home.column_settings.show_replies": "Pokazuj odpowiedzi",
"keyboard_shortcuts.back": "aby cofnąć się",
"keyboard_shortcuts.blocked": "aby przejść do listy zablokowanych użytkowników",
"keyboard_shortcuts.boost": "aby podbić wpis",
"keyboard_shortcuts.column": "aby przejść do wpisu z jednej z kolumn",
"keyboard_shortcuts.compose": "aby przejść do pola tworzenia wpisu",
"keyboard_shortcuts.description": "Opis",
"keyboard_shortcuts.direct": "aby otworzyć kolumnę wiadomości bezpośrednich",
"keyboard_shortcuts.down": "aby przejść na dół listy",
"keyboard_shortcuts.enter": "aby otworzyć wpis",
"keyboard_shortcuts.favourite": "aby dodać do ulubionych",
"keyboard_shortcuts.favourites": "aby przejść do listy ulubionych wpisów",
"keyboard_shortcuts.federated": "aby otworzyć oś czasu federacji",
"keyboard_shortcuts.heading": "Skróty klawiszowe",
"keyboard_shortcuts.home": "aby otworzyć stronę główną",
"keyboard_shortcuts.hotkey": "Klawisz",
"keyboard_shortcuts.legend": "aby wyświetlić tę legendę",
"keyboard_shortcuts.local": "aby otworzyć lokalną oś czasu",
"keyboard_shortcuts.mention": "aby wspomnieć o autorze",
"keyboard_shortcuts.muted": "aby przejść do listy wyciszonych użytkowników",
"keyboard_shortcuts.my_profile": "aby otworzyć własny profil",
"keyboard_shortcuts.notifications": "aby otworzyć kolumnę powiadomień",
"keyboard_shortcuts.pinned": "aby przejść do listy przypiętych wpisów",
"keyboard_shortcuts.profile": "aby przejść do profilu autora wpisu",
"keyboard_shortcuts.reply": "aby odpowiedzieć",
"keyboard_shortcuts.requests": "aby przejść do listy próśb o możliwość śledzenia",
"keyboard_shortcuts.search": "aby przejść do pola wyszukiwania",
"keyboard_shortcuts.start": "aby otworzyć kolumnę „Rozpocznij”",
"keyboard_shortcuts.toggle_hidden": "aby wyświetlić lub ukryć wpis spod CW",
"keyboard_shortcuts.toot": "aby utworzyć nowy wpis",
"keyboard_shortcuts.unfocus": "aby opuścić pole wyszukiwania/pisania",
@ -175,10 +187,10 @@
"missing_indicator.label": "Nie znaleziono",
"missing_indicator.sublabel": "Nie można odnaleźć tego zasobu",
"mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego użytkownika?",
"navigation_bar.apps": "Mobile apps",
"navigation_bar.apps": "Aplikacje mobilne",
"navigation_bar.blocks": "Zablokowani użytkownicy",
"navigation_bar.community_timeline": "Lokalna oś czasu",
"navigation_bar.compose": "Compose new toot",
"navigation_bar.compose": "Utwórz nowy wpis",
"navigation_bar.direct": "Wiadomości bezpośrednie",
"navigation_bar.discover": "Odkrywaj",
"navigation_bar.domain_blocks": "Ukryte domeny",
@ -273,7 +285,7 @@
"status.cancel_reblog_private": "Cofnij podbicie",
"status.cannot_reblog": "Ten wpis nie może zostać podbity",
"status.delete": "Usuń",
"status.detailed_status": "Detailed conversation view",
"status.detailed_status": "Szczegółowy widok konwersacji",
"status.direct": "Wyślij wiadomość bezpośrednią do @{name}",
"status.embed": "Osadź",
"status.favourite": "Dodaj do ulubionych",
@ -290,7 +302,7 @@
"status.reblog": "Podbij",
"status.reblog_private": "Podbij dla odbiorców oryginalnego wpisu",
"status.reblogged_by": "{name} podbił(a)",
"status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
"status.reblogs.empty": "Nikt nie podbił jeszcze tego wpisu. Gdy ktoś to zrobi, pojawi się tutaj.",
"status.redraft": "Usuń i przeredaguj",
"status.reply": "Odpowiedz",
"status.replyAll": "Odpowiedz na wątek",
@ -312,11 +324,11 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {osoba rozmawia} few {osoby rozmawiają} other {osób rozmawia}} o tym",
"ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.",
"upload_area.title": "Przeciągnij i upuść aby wysłać",
"upload_button.label": "Dodaj zawartość multimedialną",
"upload_button.label": "Dodaj zawartość multimedialną (JPEG, PNG, GIF, WebM, MP4)",
"upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
"upload_form.focus": "Przytnij",
"upload_form.undo": "Usuń",
"upload_progress.label": "Wysyłanie",
"upload_progress.label": "Wysyłanie...",
"video.close": "Zamknij film",
"video.exit_fullscreen": "Opuść tryb pełnoekranowy",
"video.expand": "Rozszerz film",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Mostrar compartilhamentos",
"home.column_settings.show_replies": "Mostrar as respostas",
"keyboard_shortcuts.back": "para navegar de volta",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "para compartilhar",
"keyboard_shortcuts.column": "Focar um status em uma das colunas",
"keyboard_shortcuts.compose": "para focar a área de redação",
"keyboard_shortcuts.description": "Descrição",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "para mover para baixo na lista",
"keyboard_shortcuts.enter": "para expandir um status",
"keyboard_shortcuts.favourite": "para adicionar aos favoritos",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Atalhos de teclado",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Atalho",
"keyboard_shortcuts.legend": "para mostrar essa legenda",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "para mencionar o autor",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "para abrir o perfil do autor",
"keyboard_shortcuts.reply": "para responder",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "para focar a pesquisa",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "mostrar/esconder o texto com aviso de conteúdo",
"keyboard_shortcuts.toot": "para compor um novo toot",
"keyboard_shortcuts.unfocus": "para remover o foco da área de composição/pesquisa",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Mostrar as partilhas",
"home.column_settings.show_replies": "Mostrar as respostas",
"keyboard_shortcuts.back": "para voltar",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "para partilhar",
"keyboard_shortcuts.column": "para focar uma publicação numa das colunas",
"keyboard_shortcuts.compose": "para focar na área de publicação",
"keyboard_shortcuts.description": "Descrição",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "para mover para baixo na lista",
"keyboard_shortcuts.enter": "para expandir uma publicação",
"keyboard_shortcuts.favourite": "para adicionar aos favoritos",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Atalhos do teclado",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Atalho",
"keyboard_shortcuts.legend": "para mostrar esta legenda",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "para mencionar o autor",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "para responder",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "para focar na pesquisa",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "para compor um novo post",
"keyboard_shortcuts.unfocus": "para remover o foco da área de publicação/pesquisa",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Показывать продвижения",
"home.column_settings.show_replies": "Показывать ответы",
"keyboard_shortcuts.back": "перейти назад",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "продвинуть пост",
"keyboard_shortcuts.column": "фокус на одном из столбцов",
"keyboard_shortcuts.compose": "фокус на поле ввода",
"keyboard_shortcuts.description": "Описание",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "вниз по списку",
"keyboard_shortcuts.enter": "развернуть пост",
"keyboard_shortcuts.favourite": "в избранное",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Сочетания клавиш",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Гор. клавиша",
"keyboard_shortcuts.legend": "показать это окно",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "упомянуть автора поста",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "перейти к профилю автора",
"keyboard_shortcuts.reply": "ответить",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "перейти к поиску",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением",
"keyboard_shortcuts.toot": "начать писать новый пост",
"keyboard_shortcuts.unfocus": "убрать фокус с поля ввода/поиска",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Zobraziť povýšené",
"home.column_settings.show_replies": "Ukázať odpovede",
"keyboard_shortcuts.back": "dostať sa naspäť",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "vyzdvihnúť",
"keyboard_shortcuts.column": "zamerať sa na status v jednom zo stĺpcov",
"keyboard_shortcuts.compose": "zamerať sa na písaciu plochu",
"keyboard_shortcuts.description": "Popis",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "posunúť sa dole v zozname",
"keyboard_shortcuts.enter": "otvoriť správu",
"keyboard_shortcuts.favourite": "pridať do obľúbených",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Klávesové skratky",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Klávesa",
"keyboard_shortcuts.legend": "zobraziť túto legendu",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "spomenúť autora",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "odpovedať",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "zamerať sa na vyhľadávanie",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW",
"keyboard_shortcuts.toot": "začať úplne novú hlášku",
"keyboard_shortcuts.unfocus": "nesústrediť sa na písaciu plochu, alebo hľadanie",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Pokaži sunke",
"home.column_settings.show_replies": "Pokaži odgovore",
"keyboard_shortcuts.back": "za krmarjenje nazaj",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "suniti",
"keyboard_shortcuts.column": "osredotočiti status v enega od stolpcev",
"keyboard_shortcuts.compose": "osredotočiti na sestavljanje besedila",
"keyboard_shortcuts.description": "Opis",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "premakniti navzdol po seznamu",
"keyboard_shortcuts.enter": "odpreti status",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Tipkovne bližnjice",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hitra tipka",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "da začnete povsem nov tut",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Prikaži i podržavanja",
"home.column_settings.show_replies": "Prikaži odgovore",
"keyboard_shortcuts.back": "da odete nazad",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "da podržite",
"keyboard_shortcuts.column": "da se prebacite na status u jednoj od kolona",
"keyboard_shortcuts.compose": "da se prebacite na pisanje novog tuta",
"keyboard_shortcuts.description": "Opis",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "da se pomerite na dole u listi",
"keyboard_shortcuts.enter": "da otvorite status",
"keyboard_shortcuts.favourite": "da označite kao omiljeno",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Prečice na tastaturi",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Prečica",
"keyboard_shortcuts.legend": "da prikažete ovaj podsetnik",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "da pomenete autora",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "da odgovorite",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "da se prebacite na pretragu",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "da započnete skroz novi tut",
"keyboard_shortcuts.unfocus": "da ne budete više na pretrazi/pravljenju novog tuta",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Прикажи и подржавања",
"home.column_settings.show_replies": "Прикажи одговоре",
"keyboard_shortcuts.back": "да одете назад",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "да подржите",
"keyboard_shortcuts.column": "да се пребаците на статус у једној од колона",
"keyboard_shortcuts.compose": "да се пребаците на писање новог тута",
"keyboard_shortcuts.description": "Опис",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "да се померите на доле у листи",
"keyboard_shortcuts.enter": "да отворите статус",
"keyboard_shortcuts.favourite": "да означите као омиљено",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Пречице на тастатури",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Пречица",
"keyboard_shortcuts.legend": "да прикажете овај подсетник",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "да поменете аутора",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "да одговорите",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "да се пребаците на претрагу",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "да започнете скроз нови тут",
"keyboard_shortcuts.unfocus": "да не будете више на претрази/прављењу новог тута",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Visa knuffar",
"home.column_settings.show_replies": "Visa svar",
"keyboard_shortcuts.back": "att navigera tillbaka",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "att knuffa",
"keyboard_shortcuts.column": "att fokusera en status i en av kolumnerna",
"keyboard_shortcuts.compose": "att fokusera komponera text fältet",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "att flytta ner i listan",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "att favorisera",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Snabbvalstangent",
"keyboard_shortcuts.legend": "att visa denna översikt",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "att nämna författaren",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "att svara",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "att fokusera sökfältet",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "att visa/gömma text bakom CW",
"keyboard_shortcuts.toot": "att börja en helt ny toot",
"keyboard_shortcuts.unfocus": "att avfokusera komponera text fält / sökfält",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
"home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
"keyboard_shortcuts.back": "వెనక్కి తిరిగి వెళ్ళడానికి",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "బూస్ట్ చేయడానికి",
"keyboard_shortcuts.column": "నిలువు వరుసలలో ఒకదానిపై దృష్టి పెట్టడానికి",
"keyboard_shortcuts.compose": "కంపోజ్ టెక్స్ట్ఏరియా పై దృష్టి పెట్టడానికి",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "జాబితాలో క్రిందికి వెళ్ళడానికి",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "ఇష్టపడడానికి",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "కీబోర్డ్ సత్వరమార్గాలు",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "హాట్ కీ",
"keyboard_shortcuts.legend": "ఈ లెజెండ్ ప్రదర్శించడానికి",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "రచయితను ప్రస్తావించడానికి",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "రచయిత ప్రొఫైల్ ను తెరవాలంటే",
"keyboard_shortcuts.reply": "ప్రత్యుత్తరం ఇవ్వడానికి",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "శోధనపై దృష్టి పెట్టండి",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "CW వెనుక ఉన్న పాఠ్యాన్ని చూపడానికి / దాచడానికి",
"keyboard_shortcuts.toot": "ఒక సరికొత్త టూట్ను ప్రారంభించడానికి",
"keyboard_shortcuts.unfocus": "పాఠ్యం వ్రాసే ఏరియా/శోధన పట్టిక నుండి బయటకు రావడానికి",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
"keyboard_shortcuts.compose": "to focus the compose textarea",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "to move down in the list",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Boost edilenleri göster",
"home.column_settings.show_replies": "Cevapları göster",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
"keyboard_shortcuts.compose": "to focus the compose textarea",
"keyboard_shortcuts.description": "Description",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "to move down in the list",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "to favourite",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Hotkey",
"keyboard_shortcuts.legend": "to display this legend",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "to mention author",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "Показувати передмухи",
"home.column_settings.show_replies": "Показувати відповіді",
"keyboard_shortcuts.back": "переходити назад",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "передмухувати",
"keyboard_shortcuts.column": "фокусуватися на одній з колонок",
"keyboard_shortcuts.compose": "фокусуватися на полі введення",
"keyboard_shortcuts.description": "Опис",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "рухатися вниз стрічкою",
"keyboard_shortcuts.enter": "відкрити статус",
"keyboard_shortcuts.favourite": "вподобати",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "Гарячі клавіші",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "Гаряча клавіша",
"keyboard_shortcuts.legend": "показати підказку",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "згадати автора",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "відкрити профіль автора",
"keyboard_shortcuts.reply": "відповісти",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "сфокусуватися на пошуку",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "показати/приховати прихований текст",
"keyboard_shortcuts.toot": "почати писати новий дмух",
"keyboard_shortcuts.unfocus": "розфокусуватися з нового допису чи пошуку",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "显示转嘟",
"home.column_settings.show_replies": "显示回复",
"keyboard_shortcuts.back": "返回上一页",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "转嘟",
"keyboard_shortcuts.column": "选择第 X 栏中的嘟文",
"keyboard_shortcuts.compose": "选择嘟文撰写框",
"keyboard_shortcuts.description": "说明",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "在列表中让光标下移",
"keyboard_shortcuts.enter": "展开嘟文",
"keyboard_shortcuts.favourite": "收藏嘟文",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "快捷键列表",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "快捷键",
"keyboard_shortcuts.legend": "显示此列表",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "提及嘟文作者",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "回复嘟文",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "选择搜索框",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "显示或隐藏被折叠的正文",
"keyboard_shortcuts.toot": "发送新嘟文",
"keyboard_shortcuts.unfocus": "取消输入",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "顯示被轉推的文章",
"home.column_settings.show_replies": "顯示回應文章",
"keyboard_shortcuts.back": "後退",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "轉推",
"keyboard_shortcuts.column": "把標示移動到其中一列",
"keyboard_shortcuts.compose": "把標示移動到文字輸入區",
"keyboard_shortcuts.description": "描述",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "在列表往下移動",
"keyboard_shortcuts.enter": "打開文章",
"keyboard_shortcuts.favourite": "收藏",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "鍵盤快速鍵",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "快速鍵",
"keyboard_shortcuts.legend": "顯示這個說明",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "提及作者",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "回覆",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "把標示移動到搜索",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "顯示或隱藏被標為敏感的文字",
"keyboard_shortcuts.toot": "新的推文",
"keyboard_shortcuts.unfocus": "把標示移離文字輸入和搜索",

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

@ -137,20 +137,32 @@
"home.column_settings.show_reblogs": "顯示轉推",
"home.column_settings.show_replies": "顯示回應",
"keyboard_shortcuts.back": "回到上一個",
"keyboard_shortcuts.blocked": "to open blocked users list",
"keyboard_shortcuts.boost": "到轉推",
"keyboard_shortcuts.column": "選擇第 X 欄中的嘟文",
"keyboard_shortcuts.compose": "焦點移至撰寫文字區塊",
"keyboard_shortcuts.description": "描述",
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "在列表往下移動",
"keyboard_shortcuts.enter": "to open status",
"keyboard_shortcuts.favourite": "收藏",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "鍵盤快速鍵",
"keyboard_shortcuts.home": "to open home timeline",
"keyboard_shortcuts.hotkey": "快速鍵",
"keyboard_shortcuts.legend": "顯示這個說明",
"keyboard_shortcuts.local": "to open local timeline",
"keyboard_shortcuts.mention": "到提到的作者",
"keyboard_shortcuts.muted": "to open muted users list",
"keyboard_shortcuts.my_profile": "to open your profile",
"keyboard_shortcuts.notifications": "to open notifications column",
"keyboard_shortcuts.pinned": "to open pinned toots list",
"keyboard_shortcuts.profile": "to open author's profile",
"keyboard_shortcuts.reply": "到回應",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "把滑鼠移動到搜尋",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "顯示或隱藏被標為敏感的嘟文",
"keyboard_shortcuts.toot": "新的嘟文",
"keyboard_shortcuts.unfocus": "取消輸入",

2
app/lib/activitypub/activity/update.rb
View File

@ -11,6 +11,6 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
def update_account
return if @account.uri != object_uri
ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object)
ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object, signed_with_known_key: true)
end
end

5
app/lib/activitypub/linked_data_signature.rb
View File

@ -32,7 +32,7 @@ class ActivityPub::LinkedDataSignature
end
end
def sign!(creator)
def sign!(creator, sign_with: nil)
options = {
'type' => 'RsaSignature2017',
'creator' => [ActivityPub::TagManager.instance.uri_for(creator), '#main-key'].join,
@ -42,8 +42,9 @@ class ActivityPub::LinkedDataSignature
options_hash = hash(options.without('type', 'id', 'signatureValue').merge('@context' => CONTEXT))
document_hash = hash(@json.without('signature'))
to_be_signed = options_hash + document_hash
keypair = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : creator.keypair
signature = Base64.strict_encode64(creator.keypair.sign(OpenSSL::Digest::SHA256.new, to_be_signed))
signature = Base64.strict_encode64(keypair.sign(OpenSSL::Digest::SHA256.new, to_be_signed))
@json.merge('signature' => options.merge('signatureValue' => signature))
end

2
app/lib/feed_manager.rb
View File

@ -288,7 +288,7 @@ class FeedManager
# remains in the set. We could pick a random element, but this
# set should generally be small, and it seems ideal to show the
# oldest potential such reblog.
other_reblog = redis.smembers(reblog_set_key).map(&:to_i).sort.first
other_reblog = redis.smembers(reblog_set_key).map(&:to_i).min
redis.zadd(timeline_key, other_reblog, other_reblog) if other_reblog

5
app/lib/request.rb
View File

@ -22,10 +22,11 @@ class Request
set_digest! if options.key?(:body)
end
def on_behalf_of(account, key_id_format = :acct)
def on_behalf_of(account, key_id_format = :acct, sign_with: nil)
raise ArgumentError unless account.local?
@account = account
@keypair = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : @account.keypair
@key_id_format = key_id_format
self
@ -70,7 +71,7 @@ class Request
def signature
algorithm = 'rsa-sha256'
signature = Base64.strict_encode64(@account.keypair.sign(OpenSSL::Digest::SHA256.new, signed_string))
signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest::SHA256.new, signed_string))
"keyId=\"#{key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers}\",signature=\"#{signature}\""
end

2
app/mailers/user_mailer.rb
View File

@ -16,7 +16,7 @@ class UserMailer < Devise::Mailer
return if @resource.disabled?
I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.unconfirmed_email.blank? ? @resource.email : @resource.unconfirmed_email,
mail to: @resource.unconfirmed_email.presence || @resource.email,
subject: I18n.t(@resource.pending_reconfirmation? ? 'devise.mailer.reconfirmation_instructions.subject' : 'devise.mailer.confirmation_instructions.subject', instance: @instance),
template_name: @resource.pending_reconfirmation? ? 'reconfirmation_instructions' : 'confirmation_instructions'
end

2
app/models/concerns/expireable.rb
View File

@ -9,7 +9,7 @@ module Expireable
attr_reader :expires_in
def expires_in=(interval)
self.expires_at = interval.to_i.seconds.from_now unless interval.blank?
self.expires_at = interval.to_i.seconds.from_now if interval.present?
@expires_in = interval
end

4
app/models/user.rb
View File

@ -98,7 +98,7 @@ class User < ApplicationRecord
:reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_sensitive_media, :hide_network,
:default_language, to: :settings, prefix: :setting, allow_nil: false
attr_accessor :invite_code
attr_reader :invite_code
def pam_conflict(_)
# block pam login tries on traditional account
@ -258,7 +258,7 @@ class User < ApplicationRecord
end
def invite_code=(code)
self.invite = Invite.find_by(code: code) unless code.blank?
self.invite = Invite.find_by(code: code) if code.present?
@invite_code = code
end

5
app/services/activitypub/process_account_service.rb
View File

@ -5,9 +5,10 @@ class ActivityPub::ProcessAccountService < BaseService
# Should be called with confirmed valid JSON
# and WebFinger-resolved username and domain
def call(username, domain, json)
def call(username, domain, json, options = {})
return if json['inbox'].blank? || unsupported_uri_scheme?(json['id'])
@options = options
@json = json
@uri = @json['id']
@username = username
@ -31,7 +32,7 @@ class ActivityPub::ProcessAccountService < BaseService
return if @account.nil?
after_protocol_change! if protocol_changed?
after_key_change! if key_changed?
after_key_change! if key_changed? && !@options[:signed_with_known_key]
check_featured_collection! if @account.featured_collection_url.present?
@account

2
app/services/follow_service.rb
View File

@ -27,6 +27,8 @@ class FollowService < BaseService
return
end
ActivityTracker.increment('activity:interactions')
if target_account.locked? || target_account.activitypub?
request_follow(source_account, target_account, reblogs: reblogs)
else

10
app/views/accounts/_header.html.haml
View File

@ -16,17 +16,17 @@
.counter{ class: active_nav_class(short_account_url(account)) }
= link_to short_account_url(account), class: 'u-url u-uid', title: number_with_delimiter(account.statuses_count) do
%span.counter-number= number_to_human account.statuses_count, strip_insignificant_zeros: true
%span.counter-label= t('accounts.posts')
%span.counter-label= t('accounts.posts', count: account.statuses_count)
.counter{ class: active_nav_class(account_following_index_url(account)) }
= link_to account_following_index_url(account), title: number_with_delimiter(account.following_count) do
%span.counter-number= number_to_human account.following_count, strip_insignificant_zeros: true
%span.counter-label= t('accounts.following')
%span.counter-label= t('accounts.following', count: account.following_count)
.counter{ class: active_nav_class(account_followers_url(account)) }
= link_to account_followers_url(account), title: number_with_delimiter(account.followers_count) do
%span.counter-number= number_to_human account.followers_count, strip_insignificant_zeros: true
%span.counter-label= t('accounts.followers')
%span.counter-label= t('accounts.followers', count: account.followers_count)
.spacer
.public-account-header__tabs__tabs__buttons
= account_action_button(account)
@ -37,7 +37,7 @@
.public-account-header__extra__links
= link_to account_following_index_url(account) do
%strong= number_to_human account.following_count, strip_insignificant_zeros: true
= t('accounts.following')
= t('accounts.following', count: account.following_count)
= link_to account_followers_url(account) do
%strong= number_to_human account.followers_count, strip_insignificant_zeros: true
= t('accounts.followers')
= t('accounts.followers', count: account.followers_count)

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

@ -29,7 +29,7 @@
%data.p-name{ value: "#{@account.username} on #{site_hostname}" }/
.account__section-headline
= active_link_to t('accounts.posts'), short_account_url(@account)
= active_link_to t('accounts.posts_tab_heading'), short_account_url(@account)
= active_link_to t('accounts.posts_with_replies'), short_account_with_replies_url(@account)
= active_link_to t('accounts.media'), short_account_media_url(@account)

6
app/views/admin/suspensions/new.html.haml
View File

@ -8,13 +8,13 @@
%ul
%li.negative-hint
= number_to_human @account.statuses_count, strip_insignificant_zeros: true
= t('accounts.posts')
= t('accounts.posts', count: @account.statuses_count)
%li.negative-hint
= number_to_human @account.following_count, strip_insignificant_zeros: true
= t('accounts.following')
= t('accounts.following', count: @account.following_count)
%li.negative-hint
= number_to_human @account.followers_count, strip_insignificant_zeros: true
= t('accounts.followers')
= t('accounts.followers', count: @account.followers_count)
%p.hint= t('admin.suspensions.hint_html', value: content_tag(:code, @account.acct))

4
app/views/settings/exports/show.html.haml
View File

@ -9,7 +9,7 @@
%td= number_to_human_size @export.total_storage
%td
%tr
%th= t('accounts.statuses')
%th= t('accounts.statuses', count: @export.total_statuses)
%td= number_with_delimiter @export.total_statuses
%td
%tr
@ -17,7 +17,7 @@
%td= number_with_delimiter @export.total_follows
%td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv)
%tr
%th= t('accounts.followers')
%th= t('accounts.followers', count: @export.total_followers)
%td= number_with_delimiter @export.total_followers
%td
%tr

5
app/workers/activitypub/delivery_worker.rb
View File

@ -10,7 +10,8 @@ class ActivityPub::DeliveryWorker
HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze
def perform(json, source_account_id, inbox_url)
def perform(json, source_account_id, inbox_url, options = {})
@options = options.with_indifferent_access
@json = json
@source_account = Account.find(source_account_id)
@inbox_url = inbox_url
@ -27,7 +28,7 @@ class ActivityPub::DeliveryWorker
def build_request
request = Request.new(:post, @inbox_url, body: @json)
request.on_behalf_of(@source_account, :uri)
request.on_behalf_of(@source_account, :uri, sign_with: @options[:sign_with])
request.add_headers(HEADERS)
end

5
app/workers/activitypub/update_distribution_worker.rb
View File

@ -5,7 +5,8 @@ class ActivityPub::UpdateDistributionWorker
sidekiq_options queue: 'push'
def perform(account_id)
def perform(account_id, options = {})
@options = options.with_indifferent_access
@account = Account.find(account_id)
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
@ -26,7 +27,7 @@ class ActivityPub::UpdateDistributionWorker
end
def signed_payload
@signed_payload ||= Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account))
@signed_payload ||= Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account, sign_with: @options[:sign_with]))
end
def payload

14
config/locales/cs.yml
View File

@ -30,10 +30,14 @@ cs:
other_instances: Seznam instancí
privacy_policy: Zásady soukromí
source_code: Zdrojový kód
status_count_after: příspěvků
status_count_after:
one: příspěvek
other: příspěvků
status_count_before: Kteří napsali
terms: Podmínky používání
user_count_after: uživatelů
user_count_after:
one: uživatele
other: uživatelů
user_count_before: Domov
what_is_mastodon: Co je Mastodon?
accounts:
@ -346,6 +350,9 @@ cs:
contact_information:
email: Pracovní e-mail
username: Uživatelské jméno kontaktu
custom_css:
desc_html: Pozměnit vzhled pomocí šablony CSS načtené na každé stránce
title: Vlastní CSS
hero:
desc_html: Zobrazuje se na hlavní stránce. Doporučuje se rozlišení alespoň 600x100px. Pokud toto není nastavené, bude zobrazena miniatura instance
title: Hlavní obrázek
@ -415,8 +422,11 @@ cs:
title: WebSub
topic: Téma
suspensions:
bad_acct_msg: Hodnota pro potvrzení neodpovídá. Suspendujete správný účet?
hint_html: 'Pro potvrzení suspenzace účtu prosím zadejte do pole níže %{value}:'
proceed: Pokračovat
title: Suspendovat účet %{acct}
warning_html: 'Suspenzace tohoto účtu <strong>nenávratně</strong> smaže z tohoto účtu data, včetně:'
title: Administrace
admin_mailer:
new_report:

9
config/locales/en.yml
View File

@ -43,7 +43,9 @@ en:
accounts:
choices_html: "%{name}'s choices:"
follow: Follow
followers: Followers
followers:
one: Follower
other: Followers
following: Following
joined: Joined %{date}
media: Media
@ -54,7 +56,10 @@ en:
people_who_follow: People who follow %{name}
pin_errors:
following: You must be already following the person you want to endorse
posts: Toots
posts:
one: Toot
other: Toots
posts_tab_heading: Toots
posts_with_replies: Toots and replies
reserved_username: The username is reserved
roles:

2
config/locales/ja.yml
View File

@ -350,6 +350,8 @@ ja:
contact_information:
email: ビジネスメールアドレス
username: 連絡先のユーザー名
custom_css:
title: カスタムCSS
hero:
desc_html: フロントページに表示されます。サイズは600x100px以上推奨です。未設定の場合、インスタンスのサムネイルが使用されます
title: ヒーローイメージ

1
config/locales/pl.yml
View File

@ -410,6 +410,7 @@ pl:
media:
title: Media
no_media: Bez zawartości multimedialnej
no_status_selected: Żaden wpis nie został zmieniony, bo żaden nie został wybrany
title: Wpisy konta
with_media: Z zawartością multimedialną
subscriptions:

4
config/locales/simple_form.pl.yml
View File

@ -15,6 +15,7 @@ pl:
other: Pozostało <span class="name-counter">%{count}</span> znaków
fields: Możesz ustawić maksymalnie 4 niestandardowe pola wyświetlane jako tabela na Twoim profilu
header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
inbox_url: Skopiuj adres ze strony głównej przekaźnika, którego chcesz użyć
irreversible: Filtrowane wpisy znikną bezpowrotnie, nawet gdy filtr zostanie usunięty
locale: Język interfejsu, wiadomości e-mail i powiadomieniach push
locked: Musisz akceptować prośby o śledzenie
@ -24,10 +25,12 @@ pl:
one: Pozostał <span class="name-counter">1</span> znak
other: Pozostało <span class="name-counter">%{count}</span> znaków
phrase: Zostanie wykryte nawet, gdy znajduje się za ostrzeżeniem o zawartości
scopes: Wybór API, do których aplikacja będzie miała dostęp. Jeżeli wybierzesz nadrzędny zakres, nie musisz wybierać jego elementów.
setting_default_language: Język Twoich wpisów może być wykrywany automatycznie, ale nie zawsze jest to dokładne
setting_hide_network: Informacje o tym, kto Cię śledzi i kogo śledzisz nie będą widoczne
setting_noindex: Wpływa na widoczność strony profilu i Twoich wpisów
setting_skin: Zmienia wygląd używanej odmiany Mastodona
whole_word: Jeśli słowo lub fraza składa się jedynie z liter lub cyfr, filtr będzie zastosowany tylko do pełnych wystąpień
imports:
data: Plik CSV wyeksportowany z innej instancji Mastodona
sessions:
@ -54,6 +57,7 @@ pl:
expires_in: Wygaśnie po
fields: Metadane profilu
header: Nagłówek
inbox_url: Adres skrzynki przekaźnika
irreversible: Usuwaj zamiast ukrywać
locale: Język interfejsu
locked: Ustaw konto jako prywatne

9
lib/cli.rb
View File

@ -3,13 +3,16 @@
require 'thor'
require_relative 'mastodon/media_cli'
require_relative 'mastodon/emoji_cli'
require_relative 'mastodon/accounts_cli'
module Mastodon
class CLI < Thor
desc 'media SUBCOMMAND ...ARGS', 'manage media files'
desc 'media SUBCOMMAND ...ARGS', 'Manage media files'
subcommand 'media', Mastodon::MediaCLI
desc 'emoji SUBCOMMAND ...ARGS', 'manage custom emoji'
desc 'emoji SUBCOMMAND ...ARGS', 'Manage custom emoji'
subcommand 'emoji', Mastodon::EmojiCLI
desc 'accounts SUBCOMMAND ...ARGS', 'Manage accounts'
subcommand 'accounts', Mastodon::AccountsCLI
end
end

55
lib/mastodon/accounts_cli.rb Normal file
View File

@ -0,0 +1,55 @@
# frozen_string_literal: true
require 'rubygems/package'
require_relative '../../config/boot'
require_relative '../../config/environment'
require_relative 'cli_helper'
module Mastodon
class AccountsCLI < Thor
option :all, type: :boolean
desc 'rotate [USERNAME]', 'Generate and broadcast new keys'
long_desc <<-LONG_DESC
Generate and broadcast new RSA keys as part of security
maintenance.
With the --all option, all local accounts will be subject
to the rotation. Otherwise, and by default, only a single
account specified by the USERNAME argument will be
processed.
LONG_DESC
def rotate(username = nil)
if options[:all]
processed = 0
delay = 0
Account.local.without_suspended.find_in_batches do |accounts|
accounts.each do |account|
rotate_keys_for_account(account, delay)
processed += 1
say('.', :green, false)
end
delay += 5.minutes
end
say
say("OK, rotated keys for #{processed} accounts", :green)
elsif username.present?
rotate_keys_for_account(Account.find_local(username))
say('OK', :green)
else
say('No account(s) given', :red)
end
end
private
def rotate_keys_for_account(account, delay = 0)
old_key = account.private_key
new_key = OpenSSL::PKey::RSA.new(2048).to_pem
account.update(private_key: new_key)
ActivityPub::UpdateDistributionWorker.perform_in(delay, account.id, sign_with: old_key)
end
end
end

2
lib/mastodon/emoji_cli.rb
View File

@ -13,7 +13,7 @@ module Mastodon
option :suffix
option :overwrite, type: :boolean
option :unlisted, type: :boolean
desc 'import PATH', 'import emoji from a TAR archive at PATH'
desc 'import PATH', 'Import emoji from a TAR archive at PATH'
long_desc <<-LONG_DESC
Imports custom emoji from a TAR archive specified by PATH.

2
lib/mastodon/media_cli.rb
View File

@ -10,7 +10,7 @@ module Mastodon
class MediaCLI < Thor
option :days, type: :numeric, default: 7
option :background, type: :boolean, default: false
desc 'remove', 'remove remote media files'
desc 'remove', 'Remove remote media files'
long_desc <<-DESC
Removes locally cached copies of media attachments from other servers.

2
lib/tasks/db.rake
View File

@ -18,7 +18,7 @@ def each_schema_load_environment
# needing to do the same, and we can't even use the same method
# to do it.
if Rails.env == 'development'
if Rails.env.development?
test_conf = ActiveRecord::Base.configurations['test']
if test_conf['database']&.present?

28
lib/tasks/mastodon.rake
View File

@ -280,14 +280,14 @@ namespace :mastodon do
begin
ActionMailer::Base.smtp_settings = {
:port => env['SMTP_PORT'],
:address => env['SMTP_SERVER'],
:user_name => env['SMTP_LOGIN'].presence,
:password => env['SMTP_PASSWORD'].presence,
:domain => env['LOCAL_DOMAIN'],
:authentication => env['SMTP_AUTH_METHOD'] == 'none' ? nil : env['SMTP_AUTH_METHOD'] || :plain,
:openssl_verify_mode => env['SMTP_OPENSSL_VERIFY_MODE'],
:enable_starttls_auto => true,
port: env['SMTP_PORT'],
address: env['SMTP_SERVER'],
user_name: env['SMTP_LOGIN'].presence,
password: env['SMTP_PASSWORD'].presence,
domain: env['LOCAL_DOMAIN'],
authentication: env['SMTP_AUTH_METHOD'] == 'none' ? nil : env['SMTP_AUTH_METHOD'] || :plain,
openssl_verify_mode: env['SMTP_OPENSSL_VERIFY_MODE'],
enable_starttls_auto: true,
}
ActionMailer::Base.default_options = {
@ -326,13 +326,11 @@ namespace :mastodon do
if prompt.yes?('Prepare the database now?')
prompt.say 'Running `RAILS_ENV=production rails db:setup` ...'
prompt.say "\n"
prompt.say "\n\n"
if cmd.run!({ RAILS_ENV: 'production', SAFETY_ASSURED: 1 }, :rails, 'db:setup').failure?
prompt.say "\n"
prompt.error 'That failed! Perhaps your configuration is not right'
else
prompt.say "\n"
prompt.ok 'Done!'
end
end
@ -343,13 +341,11 @@ namespace :mastodon do
if prompt.yes?('Compile the assets now?')
prompt.say 'Running `RAILS_ENV=production rails assets:precompile` ...'
prompt.say "\n"
prompt.say "\n\n"
if cmd.run!({ RAILS_ENV: 'production' }, :rails, 'assets:precompile').failure?
prompt.say "\n"
prompt.error 'That failed! Maybe you need swap space?'
else
prompt.say "\n"
prompt.say 'Done!'
end
end
@ -715,10 +711,10 @@ namespace :mastodon do
pastel = Pastel.new
duplicate_masters.each do |account|
puts pastel.yellow("First of their name: ") + pastel.bold(account.username) + " (#{admin_account_url(account.id)})"
puts pastel.yellow('First of their name: ') + pastel.bold(account.username) + " (#{admin_account_url(account.id)})"
Account.where('lower(username) = ?', account.username.downcase).where.not(id: account.id).each do |duplicate|
puts " " + pastel.red("Duplicate: ") + admin_account_url(duplicate.id)
puts ' ' + pastel.red('Duplicate: ') + admin_account_url(duplicate.id)
end
end
end

57
spec/controllers/api/v1/mutes_controller_spec.rb
View File

@ -3,24 +3,67 @@ require 'rails_helper'
RSpec.describe Api::V1::MutesController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:mutes') }
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:scopes) { 'read:mutes' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
before do
Fabricate(:mute, account: user.account, hide_notifications: false)
allow(controller).to receive(:doorkeeper_token) { token }
end
before { allow(controller).to receive(:doorkeeper_token) { token } }
describe 'GET #index' do
it 'returns http success' do
it 'limits according to limit parameter' do
2.times.map { Fabricate(:mute, account: user.account) }
get :index, params: { limit: 1 }
expect(body_as_json.size).to eq 1
end
it 'queries mutes in range according to max_id' do
mutes = 2.times.map { Fabricate(:mute, account: user.account) }
get :index, params: { max_id: mutes[1] }
expect(body_as_json.size).to eq 1
expect(body_as_json[0][:id]).to eq mutes[0].target_account_id.to_s
end
it 'queries mutes in range according to since_id' do
mutes = 2.times.map { Fabricate(:mute, account: user.account) }
get :index, params: { since_id: mutes[0] }
expect(body_as_json.size).to eq 1
expect(body_as_json[0][:id]).to eq mutes[1].target_account_id.to_s
end
it 'sets pagination header for next path' do
mutes = 2.times.map { Fabricate(:mute, account: user.account) }
get :index, params: { limit: 1, since_id: mutes[0] }
expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq api_v1_mutes_url(limit: 1, max_id: mutes[1])
end
it 'sets pagination header for previous path' do
mute = Fabricate(:mute, account: user.account)
get :index
expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq api_v1_mutes_url(since_id: mute)
end
it 'returns http success' do
get :index
expect(response).to have_http_status(200)
end
context 'with wrong scopes' do
let(:scopes) { 'write:mutes' }
it 'returns http forbidden' do
get :index
expect(response).to have_http_status(403)
end
end
end
describe 'GET #details' do
before do
Fabricate(:mute, account: user.account, hide_notifications: false)
get :details, params: { limit: 1 }
end