diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-03 21:17:13 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-03 21:17:13 +0000 |
commit | 757f52ff2e7e640e999082dca82d2498484201e0 (patch) | |
tree | 174c7960d5d3cd6ed7d577fa07b5d5f1ff582e11 /app | |
parent | 933eafdcd3a3803e9fcf934f6f7ade667281c527 (diff) | |
parent | 886829e96c48418adafa99cee05c809db2c4234b (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app')
35 files changed, 112 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 4b4ae6947..df4284207 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -25,6 +25,7 @@ const messages = defineMessages({ mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' }, info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' }, pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' }, + keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' }, }); const mapStateToProps = state => ({ @@ -78,6 +79,7 @@ export default class GettingStarted extends ImmutablePureComponent { navItems = navItems.concat([ <ColumnLink key='7' icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' />, <ColumnLink key='8' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' />, + <ColumnLink key='9' icon='question' text={intl.formatMessage(messages.keyboard_shortcuts)} to='/keyboard-shortcuts' hideOnMobile />, ]); return ( diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.js b/app/javascript/mastodon/features/keyboard_shortcuts/index.js index 8ab85dde9..22991fcba 100644 --- a/app/javascript/mastodon/features/keyboard_shortcuts/index.js +++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js @@ -1,5 +1,6 @@ import React from 'react'; import Column from '../ui/components/column'; +import ColumnBackButtonSlim from '../../components/column_back_button_slim'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; import ImmutablePureComponent from 'react-immutable-pure-component'; @@ -20,7 +21,8 @@ export default class KeyboardShortcuts extends ImmutablePureComponent { const { intl } = this.props; return ( - <Column icon='question' heading={intl.formatMessage(messages.heading)} hideHeadingOnMobile> + <Column icon='question' heading={intl.formatMessage(messages.heading)}> + <ColumnBackButtonSlim /> <div className='keyboard-shortcuts scrollable optionally-scrollable'> <table> <thead> diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index e26c77360..596a519bd 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -7,6 +7,7 @@ "account.followers": "المتابعون", "account.follows": "يتبع", "account.follows_you": "يتابعك", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "وسائط", "account.mention": "أُذكُر @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "أبلغ عن @{name}", "account.requested": "في انتظار الموافقة", "account.share": "مشاركة @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "إلغاء الحظر عن @{name}", "account.unblock_domain": "فك حظر {domain}", "account.unfollow": "إلغاء المتابعة", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "المفضلة", "navigation_bar.follow_requests": "طلبات المتابعة", "navigation_bar.info": "معلومات إضافية", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "خروج", "navigation_bar.mutes": "الحسابات المكتومة", "navigation_bar.pins": "التبويقات المثبتة", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 24d9deb4e..82f092648 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -7,6 +7,7 @@ "account.followers": "Последователи", "account.follows": "Следвам", "account.follows_you": "Твой последовател", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Споменаване", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Report @{name}", "account.requested": "В очакване на одобрение", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Не блокирай", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Не следвай", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.info": "Extended information", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Излизане", "navigation_bar.mutes": "Muted users", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index da42f08c0..baa9432de 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -7,6 +7,7 @@ "account.followers": "Seguidors", "account.follows": "Seguint", "account.follows_you": "et segueix", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Esmentar @{name}", "account.moved_to": "{name} s'ha mogut a:", @@ -16,6 +17,7 @@ "account.report": "Informe @{name}", "account.requested": "Esperant aprovació. Clic per a cancel·lar la petició de seguiment", "account.share": "Compartir el perfil de @{name}", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Desbloquejar @{name}", "account.unblock_domain": "Mostra {domain}", "account.unfollow": "Deixar de seguir", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favorits", "navigation_bar.follow_requests": "Sol·licituds de seguiment", "navigation_bar.info": "Informació addicional", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Tancar sessió", "navigation_bar.mutes": "Usuaris silenciats", "navigation_bar.pins": "Toots fixats", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index ff1c9fed4..343528899 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -7,6 +7,7 @@ "account.followers": "Folgende", "account.follows": "Folgt", "account.follows_you": "Folgt dir", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Medien", "account.mention": "@{name} erwähnen", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "@{name} melden", "account.requested": "Warte auf Erlaubnis. Klicke zum Abbrechen", "account.share": "Profil von @{name} teilen", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "@{name} entblocken", "account.unblock_domain": "{domain} wieder anzeigen", "account.unfollow": "Entfolgen", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoriten", "navigation_bar.follow_requests": "Folgeanfragen", "navigation_bar.info": "Über diese Instanz", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Abmelden", "navigation_bar.mutes": "Stummgeschaltete Profile", "navigation_bar.pins": "Angeheftete Beiträge", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 2f9a69315..be751589e 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -400,6 +400,14 @@ "id": "account.unblock_domain" }, { + "defaultMessage": "Hide boosts from @{name}", + "id": "account.hide_reblogs" + }, + { + "defaultMessage": "Show boosts from @{name}", + "id": "account.show_reblogs" + }, + { "defaultMessage": "Information below may reflect the user's profile incompletely.", "id": "account.disclaimer_full" }, @@ -850,6 +858,10 @@ "id": "navigation_bar.pins" }, { + "defaultMessage": "Keyboard shortcuts", + "id": "navigation_bar.keyboard_shortcuts" + }, + { "defaultMessage": "FAQ", "id": "getting_started.faq" }, diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index df277112c..4e0b838b0 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -7,6 +7,7 @@ "account.followers": "Followers", "account.follows": "Follows", "account.follows_you": "Follows you", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Mention @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Report @{name}", "account.requested": "Awaiting approval. Click to cancel follow request", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Unblock @{name}", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Unfollow", @@ -110,7 +112,7 @@ "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.heading": "Keyboard Shortcuts", + "keyboard_shortcuts.heading": "Keyboard shortcuts", "keyboard_shortcuts.hotkey": "Hotkey", "keyboard_shortcuts.legend": "to display this legend", "keyboard_shortcuts.mention": "to mention author", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.info": "About this instance", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Logout", "navigation_bar.mutes": "Muted users", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 1da06342d..f9e32ba5e 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -7,6 +7,7 @@ "account.followers": "Sekvantoj", "account.follows": "Sekvatoj", "account.follows_you": "Sekvas vin", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Sonbildaĵoj", "account.mention": "Mencii @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Signali @{name}", "account.requested": "Atendas aprobon", "account.share": "Diskonigi la profilon de @{name}", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Malbloki @{name}", "account.unblock_domain": "Malkaŝi {domain}", "account.unfollow": "Ne plus sekvi", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoritaj", "navigation_bar.follow_requests": "Abonpetoj", "navigation_bar.info": "Plia informo", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Elsaluti", "navigation_bar.mutes": "Silentigitaj uzantoj", "navigation_bar.pins": "Alpinglitaj pepoj", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 560427d78..38ba291e4 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -7,6 +7,7 @@ "account.followers": "Seguidores", "account.follows": "Sigue", "account.follows_you": "Te sigue", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Mencionar a @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Reportar a @{name}", "account.requested": "Esperando aprobación", "account.share": "Compartir el perfil de @{name}", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Desbloquear a @{name}", "account.unblock_domain": "Mostrar a {domain}", "account.unfollow": "Dejar de seguir", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoritos", "navigation_bar.follow_requests": "Solicitudes para seguirte", "navigation_bar.info": "Información adicional", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Cerrar sesión", "navigation_bar.mutes": "Usuarios silenciados", "navigation_bar.pins": "Toots fijados", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 1cb28b9d7..dafb52bb5 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -7,6 +7,7 @@ "account.followers": "پیگیران", "account.follows": "پی میگیرد", "account.follows_you": "پیگیر شماست", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "رسانه", "account.mention": "نامبردن از @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "گزارش @{name}", "account.requested": "در انتظار پذیرش", "account.share": "همرسانی نمایهٔ @{name}", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "رفع انسداد @{name}", "account.unblock_domain": "رفع پنهانسازی از {domain}", "account.unfollow": "پایان پیگیری", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "پسندیدهها", "navigation_bar.follow_requests": "درخواستهای پیگیری", "navigation_bar.info": "اطلاعات تکمیلی", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "خروج", "navigation_bar.mutes": "کاربران بیصداشده", "navigation_bar.pins": "نوشتههای ثابت", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index 6129f08dc..e3739eb68 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -7,6 +7,7 @@ "account.followers": "Seuraajia", "account.follows": "Seuraa", "account.follows_you": "Seuraa sinua", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Mainitse @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Report @{name}", "account.requested": "Odottaa hyväksyntää", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Salli @{name}", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Lopeta seuraaminen", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.info": "Extended information", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Kirjaudu ulos", "navigation_bar.mutes": "Muted users", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 9d9b58076..e4cabf52c 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -7,6 +7,7 @@ "account.followers": "Abonné⋅e⋅s", "account.follows": "Abonnements", "account.follows_you": "Vous suit", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Média", "account.mention": "Mentionner", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Signaler", "account.requested": "Invitation envoyée", "account.share": "Partager le profil de @{name}", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Débloquer", "account.unblock_domain": "Ne plus masquer {domain}", "account.unfollow": "Ne plus suivre", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoris", "navigation_bar.follow_requests": "Demandes de suivi", "navigation_bar.info": "Plus d’informations", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Déconnexion", "navigation_bar.mutes": "Comptes masqués", "navigation_bar.pins": "Pouets épinglés", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 00595217c..fdebdf92a 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -7,6 +7,7 @@ "account.followers": "עוקבים", "account.follows": "נעקבים", "account.follows_you": "במעקב אחריך", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "מדיה", "account.mention": "אזכור של @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "לדווח על @{name}", "account.requested": "בהמתנה לאישור", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "הסרת חסימה מעל @{name}", "account.unblock_domain": "הסר חסימה מקהילת {domain}", "account.unfollow": "הפסקת מעקב", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "חיבובים", "navigation_bar.follow_requests": "בקשות מעקב", "navigation_bar.info": "מידע נוסף", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "יציאה", "navigation_bar.mutes": "השתקות", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 4e19e5a9b..497917b9c 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -7,6 +7,7 @@ "account.followers": "Sljedbenici", "account.follows": "Slijedi", "account.follows_you": "te slijedi", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Spomeni @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Prijavi @{name}", "account.requested": "Čeka pristanak", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Deblokiraj @{name}", "account.unblock_domain": "Poništi sakrivanje {domain}", "account.unfollow": "Prestani slijediti", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoriti", "navigation_bar.follow_requests": "Zahtjevi za slijeđenje", "navigation_bar.info": "Više informacija", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Odjavi se", "navigation_bar.mutes": "Utišani korisnici", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 187796c00..6df09aea9 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -7,6 +7,7 @@ "account.followers": "Követők", "account.follows": "Követve", "account.follows_you": "Követnek téged", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Említés", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Report @{name}", "account.requested": "Awaiting approval", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Blokkolás levétele", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Követés abbahagyása", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.info": "Extended information", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Kijelentkezés", "navigation_bar.mutes": "Muted users", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 414442056..66aff71f0 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -7,6 +7,7 @@ "account.followers": "Pengikut", "account.follows": "Mengikuti", "account.follows_you": "Mengikuti anda", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Balasan @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Laporkan @{name}", "account.requested": "Menunggu persetujuan", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Hapus blokir @{name}", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Berhenti mengikuti", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favorit", "navigation_bar.follow_requests": "Permintaan mengikuti", "navigation_bar.info": "Informasi selengkapnya", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Keluar", "navigation_bar.mutes": "Pengguna dibisukan", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index b37574f05..673f895fe 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -7,6 +7,7 @@ "account.followers": "Sequanti", "account.follows": "Sequas", "account.follows_you": "Sequas tu", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Mencionar @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Denuncar @{name}", "account.requested": "Vartante aprobo", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Desblokusar @{name}", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Ne plus sequar", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favorati", "navigation_bar.follow_requests": "Demandi di sequado", "navigation_bar.info": "Detaloza informi", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Ekirar", "navigation_bar.mutes": "Celita uzeri", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 4a739155c..3d2d47471 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -7,6 +7,7 @@ "account.followers": "Seguaci", "account.follows": "Segue", "account.follows_you": "Ti segue", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Menziona @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Segnala @{name}", "account.requested": "In attesa di approvazione", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Sblocca @{name}", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Non seguire", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Apprezzati", "navigation_bar.follow_requests": "Richieste di amicizia", "navigation_bar.info": "Informazioni estese", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Logout", "navigation_bar.mutes": "Utenti silenziati", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 4d3881ff2..388dd57e8 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -7,6 +7,7 @@ "account.followers": "フォロワー", "account.follows": "フォロー", "account.follows_you": "フォローされています", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "メディア", "account.mention": "返信", "account.moved_to": "{name}さんは引っ越しました:", @@ -16,6 +17,7 @@ "account.report": "通報", "account.requested": "承認待ち", "account.share": "@{name} のプロフィールを共有する", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "ブロック解除", "account.unblock_domain": "{domain}を表示", "account.unfollow": "フォロー解除", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "お気に入り", "navigation_bar.follow_requests": "フォローリクエスト", "navigation_bar.info": "このインスタンスについて", + "navigation_bar.keyboard_shortcuts": "キーボードショートカット", "navigation_bar.logout": "ログアウト", "navigation_bar.mutes": "ミュートしたユーザー", "navigation_bar.pins": "固定されたトゥート", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 226bd17f1..03028fc31 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -7,6 +7,7 @@ "account.followers": "팔로워", "account.follows": "팔로우", "account.follows_you": "날 팔로우합니다", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "미디어", "account.mention": "답장", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "신고", "account.requested": "승인 대기 중", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "차단 해제", "account.unblock_domain": "{domain} 숨김 해제", "account.unfollow": "팔로우 해제", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "즐겨찾기", "navigation_bar.follow_requests": "팔로우 요청", "navigation_bar.info": "이 인스턴스에 대해서", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "로그아웃", "navigation_bar.mutes": "뮤트 중인 사용자", "navigation_bar.pins": "고정된 툿", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index b53013ddb..218709899 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -7,6 +7,7 @@ "account.followers": "Volgers", "account.follows": "Volgt", "account.follows_you": "Volgt jou", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Vermeld @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Rapporteer @{name}", "account.requested": "Wacht op goedkeuring. Klik om volgverzoek te annuleren.", "account.share": "Profiel van @{name} delen", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Deblokkeer @{name}", "account.unblock_domain": "{domain} niet meer negeren", "account.unfollow": "Ontvolgen", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favorieten", "navigation_bar.follow_requests": "Volgverzoeken", "navigation_bar.info": "Uitgebreide informatie", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Afmelden", "navigation_bar.mutes": "Genegeerde gebruikers", "navigation_bar.pins": "Vastgezette toots", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index 21a41237c..234589d34 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -7,6 +7,7 @@ "account.followers": "Følgere", "account.follows": "Følger", "account.follows_you": "Følger deg", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Nevn @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Rapportér @{name}", "account.requested": "Venter på godkjennelse", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Avblokker @{name}", "account.unblock_domain": "Vis {domain}", "account.unfollow": "Avfølg", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Likt", "navigation_bar.follow_requests": "Følgeforespørsler", "navigation_bar.info": "Utvidet informasjon", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Logg ut", "navigation_bar.mutes": "Dempede brukere", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 438167c6d..6e68d6810 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -7,6 +7,7 @@ "account.followers": "Seguidors", "account.follows": "Abonaments", "account.follows_you": "Vos sèc", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Mèdias", "account.mention": "Mencionar @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Senhalar @{name}", "account.requested": "Invitacion mandada. Clicatz per anullar.", "account.share": "Partejar lo perfil a @{name}", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Desblocar @{name}", "account.unblock_domain": "Desblocar {domain}", "account.unfollow": "Quitar de sègre", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favorits", "navigation_bar.follow_requests": "Demandas d'abonament", "navigation_bar.info": "Mai informacions", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Desconnexion", "navigation_bar.mutes": "Personas rescondudas", "navigation_bar.pins": "Tuts penjats", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 25295f25b..907999940 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -134,6 +134,7 @@ "navigation_bar.favourites": "Ulubione", "navigation_bar.follow_requests": "Prośby o śledzenie", "navigation_bar.info": "Szczegółowe informacje", + "navigation_bar.keyboard_shortcuts": "Skróty klawiszowe", "navigation_bar.logout": "Wyloguj", "navigation_bar.mutes": "Wyciszeni użytkownicy", "navigation_bar.pins": "Przypięte wpisy", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 2931faac5..ba0d2093e 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -7,6 +7,7 @@ "account.followers": "Seguidores", "account.follows": "Segue", "account.follows_you": "Segue você", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Mídia", "account.mention": "Mencionar @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Denunciar @{name}", "account.requested": "Aguardando aprovação. Clique para cancelar a solicitação.", "account.share": "Compartilhar perfil de @{name}", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Desbloquear @{name}", "account.unblock_domain": "Desbloquear {domain}", "account.unfollow": "Deixar de seguir", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoritos", "navigation_bar.follow_requests": "Seguidores pendentes", "navigation_bar.info": "Mais informações", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Sair", "navigation_bar.mutes": "Usuários silenciados", "navigation_bar.pins": "Postagens fixadas", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index a420a7121..f349bd191 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -7,6 +7,7 @@ "account.followers": "Seguidores", "account.follows": "Segue", "account.follows_you": "É teu seguidor", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Mencionar @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Denunciar @{name}", "account.requested": "A aguardar aprovação", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Não bloquear @{name}", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Deixar de seguir", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoritos", "navigation_bar.follow_requests": "Seguidores pendentes", "navigation_bar.info": "Mais informações", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Sair", "navigation_bar.mutes": "Utilizadores silenciados", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 1fed90e10..df52eca14 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -7,6 +7,7 @@ "account.followers": "Подписаны", "account.follows": "Подписки", "account.follows_you": "Подписан(а) на Вас", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Медиаконтент", "account.mention": "Упомянуть", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Пожаловаться", "account.requested": "Ожидает подтверждения", "account.share": "Поделиться профилем @{name}", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Разблокировать", "account.unblock_domain": "Разблокировать {domain}", "account.unfollow": "Отписаться", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Понравившееся", "navigation_bar.follow_requests": "Запросы на подписку", "navigation_bar.info": "Об узле", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Выйти", "navigation_bar.mutes": "Список глушения", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 9ded5ba3e..5f887ef34 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -7,6 +7,7 @@ "account.followers": "Följare", "account.follows": "Följer", "account.follows_you": "Följer dig", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Nämna @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Rapportera @{name}", "account.requested": "Inväntar godkännande. Klicka för att avbryta följförfrågan", "account.share": "Dela @{name}'s profil", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Avblockera @{name}", "account.unblock_domain": "Ta fram {domain}", "account.unfollow": "Sluta följa", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoriter", "navigation_bar.follow_requests": "Följförfrågningar", "navigation_bar.info": "Om denna instans", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Logga ut", "navigation_bar.mutes": "Tystade användare", "navigation_bar.pins": "Nålade inlägg (toots)", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index b59206def..7b2b13202 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -7,6 +7,7 @@ "account.followers": "Followers", "account.follows": "Follows", "account.follows_you": "Follows you", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Mention @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Report @{name}", "account.requested": "Awaiting approval", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Unblock @{name}", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Unfollow", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favourites", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.info": "About this instance", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Logout", "navigation_bar.mutes": "Muted users", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index ae88ff5b6..dd5a96bdb 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -7,6 +7,7 @@ "account.followers": "Takipçiler", "account.follows": "Takip ettikleri", "account.follows_you": "Seni takip ediyor", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Media", "account.mention": "Bahset @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Rapor et @{name}", "account.requested": "Onay bekleniyor", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Engeli kaldır @{name}", "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Takipten vazgeç", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Favoriler", "navigation_bar.follow_requests": "Takip istekleri", "navigation_bar.info": "Genişletilmiş bilgi", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Çıkış", "navigation_bar.mutes": "Sessize alınmış kullanıcılar", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index ab2f07c8a..6206cd65b 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -7,6 +7,7 @@ "account.followers": "Підписники", "account.follows": "Підписки", "account.follows_you": "Підписаний(-а) на Вас", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "Медія", "account.mention": "Згадати", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "Поскаржитися", "account.requested": "Очікує підтвердження", "account.share": "Share @{name}'s profile", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "Розблокувати", "account.unblock_domain": "Розблокувати {domain}", "account.unfollow": "Відписатися", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "Вподобане", "navigation_bar.follow_requests": "Запити на підписку", "navigation_bar.info": "Про інстанцію", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "Вийти", "navigation_bar.mutes": "Заглушені користувачі", "navigation_bar.pins": "Pinned toots", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 7f6d68a5e..c23868cda 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -7,6 +7,7 @@ "account.followers": "关注者", "account.follows": "正在关注", "account.follows_you": "关注了你", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "媒体", "account.mention": "提及 @{name}", "account.moved_to": "{name} 已经迁移到:", @@ -16,6 +17,7 @@ "account.report": "举报 @{name}", "account.requested": "正在等待对方同意。点击以取消发送关注请求", "account.share": "分享 @{name} 的个人资料", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "不再屏蔽 @{name}", "account.unblock_domain": "不再隐藏来自 {domain} 的内容", "account.unfollow": "取消关注", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "收藏的内容", "navigation_bar.follow_requests": "关注请求", "navigation_bar.info": "关于本站", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "注销", "navigation_bar.mutes": "被隐藏的用户", "navigation_bar.pins": "置顶嘟文", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index e35f813bc..a1c7aa875 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -7,6 +7,7 @@ "account.followers": "關注的人", "account.follows": "正關注", "account.follows_you": "關注你", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "媒體", "account.mention": "提及 @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "舉報 @{name}", "account.requested": "等候審批", "account.share": "分享 @{name} 的個人資料", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "解除對 @{name} 的封鎖", "account.unblock_domain": "不再隱藏 {domain}", "account.unfollow": "取消關注", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "最愛的內容", "navigation_bar.follow_requests": "關注請求", "navigation_bar.info": "關於本服務站", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "登出", "navigation_bar.mutes": "被你靜音的用戶", "navigation_bar.pins": "置頂文章", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index c6ac7879d..b52c5a810 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -7,6 +7,7 @@ "account.followers": "專注者", "account.follows": "正關注", "account.follows_you": "關注你", + "account.hide_reblogs": "Hide boosts from @{name}", "account.media": "媒體", "account.mention": "提到 @{name}", "account.moved_to": "{name} has moved to:", @@ -16,6 +17,7 @@ "account.report": "檢舉 @{name}", "account.requested": "正在等待許可", "account.share": "分享 @{name} 的用者資訊", + "account.show_reblogs": "Show boosts from @{name}", "account.unblock": "取消封鎖 @{name}", "account.unblock_domain": "不再隱藏 {domain}", "account.unfollow": "取消關注", @@ -132,6 +134,7 @@ "navigation_bar.favourites": "最愛", "navigation_bar.follow_requests": "關注請求", "navigation_bar.info": "關於本站", + "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.logout": "登出", "navigation_bar.mutes": "消音的使用者", "navigation_bar.pins": "置頂貼文", |