No OneTemporary
Actions

Size

475 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/src/App.scss b/src/App.scss
	index 539c978789..dcc913d6fc 100644
	--- a/src/App.scss
	+++ b/src/App.scss
	@@ -1,737 +1,737 @@
	@import './_variables.scss';

	#app {
	min-height: 100vh;
	max-width: 100%;
	overflow: hidden;
	}

	.app-bg-wrapper {
	position: fixed;
	z-index: -1;
	height: 100%;
	width: 100%;
	background-size: cover;
	background-repeat: no-repeat;
	background-position: 0 50%;
	}

	i {
	user-select: none;
	}

	h4 {
	margin: 0;
	}

	#content {
	box-sizing: border-box;
	padding-top: 60px;
	margin: auto;
	min-height: 100vh;
	max-width: 980px;
	background-color: rgba(0,0,0,0.15);
	align-content: flex-start;
	}

	.text-center {
	text-align: center;
	}

	body {
	font-family: sans-serif;
	font-family: var(--interfaceFont, sans-serif);
	font-size: 14px;
	margin: 0;
	color: $fallback--text;
	color: var(--text, $fallback--text);
	max-width: 100vw;
	overflow-x: hidden;
	}

	a {
	text-decoration: none;
	color: $fallback--link;
	color: var(--link, $fallback--link);
	}

	button {
	user-select: none;
	color: $fallback--text;
	color: var(--btnText, $fallback--text);
	background-color: $fallback--fg;
	background-color: var(--btn, $fallback--fg);
	border: none;
	border-radius: $fallback--btnRadius;
	border-radius: var(--btnRadius, $fallback--btnRadius);
	cursor: pointer;
	box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 1), 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
	box-shadow: var(--buttonShadow);
	font-size: 14px;
	font-family: sans-serif;
	font-family: var(--interfaceFont, sans-serif);

	i[class*=icon-] {
	color: $fallback--text;
	color: var(--btnText, $fallback--text);
	}

	&::-moz-focus-inner {
	border: none;
	}

	&:hover {
	box-shadow: 0px 0px 4px rgba(255, 255, 255, 0.3);
	box-shadow: var(--buttonHoverShadow);
	}

	&:active {
	box-shadow: 0px 0px 4px 0px rgba(255, 255, 255, 0.3), 0px 1px 0px 0px rgba(0, 0, 0, 0.2) inset, 0px -1px 0px 0px rgba(255, 255, 255, 0.2) inset;
	box-shadow: var(--buttonPressedShadow);
	}

	&:disabled {
	cursor: not-allowed;
	opacity: 0.5;
	}

	&.pressed {
	color: $fallback--faint;
	color: var(--faint, $fallback--faint);
	background-color: $fallback--bg;
	background-color: var(--bg, $fallback--bg)
	}
	}

	label.select {
	padding: 0;

	}

	input, textarea, .select {
	border: none;
	border-radius: $fallback--inputRadius;
	border-radius: var(--inputRadius, $fallback--inputRadius);
	box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.2) inset, 0px -1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px 0px 2px 0px rgba(0, 0, 0, 1) inset;
	box-shadow: var(--inputShadow);
	background-color: $fallback--fg;
	background-color: var(--input, $fallback--fg);
	color: $fallback--lightText;
	color: var(--inputText, $fallback--lightText);
	font-family: sans-serif;
	font-family: var(--inputFont, sans-serif);
	font-size: 14px;
	padding: 8px .5em;
	box-sizing: border-box;
	display: inline-block;
	position: relative;
	height: 28px;
	line-height: 16px;
	hyphens: none;

	&:disabled, &[disabled=disabled] {
	cursor: not-allowed;
	opacity: 0.5;
	}

	.icon-down-open {
	position: absolute;
	top: 0;
	bottom: 0;
	right: 5px;
	height: 100%;
	color: $fallback--text;
	color: var(--text, $fallback--text);
	line-height: 28px;
	z-index: 0;
	pointer-events: none;
	}

	select {
	-webkit-appearance: none;
	-moz-appearance: none;
	appearance: none;
	background: transparent;
	border: none;
	color: $fallback--text;
	- color: var(--text, $fallback--text);
	+ color: var(--inputText, --text, $fallback--text);
	margin: 0;
	padding: 0 2em 0 .2em;
	font-family: sans-serif;
	font-family: var(--inputFont, sans-serif);
	font-size: 14px;
	width: 100%;
	z-index: 1;
	height: 28px;
	line-height: 16px;
	}

	&[type=range] {
	background: none;
	border: none;
	margin: 0;
	box-shadow: none;
	flex: 1;
	}

	&[type=radio],
	&[type=checkbox] {
	display: none;
	&:checked + label::before {
	color: $fallback--text;
	color: var(--text, $fallback--text);
	}
	&:disabled {
	&,
	& + label,
	& + label::before {
	opacity: .5;
	}
	}
	+ label::before {
	display: inline-block;
	content: '✔';
	transition: color 200ms;
	width: 1.1em;
	height: 1.1em;
	border-radius: $fallback--checkboxRadius;
	border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
	box-shadow: 0px 0px 2px black inset;
	box-shadow: var(--inputShadow);
	margin-right: .5em;
	background-color: $fallback--fg;
	background-color: var(--input, $fallback--fg);
	vertical-align: top;
	text-align: center;
	line-height: 1.1em;
	font-size: 1.1em;
	box-sizing: border-box;
	color: transparent;
	overflow: hidden;
	box-sizing: border-box;
	}
	}
	}

	option {
	color: $fallback--text;
	color: var(--text, $fallback--text);
	background-color: $fallback--bg;
	background-color: var(--bg, $fallback--bg);
	}

	i[class*=icon-] {
	color: $fallback--icon;
	color: var(--icon, $fallback--icon)
	}


	.container {
	display: flex;
	flex-wrap: wrap;
	margin: 0;
	padding: 0 10px 0 10px;
	}

	.item {
	flex: 1;
	line-height: 50px;
	height: 50px;
	overflow: hidden;
	display: flex;
	flex-wrap: wrap;

	.nav-icon {
	margin-left: 0.4em;
	}

	&.right {
	justify-content: flex-end;
	}
	}

	.auto-size {
	flex: 1
	}

	.nav-bar {
	padding: 0;
	width: 100%;
	align-items: center;
	position: fixed;
	height: 50px;

	.logo {
	display: flex;
	position: absolute;
	top: 0;
	bottom: 0;
	left: 0;
	right: 0;

	align-items: stretch;
	justify-content: center;
	flex: 0 0 auto;
	z-index: -1;
	transition: opacity;
	transition-timing-function: ease-out;
	transition-duration: 100ms;

	.mask {
	mask-repeat: no-repeat;
	mask-position: center;
	mask-size: contain;
	background-color: $fallback--fg;
	background-color: var(--topBarText, $fallback--fg);
	position: absolute;
	top: 0;
	bottom: 0;
	left: 0;
	right: 0;
	}

	img {
	height: 100%;
	object-fit: contain;
	display: block;
	flex: 0;
	}
	}

	.inner-nav {
	margin: auto;
	box-sizing: border-box;
	padding-left: 10px;
	padding-right: 10px;
	display: flex;
	align-items: center;
	flex-basis: 970px;
	height: 50px;

	a, a i {
	color: $fallback--link;
	color: var(--topBarLink, $fallback--link);
	}
	}
	}

	main-router {
	flex: 1;
	}

	.status.compact {
	color: rgba(0, 0, 0, 0.42);
	font-weight: 300;

	p {
	margin: 0;
	font-size: 0.8em
	}
	}

	/* Panel */

	.panel {
	display: flex;
	position: relative;

	flex-direction: column;
	margin: 0.5em;

	background-color: $fallback--bg;
	background-color: var(--bg, $fallback--bg);

	&::after, & {
	border-radius: $fallback--panelRadius;
	border-radius: var(--panelRadius, $fallback--panelRadius);
	}

	&::after {
	content: '';
	position: absolute;

	top: 0;
	bottom: 0;
	left: 0;
	right: 0;

	pointer-events: none;

	box-shadow: 1px 1px 4px rgba(0,0,0,.6);
	box-shadow: var(--panelShadow);
	}
	}

	.panel-body:empty::before {
	content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations
	display: block;
	margin: 1em;
	text-align: center;
	}

	.panel-heading {
	display: flex;
	border-radius: $fallback--panelRadius $fallback--panelRadius 0 0;
	border-radius: var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius) 0 0;
	background-size: cover;
	padding: .6em .6em;
	text-align: left;
	line-height: 28px;
	color: var(--panelText);
	background-color: $fallback--fg;
	background-color: var(--panel, $fallback--fg);
	align-items: baseline;
	box-shadow: var(--panelHeaderShadow);

	.title {
	flex: 1 0 auto;
	font-size: 1.3em;
	}

	.faint {
	background-color: transparent;
	color: $fallback--faint;
	color: var(--panelFaint, $fallback--faint);
	}

	.alert {
	white-space: nowrap;
	text-overflow: ellipsis;
	overflow-x: hidden;
	}

	button {
	flex-shrink: 0;
	}

	button, .alert {
	// height: 100%;
	line-height: 21px;
	min-height: 0;
	box-sizing: border-box;
	margin: 0;
	margin-left: .25em;
	min-width: 1px;
	align-self: stretch;
	}

	a {
	color: $fallback--link;
	color: var(--panelLink, $fallback--link)
	}
	}

	.panel-heading.stub {
	border-radius: $fallback--panelRadius;
	border-radius: var(--panelRadius, $fallback--panelRadius);
	}

	.panel-footer {
	border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
	border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);


	.faint {
	color: $fallback--faint;
	color: var(--panelFaint, $fallback--faint);
	}

	a {
	color: $fallback--link;
	color: var(--panelLink, $fallback--link)
	}
	}

	.panel-body > p {
	line-height: 18px;
	padding: 1em;
	margin: 0;
	}

	.container > * {
	min-width: 0px;
	}

	.fa {
	color: grey;
	}

	nav {
	z-index: 1000;
	color: var(--topBarText);
	background-color: $fallback--fg;
	background-color: var(--topBar, $fallback--fg);
	color: $fallback--faint;
	color: var(--faint, $fallback--faint);
	box-shadow: 0px 0px 4px rgba(0,0,0,.6);
	box-shadow: var(--topBarShadow);

	.back-button {
	display: block;
	max-width: 99px;
	transition-property: opacity, max-width;
	transition-duration: 300ms;
	transition-timing-function: ease-out;

	i {
	margin: 0 1em;
	}

	&.hidden {
	opacity: 0;
	max-width: 5px;
	}
	}
	}

	.fade-enter-active, .fade-leave-active {
	transition: opacity .2s
	}
	.fade-enter, .fade-leave-active {
	opacity: 0
	}

	.main {
	flex-basis: 50%;
	flex-grow: 1;
	flex-shrink: 1;
	}

	.sidebar-bounds {
	flex: 0;
	flex-basis: 35%;
	}

	.sidebar-flexer {
	flex: 1;
	flex-basis: 345px;
	width: 365px;
	}

	.mobile-shown {
	display: none;
	}

	@media all and (min-width: 800px) {
	body {
	overflow-y: scroll;
	}

	nav {
	.back-button {
	display: none;
	}
	}

	.sidebar-bounds {
	overflow: hidden;
	max-height: 100vh;
	width: 345px;
	position: fixed;
	margin-top: -10px;

	.sidebar-scroller {
	height: 96vh;
	width: 365px;
	padding-top: 10px;
	padding-right: 50px;
	overflow-x: hidden;
	overflow-y: scroll;
	}

	.sidebar {
	width: 345px;
	}
	}
	.sidebar-flexer {
	max-height: 96vh;
	flex-shrink: 0;
	flex-grow: 0;
	}
	}
	.badge {
	display: inline-block;
	border-radius: 99px;
	min-width: 22px;
	max-width: 22px;
	min-height: 22px;
	max-height: 22px;
	font-size: 15px;
	line-height: 22px;
	text-align: center;
	vertical-align: middle;
	white-space: nowrap;
	padding: 0;

	&.badge-notification {
	background-color: $fallback--cRed;
	background-color: var(--badgeNotification, $fallback--cRed);
	color: white;
	color: var(--badgeNotificationText, white);
	}
	}

	.alert {
	margin: 0.35em;
	padding: 0.25em;
	border-radius: $fallback--tooltipRadius;
	border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
	min-height: 28px;
	line-height: 28px;

	&.error {
	background-color: $fallback--alertError;
	background-color: var(--alertError, $fallback--alertError);
	color: $fallback--text;
	color: var(--alertErrorText, $fallback--text);

	.panel-heading & {
	color: $fallback--text;
	color: var(--alertErrorPanelText, $fallback--text);
	}
	}
	}

	.faint {
	color: $fallback--faint;
	color: var(--faint, $fallback--faint);
	}

	.faint-link {
	color: $fallback--faint;
	color: var(--faint, $fallback--faint);

	&:hover {
	text-decoration: underline;
	}
	}

	@media all and (min-width: 800px) {
	.logo {
	opacity: 1 !important;
	}
	}

	.item.right {
	text-align: right;
	}

	.visibility-tray {
	font-size: 1.2em;
	padding: 3px;
	cursor: pointer;

	.selected {
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	}

	div {
	padding-top: 5px;
	}
	}

	.visibility-notice {
	padding: .5em;
	border: 1px solid $fallback--faint;
	border: 1px solid var(--faint, $fallback--faint);
	border-radius: $fallback--inputRadius;
	border-radius: var(--inputRadius, $fallback--inputRadius);
	}

	@keyframes modal-background-fadein {
	from {
	background-color: rgba(0, 0, 0, 0);
	}
	to {
	background-color: rgba(0, 0, 0, 0.5);
	}
	}

	.modal-view {
	z-index: 1000;
	position: fixed;
	top: 0;
	left: 0;
	right: 0;
	bottom: 0;
	display: flex;
	justify-content: center;
	align-items: center;
	overflow: auto;
	animation-duration: 0.2s;
	background-color: rgba(0, 0, 0, 0.5);
	animation-name: modal-background-fadein;
	}

	.button-icon {
	font-size: 1.2em;
	}

	@keyframes shakeError {
	0% {
	transform: translateX(0);
	}
	15% {
	transform: translateX(0.375rem);
	}
	30% {
	transform: translateX(-0.375rem);
	}
	45% {
	transform: translateX(0.375rem);
	}
	60% {
	transform: translateX(-0.375rem);
	}
	75% {
	transform: translateX(0.375rem);
	}
	90% {
	transform: translateX(-0.375rem);
	}
	100% {
	transform: translateX(0);
	}
	}

	@media all and (max-width: 800px) {
	.mobile-hidden {
	display: none;
	}

	.panel-switcher {
	display: flex;
	}

	.container {
	padding: 0;
	}

	.panel {
	margin: 0.5em 0 0.5em 0;
	}

	.menu-button {
	display: block;
	margin-right: 0.8em;
	}
	}

	.login-hint {
	text-align: center;

	@media all and (min-width: 801px) {
	display: none;
	}

	a {
	display: inline-block;
	padding: 1em 0px;
	width: 100%;
	}
	}

	.btn.btn-default {
	min-height: 28px;
	}
	diff --git a/src/boot/after_store.js b/src/boot/after_store.js
	index 0165ee13c0..549de497b3 100644
	--- a/src/boot/after_store.js
	+++ b/src/boot/after_store.js
	@@ -1,183 +1,270 @@
	import Vue from 'vue'
	import VueRouter from 'vue-router'
	import routes from './routes'

	import App from '../App.vue'

	-const afterStoreSetup = ({ store, i18n }) => {
	- const width = window.innerWidth \|\| document.documentElement.clientWidth \|\| document.body.clientWidth
	- store.dispatch('setMobileLayout', width <= 800)
	-
	- window.fetch('/api/statusnet/config.json')
	- .then((res) => res.json())
	- .then((data) => {
	+const getStatusnetConfig = async ({ store }) => {
	+ try {
	+ const res = await window.fetch('/api/statusnet/config.json')
	+ if (res.ok) {
	+ const data = await res.json()
	const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey } = data.site

	store.dispatch('setInstanceOption', { name: 'name', value: name })
	store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
	store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
	store.dispatch('setInstanceOption', { name: 'server', value: server })

	// TODO: default values for this stuff, added if to not make it break on
	// my dev config out of the box.
	if (uploadlimit) {
	store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadlimit.uploadlimit) })
	store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadlimit.avatarlimit) })
	store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadlimit.backgroundlimit) })
	store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadlimit.bannerlimit) })
	}

	if (vapidPublicKey) {
	store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
	}

	- var apiConfig = data.site.pleromafe
	-
	- window.fetch('/static/config.json')
	- .then((res) => res.json())
	- .catch((err) => {
	- console.warn('Failed to load static/config.json, continuing without it.')
	- console.warn(err)
	- return {}
	- })
	- .then((staticConfig) => {
	- const overrides = window.___pleromafe_dev_overrides \|\| {}
	- const env = window.___pleromafe_mode.NODE_ENV
	-
	- // This takes static config and overrides properties that are present in apiConfig
	- let config = {}
	- if (overrides.staticConfigPreference && env === 'development') {
	- console.warn('OVERRIDING API CONFIG WITH STATIC CONFIG')
	- config = Object.assign({}, apiConfig, staticConfig)
	- } else {
	- config = Object.assign({}, staticConfig, apiConfig)
	- }
	-
	- const copyInstanceOption = (name) => {
	- store.dispatch('setInstanceOption', {name, value: config[name]})
	- }
	-
	- copyInstanceOption('nsfwCensorImage')
	- copyInstanceOption('background')
	- copyInstanceOption('hidePostStats')
	- copyInstanceOption('hideUserStats')
	- copyInstanceOption('hideFilteredStatuses')
	- copyInstanceOption('logo')
	-
	- store.dispatch('setInstanceOption', {
	- name: 'logoMask',
	- value: typeof config.logoMask === 'undefined'
	- ? true
	- : config.logoMask
	- })
	-
	- store.dispatch('setInstanceOption', {
	- name: 'logoMargin',
	- value: typeof config.logoMargin === 'undefined'
	- ? 0
	- : config.logoMargin
	- })
	-
	- copyInstanceOption('redirectRootNoLogin')
	- copyInstanceOption('redirectRootLogin')
	- copyInstanceOption('showInstanceSpecificPanel')
	- copyInstanceOption('scopeOptionsEnabled')
	- copyInstanceOption('formattingOptionsEnabled')
	- copyInstanceOption('collapseMessageWithSubject')
	- copyInstanceOption('loginMethod')
	- copyInstanceOption('scopeCopy')
	- copyInstanceOption('subjectLineBehavior')
	- copyInstanceOption('postContentType')
	- copyInstanceOption('alwaysShowSubjectInput')
	- copyInstanceOption('noAttachmentLinks')
	- copyInstanceOption('showFeaturesPanel')
	-
	- if (config.chatDisabled) {
	- store.dispatch('disableChat')
	- }
	-
	- return store.dispatch('setTheme', config['theme'])
	- })
	- .then(() => {
	- const router = new VueRouter({
	- mode: 'history',
	- routes: routes(store),
	- scrollBehavior: (to, _from, savedPosition) => {
	- if (to.matched.some(m => m.meta.dontScroll)) {
	- return false
	- }
	- return savedPosition \|\| { x: 0, y: 0 }
	- }
	- })
	-
	- /* eslint-disable no-new */
	- new Vue({
	- router,
	- store,
	- i18n,
	- el: '#app',
	- render: h => h(App)
	- })
	- })
	- })
	+ return data.site.pleromafe
	+ } else {
	+ throw (res)
	+ }
	+ } catch (error) {
	+ console.error('Could not load statusnet config, potentially fatal')
	+ console.error(error)
	+ }
	+}
	+
	+const getStaticConfig = async () => {
	+ try {
	+ const res = await window.fetch('/static/config.json')
	+ if (res.ok) {
	+ return res.json()
	+ } else {
	+ throw (res)
	+ }
	+ } catch (error) {
	+ console.warn('Failed to load static/config.json, continuing without it.')
	+ console.warn(error)
	+ return {}
	+ }
	+}
	+
	+const setSettings = async ({ apiConfig, staticConfig, store }) => {
	+ const overrides = window.___pleromafe_dev_overrides \|\| {}
	+ const env = window.___pleromafe_mode.NODE_ENV
	+
	+ // This takes static config and overrides properties that are present in apiConfig
	+ let config = {}
	+ if (overrides.staticConfigPreference && env === 'development') {
	+ console.warn('OVERRIDING API CONFIG WITH STATIC CONFIG')
	+ config = Object.assign({}, apiConfig, staticConfig)
	+ } else {
	+ config = Object.assign({}, staticConfig, apiConfig)
	+ }
	+
	+ const copyInstanceOption = (name) => {
	+ store.dispatch('setInstanceOption', { name, value: config[name] })
	+ }
	+
	+ copyInstanceOption('nsfwCensorImage')
	+ copyInstanceOption('background')
	+ copyInstanceOption('hidePostStats')
	+ copyInstanceOption('hideUserStats')
	+ copyInstanceOption('hideFilteredStatuses')
	+ copyInstanceOption('logo')

	- window.fetch('/static/terms-of-service.html')
	- .then((res) => res.text())
	- .then((html) => {
	+ store.dispatch('setInstanceOption', {
	+ name: 'logoMask',
	+ value: typeof config.logoMask === 'undefined'
	+ ? true
	+ : config.logoMask
	+ })
	+
	+ store.dispatch('setInstanceOption', {
	+ name: 'logoMargin',
	+ value: typeof config.logoMargin === 'undefined'
	+ ? 0
	+ : config.logoMargin
	+ })
	+
	+ copyInstanceOption('redirectRootNoLogin')
	+ copyInstanceOption('redirectRootLogin')
	+ copyInstanceOption('showInstanceSpecificPanel')
	+ copyInstanceOption('scopeOptionsEnabled')
	+ copyInstanceOption('formattingOptionsEnabled')
	+ copyInstanceOption('collapseMessageWithSubject')
	+ copyInstanceOption('loginMethod')
	+ copyInstanceOption('scopeCopy')
	+ copyInstanceOption('subjectLineBehavior')
	+ copyInstanceOption('postContentType')
	+ copyInstanceOption('alwaysShowSubjectInput')
	+ copyInstanceOption('noAttachmentLinks')
	+ copyInstanceOption('showFeaturesPanel')
	+
	+ if ((config.chatDisabled)) {
	+ store.dispatch('disableChat')
	+ } else {
	+ store.dispatch('initializeSocket')
	+ }
	+
	+ return store.dispatch('setTheme', config['theme'])
	+}
	+
	+const getTOS = async ({ store }) => {
	+ try {
	+ const res = await window.fetch('/static/terms-of-service.html')
	+ if (res.ok) {
	+ const html = await res.text()
	store.dispatch('setInstanceOption', { name: 'tos', value: html })
	- })
	+ } else {
	+ throw (res)
	+ }
	+ } catch (e) {
	+ console.warn("Can't load TOS")
	+ console.warn(e)
	+ }
	+}
	+
	+const getInstancePanel = async ({ store }) => {
	+ try {
	+ const res = await window.fetch('/instance/panel.html')
	+ if (res.ok) {
	+ const html = await res.text()
	+ store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
	+ } else {
	+ throw (res)
	+ }
	+ } catch (e) {
	+ console.warn("Can't load instance panel")
	+ console.warn(e)
	+ }
	+}

	- window.fetch('/api/pleroma/emoji.json')
	- .then(
	- (res) => res.json()
	- .then(
	- (values) => {
	- const emoji = Object.keys(values).map((key) => {
	- return { shortcode: key, image_url: values[key] }
	- })
	- store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
	- store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
	- },
	- (failure) => {
	- store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: false })
	- }
	- ),
	- (error) => console.log(error)
	- )
	-
	- window.fetch('/static/emoji.json')
	- .then((res) => res.json())
	- .then((values) => {
	+const getStaticEmoji = async ({ store }) => {
	+ try {
	+ const res = await window.fetch('/static/emoji.json')
	+ if (res.ok) {
	+ const values = await res.json()
	const emoji = Object.keys(values).map((key) => {
	return { shortcode: key, image_url: false, 'utf': values[key] }
	})
	store.dispatch('setInstanceOption', { name: 'emoji', value: emoji })
	- })
	+ } else {
	+ throw (res)
	+ }
	+ } catch (e) {
	+ console.warn("Can't load static emoji")
	+ console.warn(e)
	+ }
	+}

	- window.fetch('/instance/panel.html')
	- .then((res) => res.text())
	- .then((html) => {
	- store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
	- })
	+// This is also used to indicate if we have a 'pleroma backend' or not.
	+// Somewhat weird, should probably be somewhere else.
	+const getCustomEmoji = async ({ store }) => {
	+ try {
	+ const res = await window.fetch('/api/pleroma/emoji.json')
	+ if (res.ok) {
	+ const values = await res.json()
	+ const emoji = Object.keys(values).map((key) => {
	+ return { shortcode: key, image_url: values[key] }
	+ })
	+ store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
	+ store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
	+ } else {
	+ throw (res)
	+ }
	+ } catch (e) {
	+ store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: false })
	+ console.warn("Can't load custom emojis, maybe not a Pleroma instance?")
	+ console.warn(e)
	+ }
	+}

	- window.fetch('/nodeinfo/2.0.json')
	- .then((res) => res.json())
	- .then((data) => {
	+const getNodeInfo = async ({ store }) => {
	+ try {
	+ const res = await window.fetch('/nodeinfo/2.0.json')
	+ if (res.ok) {
	+ const data = await res.json()
	const metadata = data.metadata

	const features = metadata.features
	store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
	store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
	store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })

	- store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
	-
	store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
	+ store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })

	const suggestions = metadata.suggestions
	store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
	store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })
	+
	+ const software = data.software
	+ store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
	+
	+ const frontendVersion = window.___pleromafe_commit_hash
	+ store.dispatch('setInstanceOption', { name: 'frontendVersion', value: frontendVersion })
	+ } else {
	+ throw (res)
	+ }
	+ } catch (e) {
	+ console.warn('Could not load nodeinfo')
	+ console.warn(e)
	+ }
	+}
	+
	+const afterStoreSetup = async ({ store, i18n }) => {
	+ if (store.state.config.customTheme) {
	+ // This is a hack to deal with async loading of config.json and themes
	+ // See: style_setter.js, setPreset()
	+ window.themeLoaded = true
	+ store.dispatch('setOption', {
	+ name: 'customTheme',
	+ value: store.state.config.customTheme
	})
	+ }
	+
	+ const width = window.innerWidth \|\| document.documentElement.clientWidth \|\| document.body.clientWidth
	+ store.dispatch('setMobileLayout', width <= 800)
	+
	+ const apiConfig = await getStatusnetConfig({ store })
	+ const staticConfig = await getStaticConfig()
	+ await setSettings({ store, apiConfig, staticConfig })
	+ await getTOS({ store })
	+ await getInstancePanel({ store })
	+ await getStaticEmoji({ store })
	+ await getCustomEmoji({ store })
	+ await getNodeInfo({ store })
	+
	+ // Now we have the server settings and can try logging in
	+ if (store.state.oauth.token) {
	+ store.dispatch('loginUser', store.state.oauth.token)
	+ }
	+
	+ const router = new VueRouter({
	+ mode: 'history',
	+ routes: routes(store),
	+ scrollBehavior: (to, _from, savedPosition) => {
	+ if (to.matched.some(m => m.meta.dontScroll)) {
	+ return false
	+ }
	+ return savedPosition \|\| { x: 0, y: 0 }
	+ }
	+ })
	+
	+ /* eslint-disable no-new */
	+ return new Vue({
	+ router,
	+ store,
	+ i18n,
	+ el: '#app',
	+ render: h => h(App)
	+ })
	}

	export default afterStoreSetup
	diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
	index 9b80c72b81..8afe8b443a 100644
	--- a/src/components/basic_user_card/basic_user_card.vue
	+++ b/src/components/basic_user_card/basic_user_card.vue
	@@ -1,62 +1,70 @@
	<template>
	<div class="basic-user-card">
	<router-link :to="userProfileLink(user)">
	<UserAvatar class="avatar" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
	</router-link>
	<div class="basic-user-card-expanded-content" v-if="userExpanded">
	<UserCard :user="user" :rounded="true" :bordered="true"/>
	</div>
	<div class="basic-user-card-collapsed-content" v-else>
	<div :title="user.name" class="basic-user-card-user-name">
	- <span v-if="user.name_html" v-html="user.name_html"></span>
	- <span v-else>{{ user.name }}</span>
	+ <span v-if="user.name_html" class="basic-user-card-user-name-value" v-html="user.name_html"></span>
	+ <span v-else class="basic-user-card-user-name-value">{{ user.name }}</span>
	</div>
	<div>
	<router-link class="basic-user-card-screen-name" :to="userProfileLink(user)">
	@{{user.screen_name}}
	</router-link>
	</div>
	<slot></slot>
	</div>
	</div>
	</template>

	<script src="./basic_user_card.js"></script>

	<style lang="scss">
	@import '../../_variables.scss';

	.basic-user-card {
	display: flex;
	flex: 1 0;
	margin: 0;
	padding-top: 0.6em;
	padding-right: 1em;
	padding-bottom: 0.6em;
	padding-left: 1em;
	border-bottom: 1px solid;
	border-bottom-color: $fallback--border;
	border-bottom-color: var(--border, $fallback--border);

	&-collapsed-content {
	margin-left: 0.7em;
	text-align: left;
	flex: 1;
	min-width: 0;
	}

	&-user-name {
	img {
	object-fit: contain;
	height: 16px;
	width: 16px;
	vertical-align: middle;
	}
	+
	+ &-value {
	+ display: inline-block;
	+ max-width: 100%;
	+ overflow: hidden;
	+ white-space: nowrap;
	+ text-overflow: ellipsis;
	+ }
	}

	&-expanded-content {
	flex: 1;
	margin-left: 0.7em;
	}
	}
	</style>
	diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
	index 11fa27b488..c459ff1b51 100644
	--- a/src/components/block_card/block_card.js
	+++ b/src/components/block_card/block_card.js
	@@ -1,37 +1,37 @@
	import BasicUserCard from '../basic_user_card/basic_user_card.vue'

	const BlockCard = {
	props: ['userId'],
	data () {
	return {
	progress: false
	}
	},
	computed: {
	user () {
	- return this.$store.getters.userById(this.userId)
	+ return this.$store.getters.findUser(this.userId)
	},
	blocked () {
	return this.user.statusnet_blocking
	}
	},
	components: {
	BasicUserCard
	},
	methods: {
	unblockUser () {
	this.progress = true
	this.$store.dispatch('unblockUser', this.user.id).then(() => {
	this.progress = false
	})
	},
	blockUser () {
	this.progress = true
	this.$store.dispatch('blockUser', this.user.id).then(() => {
	this.progress = false
	})
	}
	}
	}

	export default BlockCard
	diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js
	index 425c9c3e8f..ac4e265a78 100644
	--- a/src/components/follow_card/follow_card.js
	+++ b/src/components/follow_card/follow_card.js
	@@ -1,45 +1,50 @@
	import BasicUserCard from '../basic_user_card/basic_user_card.vue'
	+import RemoteFollow from '../remote_follow/remote_follow.vue'
	import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'

	const FollowCard = {
	props: [
	'user',
	'noFollowsYou'
	],
	data () {
	return {
	inProgress: false,
	requestSent: false,
	updated: false
	}
	},
	components: {
	- BasicUserCard
	+ BasicUserCard,
	+ RemoteFollow
	},
	computed: {
	isMe () { return this.$store.state.users.currentUser.id === this.user.id },
	following () { return this.updated ? this.updated.following : this.user.following },
	showFollow () {
	return !this.following \|\| this.updated && !this.updated.following
	+ },
	+ loggedIn () {
	+ return this.$store.state.users.currentUser
	}
	},
	methods: {
	followUser () {
	this.inProgress = true
	requestFollow(this.user, this.$store).then(({ sent, updated }) => {
	this.inProgress = false
	this.requestSent = sent
	this.updated = updated
	})
	},
	unfollowUser () {
	this.inProgress = true
	requestUnfollow(this.user, this.$store).then(({ updated }) => {
	this.inProgress = false
	this.updated = updated
	})
	}
	}
	}

	export default FollowCard
	diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
	index 6cb064eb70..9f314fd302 100644
	--- a/src/components/follow_card/follow_card.vue
	+++ b/src/components/follow_card/follow_card.vue
	@@ -1,53 +1,58 @@
	<template>
	<basic-user-card :user="user">
	<div class="follow-card-content-container">
	<span class="faint" v-if="!noFollowsYou && user.follows_you">
	{{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
	</span>
	+ <div class="follow-card-follow-button" v-if="showFollow && !loggedIn">
	+ <RemoteFollow :user="user" />
	+ </div>
	<button
	- v-if="showFollow"
	- class="btn btn-default"
	+ v-if="showFollow && loggedIn"
	+ class="btn btn-default follow-card-follow-button"
	@click="followUser"
	:disabled="inProgress"
	:title="requestSent ? $t('user_card.follow_again') : ''"
	>
	<template v-if="inProgress">
	{{ $t('user_card.follow_progress') }}
	</template>
	<template v-else-if="requestSent">
	{{ $t('user_card.follow_sent') }}
	</template>
	<template v-else>
	{{ $t('user_card.follow') }}
	</template>
	</button>
	- <button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="inProgress">
	+ <button v-if="following" class="btn btn-default follow-card-follow-button pressed" @click="unfollowUser" :disabled="inProgress">
	<template v-if="inProgress">
	{{ $t('user_card.follow_progress') }}
	</template>
	<template v-else>
	{{ $t('user_card.follow_unfollow') }}
	</template>
	</button>
	</div>
	</basic-user-card>
	</template>

	<script src="./follow_card.js"></script>

	<style lang="scss">
	-.follow-card-content-container {
	- flex-shrink: 0;
	- display: flex;
	- flex-direction: row;
	- justify-content: space-between;
	- flex-wrap: wrap;
	- line-height: 1.5em;
	+.follow-card {
	+ &-content-container {
	+ flex-shrink: 0;
	+ display: flex;
	+ flex-direction: row;
	+ justify-content: space-between;
	+ flex-wrap: wrap;
	+ line-height: 1.5em;
	+ }

	- .btn {
	+ &-follow-button {
	margin-top: 0.5em;
	margin-left: auto;
	width: 10em;
	}
	}
	</style>
	diff --git a/src/components/image_cropper/image_cropper.js b/src/components/image_cropper/image_cropper.js
	index 49d51846d0..5ba8f04ed6 100644
	--- a/src/components/image_cropper/image_cropper.js
	+++ b/src/components/image_cropper/image_cropper.js
	@@ -1,128 +1,146 @@
	import Cropper from 'cropperjs'
	import 'cropperjs/dist/cropper.css'

	const ImageCropper = {
	props: {
	trigger: {
	type: [String, window.Element],
	required: true
	},
	submitHandler: {
	type: Function,
	required: true
	},
	cropperOptions: {
	type: Object,
	default () {
	return {
	aspectRatio: 1,
	autoCropArea: 1,
	viewMode: 1,
	movable: false,
	zoomable: false,
	guides: false
	}
	}
	},
	mimes: {
	type: String,
	default: 'image/png, image/gif, image/jpeg, image/bmp, image/x-icon'
	},
	saveButtonLabel: {
	type: String
	},
	+ saveWithoutCroppingButtonlabel: {
	+ type: String
	+ },
	cancelButtonLabel: {
	type: String
	}
	},
	data () {
	return {
	cropper: undefined,
	dataUrl: undefined,
	filename: undefined,
	submitting: false,
	submitError: null
	}
	},
	computed: {
	saveText () {
	return this.saveButtonLabel \|\| this.$t('image_cropper.save')
	},
	+ saveWithoutCroppingText () {
	+ return this.saveWithoutCroppingButtonlabel \|\| this.$t('image_cropper.save_without_cropping')
	+ },
	cancelText () {
	return this.cancelButtonLabel \|\| this.$t('image_cropper.cancel')
	},
	submitErrorMsg () {
	return this.submitError && this.submitError instanceof Error ? this.submitError.toString() : this.submitError
	}
	},
	methods: {
	destroy () {
	if (this.cropper) {
	this.cropper.destroy()
	}
	this.$refs.input.value = ''
	this.dataUrl = undefined
	this.$emit('close')
	},
	submit () {
	this.submitting = true
	this.avatarUploadError = null
	this.submitHandler(this.cropper, this.file)
	.then(() => this.destroy())
	.catch((err) => {
	this.submitError = err
	})
	.finally(() => {
	this.submitting = false
	})
	},
	+ submitWithoutCropping () {
	+ this.submitting = true
	+ this.avatarUploadError = null
	+ this.submitHandler(false, this.dataUrl)
	+ .then(() => this.destroy())
	+ .catch((err) => {
	+ this.submitError = err
	+ })
	+ .finally(() => {
	+ this.submitting = false
	+ })
	+ },
	pickImage () {
	this.$refs.input.click()
	},
	createCropper () {
	this.cropper = new Cropper(this.$refs.img, this.cropperOptions)
	},
	getTriggerDOM () {
	return typeof this.trigger === 'object' ? this.trigger : document.querySelector(this.trigger)
	},
	readFile () {
	const fileInput = this.$refs.input
	if (fileInput.files != null && fileInput.files[0] != null) {
	this.file = fileInput.files[0]
	let reader = new window.FileReader()
	reader.onload = (e) => {
	this.dataUrl = e.target.result
	this.$emit('open')
	}
	reader.readAsDataURL(this.file)
	this.$emit('changed', this.file, reader)
	}
	},
	clearError () {
	this.submitError = null
	}
	},
	mounted () {
	// listen for click event on trigger
	const trigger = this.getTriggerDOM()
	if (!trigger) {
	this.$emit('error', 'No image make trigger found.', 'user')
	} else {
	trigger.addEventListener('click', this.pickImage)
	}
	// listen for input file changes
	const fileInput = this.$refs.input
	fileInput.addEventListener('change', this.readFile)
	},
	beforeDestroy: function () {
	// remove the event listeners
	const trigger = this.getTriggerDOM()
	if (trigger) {
	trigger.removeEventListener('click', this.pickImage)
	}
	const fileInput = this.$refs.input
	fileInput.removeEventListener('change', this.readFile)
	}
	}

	export default ImageCropper
	diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
	index 24a6f3bd51..129e6f469f 100644
	--- a/src/components/image_cropper/image_cropper.vue
	+++ b/src/components/image_cropper/image_cropper.vue
	@@ -1,42 +1,47 @@
	<template>
	<div class="image-cropper">
	<div v-if="dataUrl">
	<div class="image-cropper-image-container">
	<img ref="img" :src="dataUrl" alt="" @load.stop="createCropper" />
	</div>
	<div class="image-cropper-buttons-wrapper">
	<button class="btn" type="button" :disabled="submitting" @click="submit" v-text="saveText"></button>
	<button class="btn" type="button" :disabled="submitting" @click="destroy" v-text="cancelText"></button>
	+ <button class="btn" type="button" :disabled="submitting" @click="submitWithoutCropping" v-text="saveWithoutCroppingText"></button>
	<i class="icon-spin4 animate-spin" v-if="submitting"></i>
	</div>
	<div class="alert error" v-if="submitError">
	{{submitErrorMsg}}
	<i class="button-icon icon-cancel" @click="clearError"></i>
	</div>
	</div>
	<input ref="input" type="file" class="image-cropper-img-input" :accept="mimes">
	</div>
	</template>

	<script src="./image_cropper.js"></script>

	<style lang="scss">
	.image-cropper {
	&-img-input {
	display: none;
	}

	&-image-container {
	position: relative;

	img {
	display: block;
	max-width: 100%;
	}
	}

	&-buttons-wrapper {
	- margin-top: 15px;
	+ margin-top: 10px;
	+
	+ button {
	+ margin-top: 5px;
	+ }
	}
	}
	</style>
	diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js
	index 5dd0a9e565..65c9cfb5b0 100644
	--- a/src/components/mute_card/mute_card.js
	+++ b/src/components/mute_card/mute_card.js
	@@ -1,37 +1,37 @@
	import BasicUserCard from '../basic_user_card/basic_user_card.vue'

	const MuteCard = {
	props: ['userId'],
	data () {
	return {
	progress: false
	}
	},
	computed: {
	user () {
	- return this.$store.getters.userById(this.userId)
	+ return this.$store.getters.findUser(this.userId)
	},
	muted () {
	return this.user.muted
	}
	},
	components: {
	BasicUserCard
	},
	methods: {
	unmuteUser () {
	this.progress = true
	this.$store.dispatch('unmuteUser', this.user.id).then(() => {
	this.progress = false
	})
	},
	muteUser () {
	this.progress = true
	this.$store.dispatch('muteUser', this.user.id).then(() => {
	this.progress = false
	})
	}
	}
	}

	export default MuteCard
	diff --git a/src/components/remote_follow/remote_follow.js b/src/components/remote_follow/remote_follow.js
	new file mode 100644
	index 0000000000..461d58c9c3
	--- /dev/null
	+++ b/src/components/remote_follow/remote_follow.js
	@@ -0,0 +1,10 @@
	+export default {
	+ props: [ 'user' ],
	+ computed: {
	+ subscribeUrl () {
	+ // eslint-disable-next-line no-undef
	+ const serverUrl = new URL(this.user.statusnet_profile_url)
	+ return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
	+ }
	+ }
	+}
	diff --git a/src/components/remote_follow/remote_follow.vue b/src/components/remote_follow/remote_follow.vue
	new file mode 100644
	index 0000000000..fb2147bda6
	--- /dev/null
	+++ b/src/components/remote_follow/remote_follow.vue
	@@ -0,0 +1,24 @@
	+<template>
	+ <div class="remote-follow">
	+ <form method="POST" :action='subscribeUrl'>
	+ <input type="hidden" name="nickname" :value="user.screen_name">
	+ <input type="hidden" name="profile" value="">
	+ <button click="submit" class="remote-button">
	+ {{ $t('user_card.remote_follow') }}
	+ </button>
	+ </form>
	+ </div>
	+</template>
	+
	+<script src="./remote_follow.js"></script>
	+
	+<style lang="scss">
	+.remote-follow {
	+ max-width: 220px;
	+
	+ .remote-button {
	+ width: 100%;
	+ min-height: 28px;
	+ }
	+}
	+</style>
	diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
	index 979457a56f..b77c5197b5 100644
	--- a/src/components/settings/settings.js
	+++ b/src/components/settings/settings.js
	@@ -1,201 +1,215 @@
	/* eslint-env browser */
	+import { filter, trim } from 'lodash'
	+
	import TabSwitcher from '../tab_switcher/tab_switcher.js'
	import StyleSwitcher from '../style_switcher/style_switcher.vue'
	import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
	-import { filter, trim } from 'lodash'
	+import { extractCommit } from '../../services/version/version.service'
	+
	+const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
	+const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'

	const settings = {
	data () {
	const user = this.$store.state.config
	const instance = this.$store.state.instance

	return {
	hideAttachmentsLocal: user.hideAttachments,
	hideAttachmentsInConvLocal: user.hideAttachmentsInConv,
	maxThumbnails: user.maxThumbnails,
	hideNsfwLocal: user.hideNsfw,
	useOneClickNsfw: user.useOneClickNsfw,
	hideISPLocal: user.hideISP,
	preloadImage: user.preloadImage,

	hidePostStatsLocal: typeof user.hidePostStats === 'undefined'
	? instance.hidePostStats
	: user.hidePostStats,
	hidePostStatsDefault: this.$t('settings.values.' + instance.hidePostStats),

	hideUserStatsLocal: typeof user.hideUserStats === 'undefined'
	? instance.hideUserStats
	: user.hideUserStats,
	hideUserStatsDefault: this.$t('settings.values.' + instance.hideUserStats),

	hideFilteredStatusesLocal: typeof user.hideFilteredStatuses === 'undefined'
	? instance.hideFilteredStatuses
	: user.hideFilteredStatuses,
	hideFilteredStatusesDefault: this.$t('settings.values.' + instance.hideFilteredStatuses),

	notificationVisibilityLocal: user.notificationVisibility,
	replyVisibilityLocal: user.replyVisibility,
	loopVideoLocal: user.loopVideo,
	muteWordsString: user.muteWords.join('\n'),
	autoLoadLocal: user.autoLoad,
	streamingLocal: user.streaming,
	pauseOnUnfocusedLocal: user.pauseOnUnfocused,
	hoverPreviewLocal: user.hoverPreview,

	collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
	? instance.collapseMessageWithSubject
	: user.collapseMessageWithSubject,
	collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject),

	subjectLineBehaviorLocal: typeof user.subjectLineBehavior === 'undefined'
	? instance.subjectLineBehavior
	: user.subjectLineBehavior,
	subjectLineBehaviorDefault: instance.subjectLineBehavior,

	postContentTypeLocal: typeof user.postContentType === 'undefined'
	? instance.postContentType
	: user.postContentType,
	postContentTypeDefault: instance.postContentType,

	alwaysShowSubjectInputLocal: typeof user.alwaysShowSubjectInput === 'undefined'
	? instance.alwaysShowSubjectInput
	: user.alwaysShowSubjectInput,
	alwaysShowSubjectInputDefault: instance.alwaysShowSubjectInput,

	scopeCopyLocal: typeof user.scopeCopy === 'undefined'
	? instance.scopeCopy
	: user.scopeCopy,
	scopeCopyDefault: this.$t('settings.values.' + instance.scopeCopy),

	stopGifs: user.stopGifs,
	webPushNotificationsLocal: user.webPushNotifications,
	loopVideoSilentOnlyLocal: user.loopVideosSilentOnly,
	loopSilentAvailable:
	// Firefox
	Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') \|\|
	// Chrome-likes
	Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') \|\|
	// Future spec, still not supported in Nightly 63 as of 08/2018
	Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
	playVideosInModal: user.playVideosInModal,
	- useContainFit: user.useContainFit
	+ useContainFit: user.useContainFit,
	+
	+ backendVersion: instance.backendVersion,
	+ frontendVersion: instance.frontendVersion
	}
	},
	components: {
	TabSwitcher,
	StyleSwitcher,
	InterfaceLanguageSwitcher
	},
	computed: {
	user () {
	return this.$store.state.users.currentUser
	},
	currentSaveStateNotice () {
	return this.$store.state.interface.settings.currentSaveStateNotice
	},
	postFormats () {
	return this.$store.state.instance.postFormats \|\| []
	},
	- instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel }
	+ instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel },
	+ frontendVersionLink () {
	+ return pleromaFeCommitUrl + this.frontendVersion
	+ },
	+ backendVersionLink () {
	+ return pleromaBeCommitUrl + extractCommit(this.backendVersion)
	+ }
	},
	watch: {
	hideAttachmentsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideAttachments', value })
	},
	hideAttachmentsInConvLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value })
	},
	hidePostStatsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hidePostStats', value })
	},
	hideUserStatsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideUserStats', value })
	},
	hideFilteredStatusesLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideFilteredStatuses', value })
	},
	hideNsfwLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideNsfw', value })
	},
	useOneClickNsfw (value) {
	this.$store.dispatch('setOption', { name: 'useOneClickNsfw', value })
	},
	preloadImage (value) {
	this.$store.dispatch('setOption', { name: 'preloadImage', value })
	},
	hideISPLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideISP', value })
	},
	'notificationVisibilityLocal.likes' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.follows' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.repeats' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.mentions' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	replyVisibilityLocal (value) {
	this.$store.dispatch('setOption', { name: 'replyVisibility', value })
	},
	loopVideoLocal (value) {
	this.$store.dispatch('setOption', { name: 'loopVideo', value })
	},
	loopVideoSilentOnlyLocal (value) {
	this.$store.dispatch('setOption', { name: 'loopVideoSilentOnly', value })
	},
	autoLoadLocal (value) {
	this.$store.dispatch('setOption', { name: 'autoLoad', value })
	},
	streamingLocal (value) {
	this.$store.dispatch('setOption', { name: 'streaming', value })
	},
	pauseOnUnfocusedLocal (value) {
	this.$store.dispatch('setOption', { name: 'pauseOnUnfocused', value })
	},
	hoverPreviewLocal (value) {
	this.$store.dispatch('setOption', { name: 'hoverPreview', value })
	},
	muteWordsString (value) {
	value = filter(value.split('\n'), (word) => trim(word).length > 0)
	this.$store.dispatch('setOption', { name: 'muteWords', value })
	},
	collapseMessageWithSubjectLocal (value) {
	this.$store.dispatch('setOption', { name: 'collapseMessageWithSubject', value })
	},
	scopeCopyLocal (value) {
	this.$store.dispatch('setOption', { name: 'scopeCopy', value })
	},
	alwaysShowSubjectInputLocal (value) {
	this.$store.dispatch('setOption', { name: 'alwaysShowSubjectInput', value })
	},
	subjectLineBehaviorLocal (value) {
	this.$store.dispatch('setOption', { name: 'subjectLineBehavior', value })
	},
	postContentTypeLocal (value) {
	this.$store.dispatch('setOption', { name: 'postContentType', value })
	},
	stopGifs (value) {
	this.$store.dispatch('setOption', { name: 'stopGifs', value })
	},
	webPushNotificationsLocal (value) {
	this.$store.dispatch('setOption', { name: 'webPushNotifications', value })
	if (value) this.$store.dispatch('registerPushNotifications')
	},
	playVideosInModal (value) {
	this.$store.dispatch('setOption', { name: 'playVideosInModal', value })
	},
	useContainFit (value) {
	this.$store.dispatch('setOption', { name: 'useContainFit', value })
	},
	maxThumbnails (value) {
	value = this.maxThumbnails = Math.floor(Math.max(value, 0))
	this.$store.dispatch('setOption', { name: 'maxThumbnails', value })
	}
	}
	}

	export default settings
	diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
	index d234674728..17f1f1a1cb 100644
	--- a/src/components/settings/settings.vue
	+++ b/src/components/settings/settings.vue
	@@ -1,338 +1,360 @@
	<template>
	<div class="settings panel panel-default">
	<div class="panel-heading">
	<div class="title">
	{{$t('settings.settings')}}
	</div>

	<transition name="fade">
	<template v-if="currentSaveStateNotice">
	<div @click.prevent class="alert error" v-if="currentSaveStateNotice.error">
	{{ $t('settings.saving_err') }}
	</div>

	<div @click.prevent class="alert transparent" v-if="!currentSaveStateNotice.error">
	{{ $t('settings.saving_ok') }}
	</div>
	</template>
	</transition>
	</div>
	<div class="panel-body">
	<keep-alive>
	<tab-switcher>
	<div :label="$t('settings.general')" >
	<div class="setting-item">
	<h2>{{ $t('settings.interface') }}</h2>
	<ul class="setting-list">
	<li>
	<interface-language-switcher />
	</li>
	<li v-if="instanceSpecificPanelPresent">
	<input type="checkbox" id="hideISP" v-model="hideISPLocal">
	<label for="hideISP">{{$t('settings.hide_isp')}}</label>
	</li>
	</ul>
	</div>
	<div class="setting-item">
	<h2>{{$t('nav.timeline')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="collapseMessageWithSubject" v-model="collapseMessageWithSubjectLocal">
	<label for="collapseMessageWithSubject">
	{{$t('settings.collapse_subject')}} {{$t('settings.instance_default', { value: collapseMessageWithSubjectDefault })}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="streaming" v-model="streamingLocal">
	<label for="streaming">{{$t('settings.streaming')}}</label>
	<ul class="setting-list suboptions" :class="[{disabled: !streamingLocal}]">
	<li>
	<input :disabled="!streamingLocal" type="checkbox" id="pauseOnUnfocused" v-model="pauseOnUnfocusedLocal">
	<label for="pauseOnUnfocused">{{$t('settings.pause_on_unfocused')}}</label>
	</li>
	</ul>
	</li>
	<li>
	<input type="checkbox" id="autoload" v-model="autoLoadLocal">
	<label for="autoload">{{$t('settings.autoload')}}</label>
	</li>
	<li>
	<input type="checkbox" id="hoverPreview" v-model="hoverPreviewLocal">
	<label for="hoverPreview">{{$t('settings.reply_link_preview')}}</label>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.composing')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="scopeCopy" v-model="scopeCopyLocal">
	<label for="scopeCopy">
	{{$t('settings.scope_copy')}} {{$t('settings.instance_default', { value: scopeCopyDefault })}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="subjectHide" v-model="alwaysShowSubjectInputLocal">
	<label for="subjectHide">
	{{$t('settings.subject_input_always_show')}} {{$t('settings.instance_default', { value: alwaysShowSubjectInputDefault })}}
	</label>
	</li>
	<li>
	<div>
	{{$t('settings.subject_line_behavior')}}
	<label for="subjectLineBehavior" class="select">
	<select id="subjectLineBehavior" v-model="subjectLineBehaviorLocal">
	<option value="email">
	{{$t('settings.subject_line_email')}}
	{{subjectLineBehaviorDefault == 'email' ? $t('settings.instance_default_simple') : ''}}
	</option>
	<option value="masto">
	{{$t('settings.subject_line_mastodon')}}
	{{subjectLineBehaviorDefault == 'mastodon' ? $t('settings.instance_default_simple') : ''}}
	</option>
	<option value="noop">
	{{$t('settings.subject_line_noop')}}
	{{subjectLineBehaviorDefault == 'noop' ? $t('settings.instance_default_simple') : ''}}
	</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	</li>
	<li>
	<div>
	{{$t('settings.post_status_content_type')}}
	<label for="postContentType" class="select">
	<select id="postContentType" v-model="postContentTypeLocal">
	<option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat">
	{{$t(`post_status.content_type["${postFormat}"]`)}}
	{{postContentTypeDefault === postFormat ? $t('settings.instance_default_simple') : ''}}
	</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.attachments')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="hideAttachments" v-model="hideAttachmentsLocal">
	<label for="hideAttachments">{{$t('settings.hide_attachments_in_tl')}}</label>
	</li>
	<li>
	<input type="checkbox" id="hideAttachmentsInConv" v-model="hideAttachmentsInConvLocal">
	<label for="hideAttachmentsInConv">{{$t('settings.hide_attachments_in_convo')}}</label>
	</li>
	<li>
	<label for="maxThumbnails">{{$t('settings.max_thumbnails')}}</label>
	<input class="number-input" type="number" id="maxThumbnails" v-model.number="maxThumbnails" min="0" step="1">
	</li>
	<li>
	<input type="checkbox" id="hideNsfw" v-model="hideNsfwLocal">
	<label for="hideNsfw">{{$t('settings.nsfw_clickthrough')}}</label>
	</li>
	<ul class="setting-list suboptions" >
	<li>
	<input :disabled="!hideNsfwLocal" type="checkbox" id="preloadImage" v-model="preloadImage">
	<label for="preloadImage">{{$t('settings.preload_images')}}</label>
	</li>
	<li>
	<input :disabled="!hideNsfwLocal" type="checkbox" id="useOneClickNsfw" v-model="useOneClickNsfw">
	<label for="useOneClickNsfw">{{$t('settings.use_one_click_nsfw')}}</label>
	</li>
	</ul>
	<li>
	<input type="checkbox" id="stopGifs" v-model="stopGifs">
	<label for="stopGifs">{{$t('settings.stop_gifs')}}</label>
	</li>
	<li>
	<input type="checkbox" id="loopVideo" v-model="loopVideoLocal">
	<label for="loopVideo">{{$t('settings.loop_video')}}</label>
	<ul class="setting-list suboptions" :class="[{disabled: !streamingLocal}]">
	<li>
	<input :disabled="!loopVideoLocal \|\| !loopSilentAvailable" type="checkbox" id="loopVideoSilentOnly" v-model="loopVideoSilentOnlyLocal">
	<label for="loopVideoSilentOnly">{{$t('settings.loop_video_silent_only')}}</label>
	<div v-if="!loopSilentAvailable" class="unavailable">
	<i class="icon-globe"/>! {{$t('settings.limited_availability')}}
	</div>
	</li>
	</ul>
	</li>
	<li>
	<input type="checkbox" id="playVideosInModal" v-model="playVideosInModal">
	<label for="playVideosInModal">{{$t('settings.play_videos_in_modal')}}</label>
	</li>
	<li>
	<input type="checkbox" id="useContainFit" v-model="useContainFit">
	<label for="useContainFit">{{$t('settings.use_contain_fit')}}</label>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.notifications')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="webPushNotifications" v-model="webPushNotificationsLocal">
	<label for="webPushNotifications">
	{{$t('settings.enable_web_push_notifications')}}
	</label>
	</li>
	</ul>
	</div>
	</div>

	<div :label="$t('settings.theme')" >
	<div class="setting-item">
	<style-switcher></style-switcher>
	</div>
	</div>

	<div :label="$t('settings.filtering')" >
	<div class="setting-item">
	<div class="select-multiple">
	<span class="label">{{$t('settings.notification_visibility')}}</span>
	<ul class="option-list">
	<li>
	<input type="checkbox" id="notification-visibility-likes" v-model="notificationVisibilityLocal.likes">
	<label for="notification-visibility-likes">
	{{$t('settings.notification_visibility_likes')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-repeats" v-model="notificationVisibilityLocal.repeats">
	<label for="notification-visibility-repeats">
	{{$t('settings.notification_visibility_repeats')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-follows" v-model="notificationVisibilityLocal.follows">
	<label for="notification-visibility-follows">
	{{$t('settings.notification_visibility_follows')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-mentions" v-model="notificationVisibilityLocal.mentions">
	<label for="notification-visibility-mentions">
	{{$t('settings.notification_visibility_mentions')}}
	</label>
	</li>
	</ul>
	</div>
	<div>
	{{$t('settings.replies_in_timeline')}}
	<label for="replyVisibility" class="select">
	<select id="replyVisibility" v-model="replyVisibilityLocal">
	<option value="all" selected>{{$t('settings.reply_visibility_all')}}</option>
	<option value="following">{{$t('settings.reply_visibility_following')}}</option>
	<option value="self">{{$t('settings.reply_visibility_self')}}</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	<div>
	<input type="checkbox" id="hidePostStats" v-model="hidePostStatsLocal">
	<label for="hidePostStats">
	{{$t('settings.hide_post_stats')}} {{$t('settings.instance_default', { value: hidePostStatsDefault })}}
	</label>
	</div>
	<div>
	<input type="checkbox" id="hideUserStats" v-model="hideUserStatsLocal">
	<label for="hideUserStats">
	{{$t('settings.hide_user_stats')}} {{$t('settings.instance_default', { value: hideUserStatsDefault })}}
	</label>
	</div>
	</div>
	<div class="setting-item">
	<div>
	<p>{{$t('settings.filtering_explanation')}}</p>
	<textarea id="muteWords" v-model="muteWordsString"></textarea>
	</div>
	<div>
	<input type="checkbox" id="hideFilteredStatuses" v-model="hideFilteredStatusesLocal">
	<label for="hideFilteredStatuses">
	{{$t('settings.hide_filtered_statuses')}} {{$t('settings.instance_default', { value: hideFilteredStatusesDefault })}}
	</label>
	</div>
	</div>
	</div>
	+ <div :label="$t('settings.version.title')" >
	+ <div class="setting-item">
	+ <ul class="setting-list">
	+ <li>
	+ <p>{{$t('settings.version.backend_version')}}</p>
	+ <ul class="option-list">
	+ <li>
	+ <a :href="backendVersionLink" target="_blank">{{backendVersion}}</a>
	+ </li>
	+ </ul>
	+ </li>
	+ <li>
	+ <p>{{$t('settings.version.frontend_version')}}</p>
	+ <ul class="option-list">
	+ <li>
	+ <a :href="frontendVersionLink" target="_blank">{{frontendVersion}}</a>
	+ </li>
	+ </ul>
	+ </li>
	+ </ul>
	+ </div>
	+ </div>
	</tab-switcher>
	</keep-alive>
	</div>
	</div>
	</template>

	<script src="./settings.js">
	</script>

	<style lang="scss">
	@import '../../_variables.scss';

	.setting-item {
	border-bottom: 2px solid var(--fg, $fallback--fg);
	margin: 1em 1em 1.4em;
	padding-bottom: 1.4em;

	> div {
	margin-bottom: .5em;
	&:last-child {
	margin-bottom: 0;
	}
	}

	&:last-child {
	border-bottom: none;
	padding-bottom: 0;
	margin-bottom: 1em;
	}

	select {
	min-width: 10em;
	}


	textarea {
	width: 100%;
	height: 100px;
	}

	.unavailable,
	.unavailable i {
	color: var(--cRed, $fallback--cRed);
	color: $fallback--cRed;
	}

	.btn {
	min-height: 28px;
	min-width: 10em;
	padding: 0 2em;
	}

	.number-input {
	max-width: 6em;
	}
	}
	.select-multiple {
	display: flex;
	.option-list {
	margin: 0;
	padding-left: .5em;
	}
	}
	.setting-list,
	.option-list{
	list-style-type: none;
	padding-left: 2em;
	li {
	margin-bottom: 0.5em;
	}
	.suboptions {
	margin-top: 0.3em
	}
	}
	</style>
	diff --git a/src/components/status/status.js b/src/components/status/status.js
	index 9e18fe151c..c90da6d465 100644
	--- a/src/components/status/status.js
	+++ b/src/components/status/status.js
	@@ -1,394 +1,394 @@
	import Attachment from '../attachment/attachment.vue'
	import FavoriteButton from '../favorite_button/favorite_button.vue'
	import RetweetButton from '../retweet_button/retweet_button.vue'
	import DeleteButton from '../delete_button/delete_button.vue'
	import PostStatusForm from '../post_status_form/post_status_form.vue'
	import UserCard from '../user_card/user_card.vue'
	import UserAvatar from '../user_avatar/user_avatar.vue'
	import Gallery from '../gallery/gallery.vue'
	import LinkPreview from '../link-preview/link-preview.vue'
	import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
	import fileType from 'src/services/file_type/file_type.service'
	import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
	import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js'
	import { filter, find, unescape } from 'lodash'

	const Status = {
	name: 'Status',
	props: [
	'statusoid',
	'expandable',
	'inConversation',
	'focused',
	'highlight',
	'compact',
	'replies',
	'isPreview',
	'noHeading',
	'inlineExpanded'
	],
	data () {
	return {
	replying: false,
	expanded: false,
	unmuted: false,
	userExpanded: false,
	preview: null,
	showPreview: false,
	showingTall: this.inConversation && this.focused,
	showingLongSubject: false,
	expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
	? !this.$store.state.instance.collapseMessageWithSubject
	: !this.$store.state.config.collapseMessageWithSubject,
	betterShadow: this.$store.state.interface.browserSupport.cssFilter
	}
	},
	computed: {
	localCollapseSubjectDefault () {
	return typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
	? this.$store.state.instance.collapseMessageWithSubject
	: this.$store.state.config.collapseMessageWithSubject
	},
	muteWords () {
	return this.$store.state.config.muteWords
	},
	repeaterClass () {
	const user = this.statusoid.user
	return highlightClass(user)
	},
	userClass () {
	const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
	return highlightClass(user)
	},
	deleted () {
	return this.statusoid.deleted
	},
	repeaterStyle () {
	const user = this.statusoid.user
	const highlight = this.$store.state.config.highlight
	return highlightStyle(highlight[user.screen_name])
	},
	userStyle () {
	if (this.noHeading) return
	const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
	const highlight = this.$store.state.config.highlight
	return highlightStyle(highlight[user.screen_name])
	},
	hideAttachments () {
	return (this.$store.state.config.hideAttachments && !this.inConversation) \|\|
	(this.$store.state.config.hideAttachmentsInConv && this.inConversation)
	},
	userProfileLink () {
	return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name)
	},
	replyProfileLink () {
	if (this.isReply) {
	return this.generateUserProfileLink(this.status.in_reply_to_user_id, this.replyToName)
	}
	},
	retweet () { return !!this.statusoid.retweeted_status },
	retweeter () { return this.statusoid.user.name \|\| this.statusoid.user.screen_name },
	retweeterHtml () { return this.statusoid.user.name_html },
	retweeterProfileLink () { return this.generateUserProfileLink(this.statusoid.user.id, this.statusoid.user.screen_name) },
	status () {
	if (this.retweet) {
	return this.statusoid.retweeted_status
	} else {
	return this.statusoid
	}
	},
	loggedIn () {
	return !!this.$store.state.users.currentUser
	},
	muteWordHits () {
	const statusText = this.status.text.toLowerCase()
	const hits = filter(this.muteWords, (muteWord) => {
	return statusText.includes(muteWord.toLowerCase())
	})

	return hits
	},
	muted () { return !this.unmuted && (this.status.user.muted \|\| this.muteWordHits.length > 0) },
	hideFilteredStatuses () {
	return typeof this.$store.state.config.hideFilteredStatuses === 'undefined'
	? this.$store.state.instance.hideFilteredStatuses
	: this.$store.state.config.hideFilteredStatuses
	},
	hideStatus () {
	return (this.hideReply \|\| this.deleted) \|\| (this.muted && this.hideFilteredStatuses)
	},
	isFocused () {
	// retweet or root of an expanded conversation
	if (this.focused) {
	return true
	} else if (!this.inConversation) {
	return false
	}
	// use conversation highlight only when in conversation
	return this.status.id === this.highlight
	},
	// This is a bit hacky, but we want to approximate post height before rendering
	// so we count newlines (masto uses <p> for paragraphs, GS uses <br> between them)
	// as well as approximate line count by counting characters and approximating ~80
	// per line.
	//
	// Using max-height + overflow: auto for status components resulted in false positives
	// very often with japanese characters, and it was very annoying.
	tallStatus () {
	const lengthScore = this.status.statusnet_html.split(/<p\|<br/).length + this.status.text.length / 80
	return lengthScore > 20
	},
	longSubject () {
	return this.status.summary.length > 900
	},
	isReply () {
	return !!(this.status.in_reply_to_status_id && this.status.in_reply_to_user_id)
	},
	replyToName () {
	- const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id]
	- if (user) {
	- return user.screen_name
	- } else {
	+ if (this.status.in_reply_to_screen_name) {
	return this.status.in_reply_to_screen_name
	+ } else {
	+ const user = this.$store.getters.findUser(this.status.in_reply_to_user_id)
	+ return user && user.screen_name
	}
	},
	hideReply () {
	if (this.$store.state.config.replyVisibility === 'all') {
	return false
	}
	if (this.inlineExpanded \|\| this.expanded \|\| this.inConversation \|\| !this.isReply) {
	return false
	}
	if (this.status.user.id === this.$store.state.users.currentUser.id) {
	return false
	}
	if (this.status.type === 'retweet') {
	return false
	}
	var checkFollowing = this.$store.state.config.replyVisibility === 'following'
	for (var i = 0; i < this.status.attentions.length; ++i) {
	if (this.status.user.id === this.status.attentions[i].id) {
	continue
	}
	if (checkFollowing && this.status.attentions[i].following) {
	return false
	}
	if (this.status.attentions[i].id === this.$store.state.users.currentUser.id) {
	return false
	}
	}
	return this.status.attentions.length > 0
	},
	hideSubjectStatus () {
	if (this.tallStatus && !this.localCollapseSubjectDefault) {
	return false
	}
	return !this.expandingSubject && this.status.summary
	},
	hideTallStatus () {
	if (this.status.summary && this.localCollapseSubjectDefault) {
	return false
	}
	if (this.showingTall) {
	return false
	}
	return this.tallStatus
	},
	showingMore () {
	return (this.tallStatus && this.showingTall) \|\| (this.status.summary && this.expandingSubject)
	},
	nsfwClickthrough () {
	if (!this.status.nsfw) {
	return false
	}
	if (this.status.summary && this.localCollapseSubjectDefault) {
	return false
	}
	return true
	},
	replySubject () {
	if (!this.status.summary) return ''
	const decodedSummary = unescape(this.status.summary)
	const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
	? this.$store.state.instance.subjectLineBehavior
	: this.$store.state.config.subjectLineBehavior
	const startsWithRe = decodedSummary.match(/^re[: ]/i)
	if (behavior !== 'noop' && startsWithRe \|\| behavior === 'masto') {
	return decodedSummary
	} else if (behavior === 'email') {
	return 're: '.concat(decodedSummary)
	} else if (behavior === 'noop') {
	return ''
	}
	},
	attachmentSize () {
	if ((this.$store.state.config.hideAttachments && !this.inConversation) \|\|
	(this.$store.state.config.hideAttachmentsInConv && this.inConversation) \|\|
	(this.status.attachments.length > this.maxThumbnails)) {
	return 'hide'
	} else if (this.compact) {
	return 'small'
	}
	return 'normal'
	},
	galleryTypes () {
	if (this.attachmentSize === 'hide') {
	return []
	}
	return this.$store.state.config.playVideosInModal
	? ['image', 'video']
	: ['image']
	},
	galleryAttachments () {
	return this.status.attachments.filter(
	file => fileType.fileMatchesSomeType(this.galleryTypes, file)
	)
	},
	nonGalleryAttachments () {
	return this.status.attachments.filter(
	file => !fileType.fileMatchesSomeType(this.galleryTypes, file)
	)
	},
	maxThumbnails () {
	return this.$store.state.config.maxThumbnails
	}
	},
	components: {
	Attachment,
	FavoriteButton,
	RetweetButton,
	DeleteButton,
	PostStatusForm,
	UserCard,
	UserAvatar,
	Gallery,
	LinkPreview
	},
	methods: {
	visibilityIcon (visibility) {
	switch (visibility) {
	case 'private':
	return 'icon-lock'
	case 'unlisted':
	return 'icon-lock-open-alt'
	case 'direct':
	return 'icon-mail-alt'
	default:
	return 'icon-globe'
	}
	},
	linkClicked (event) {
	let { target } = event
	if (target.tagName === 'SPAN') {
	target = target.parentNode
	}
	if (target.tagName === 'A') {
	if (target.className.match(/mention/)) {
	const href = target.href
	const attn = this.status.attentions.find(attn => mentionMatchesUrl(attn, href))
	if (attn) {
	event.stopPropagation()
	event.preventDefault()
	const link = this.generateUserProfileLink(attn.id, attn.screen_name)
	this.$router.push(link)
	return
	}
	}
	if (target.className.match(/hashtag/)) {
	// Extract tag name from link url
	const tag = extractTagFromUrl(target.href)
	if (tag) {
	const link = this.generateTagLink(tag)
	this.$router.push(link)
	return
	}
	}
	window.open(target.href, '_blank')
	}
	},
	toggleReplying () {
	this.replying = !this.replying
	},
	gotoOriginal (id) {
	// only handled by conversation, not status_or_conversation
	if (this.inConversation) {
	this.$emit('goto', id)
	}
	},
	toggleExpanded () {
	this.$emit('toggleExpanded')
	},
	toggleMute () {
	this.unmuted = !this.unmuted
	},
	toggleUserExpanded () {
	this.userExpanded = !this.userExpanded
	},
	toggleShowMore () {
	if (this.showingTall) {
	this.showingTall = false
	} else if (this.expandingSubject && this.status.summary) {
	this.expandingSubject = false
	} else if (this.hideTallStatus) {
	this.showingTall = true
	} else if (this.hideSubjectStatus && this.status.summary) {
	this.expandingSubject = true
	}
	},
	replyEnter (id, event) {
	this.showPreview = true
	const targetId = id
	const statuses = this.$store.state.statuses.allStatuses

	if (!this.preview) {
	// if we have the status somewhere already
	this.preview = find(statuses, { 'id': targetId })
	// or if we have to fetch it
	if (!this.preview) {
	this.$store.state.api.backendInteractor.fetchStatus({id}).then((status) => {
	this.preview = status
	})
	}
	} else if (this.preview.id !== targetId) {
	this.preview = find(statuses, { 'id': targetId })
	}
	},
	replyLeave () {
	this.showPreview = false
	},
	generateUserProfileLink (id, name) {
	return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
	},
	generateTagLink (tag) {
	return `/tag/${tag}`
	},
	setMedia () {
	const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
	return () => this.$store.dispatch('setMedia', attachments)
	}
	},
	watch: {
	'highlight': function (id) {
	if (this.status.id === id) {
	let rect = this.$el.getBoundingClientRect()
	if (rect.top < 100) {
	// Post is above screen, match its top to screen top
	window.scrollBy(0, rect.top - 100)
	} else if (rect.height >= (window.innerHeight - 50)) {
	// Post we want to see is taller than screen so match its top to screen top
	window.scrollBy(0, rect.top - 100)
	} else if (rect.bottom > window.innerHeight - 50) {
	// Post is below screen, match its bottom to screen bottom
	window.scrollBy(0, rect.bottom - window.innerHeight + 50)
	}
	}
	}
	},
	filters: {
	capitalize: function (str) {
	return str.charAt(0).toUpperCase() + str.slice(1)
	}
	}
	}

	export default Status
	diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
	index e513b99359..e6fed3b59a 100644
	--- a/src/components/user_avatar/user_avatar.js
	+++ b/src/components/user_avatar/user_avatar.js
	@@ -1,29 +1,34 @@
	import StillImage from '../still-image/still-image.vue'

	const UserAvatar = {
	props: [
	'src',
	'betterShadow',
	'compact'
	],
	data () {
	return {
	showPlaceholder: false
	}
	},
	components: {
	StillImage
	},
	computed: {
	imgSrc () {
	return this.showPlaceholder ? '/images/avi.png' : this.src
	}
	},
	methods: {
	imageLoadError () {
	this.showPlaceholder = true
	}
	+ },
	+ watch: {
	+ src () {
	+ this.showPlaceholder = false
	+ }
	}
	}

	export default UserAvatar
	diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
	index 80d15a2746..b07da6752f 100644
	--- a/src/components/user_card/user_card.js
	+++ b/src/components/user_card/user_card.js
	@@ -1,156 +1,161 @@
	import UserAvatar from '../user_avatar/user_avatar.vue'
	+import RemoteFollow from '../remote_follow/remote_follow.vue'
	import { hex2rgb } from '../../services/color_convert/color_convert.js'
	import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
	import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'

	export default {
	props: [ 'user', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered' ],
	data () {
	return {
	followRequestInProgress: false,
	followRequestSent: false,
	hideUserStatsLocal: typeof this.$store.state.config.hideUserStats === 'undefined'
	? this.$store.state.instance.hideUserStats
	: this.$store.state.config.hideUserStats,
	betterShadow: this.$store.state.interface.browserSupport.cssFilter
	}
	},
	+ created () {
	+ this.$store.dispatch('fetchUserRelationship', this.user.id)
	+ },
	computed: {
	classes () {
	return [{
	'user-card-rounded-t': this.rounded === 'top', // set border-top-left-radius and border-top-right-radius
	'user-card-rounded': this.rounded === true, // set border-radius for all sides
	'user-card-bordered': this.bordered === true // set border for all sides
	}]
	},
	style () {
	const color = this.$store.state.config.customTheme.colors
	? this.$store.state.config.customTheme.colors.bg // v2
	: this.$store.state.config.colors.bg // v1

	if (color) {
	const rgb = (typeof color === 'string') ? hex2rgb(color) : color
	const tintColor = `rgba(${Math.floor(rgb.r)}, ${Math.floor(rgb.g)}, ${Math.floor(rgb.b)}, .5)`

	const gradient = [
	[tintColor, this.hideBio ? '60%' : ''],
	this.hideBio ? [
	color, '100%'
	] : [
	tintColor, ''
	]
	].map(_ => _.join(' ')).join(', ')

	return {
	backgroundColor: `rgb(${Math.floor(rgb.r * 0.53)}, ${Math.floor(rgb.g * 0.56)}, ${Math.floor(rgb.b * 0.59)})`,
	backgroundImage: [
	`linear-gradient(to bottom, ${gradient})`,
	`url(${this.user.cover_photo})`
	].join(', ')
	}
	}
	},
	isOtherUser () {
	return this.user.id !== this.$store.state.users.currentUser.id
	},
	subscribeUrl () {
	// eslint-disable-next-line no-undef
	const serverUrl = new URL(this.user.statusnet_profile_url)
	return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
	},
	loggedIn () {
	return this.$store.state.users.currentUser
	},
	dailyAvg () {
	const days = Math.ceil((new Date() - new Date(this.user.created_at)) / (60 * 60 * 24 * 1000))
	return Math.round(this.user.statuses_count / days)
	},
	userHighlightType: {
	get () {
	const data = this.$store.state.config.highlight[this.user.screen_name]
	return data && data.type \|\| 'disabled'
	},
	set (type) {
	const data = this.$store.state.config.highlight[this.user.screen_name]
	if (type !== 'disabled') {
	this.$store.dispatch('setHighlight', { user: this.user.screen_name, color: data && data.color \|\| '#FFFFFF', type })
	} else {
	this.$store.dispatch('setHighlight', { user: this.user.screen_name, color: undefined })
	}
	}
	},
	userHighlightColor: {
	get () {
	const data = this.$store.state.config.highlight[this.user.screen_name]
	return data && data.color
	},
	set (color) {
	this.$store.dispatch('setHighlight', { user: this.user.screen_name, color })
	}
	},
	visibleRole () {
	const validRole = (this.user.role === 'admin' \|\| this.user.role === 'moderator')
	const showRole = this.isOtherUser \|\| this.user.show_role

	return validRole && showRole && this.user.role
	}
	},
	components: {
	- UserAvatar
	+ UserAvatar,
	+ RemoteFollow
	},
	methods: {
	followUser () {
	const store = this.$store
	this.followRequestInProgress = true
	requestFollow(this.user, store).then(({sent}) => {
	this.followRequestInProgress = false
	this.followRequestSent = sent
	})
	},
	unfollowUser () {
	const store = this.$store
	this.followRequestInProgress = true
	requestUnfollow(this.user, store).then(() => {
	this.followRequestInProgress = false
	store.commit('removeStatus', { timeline: 'friends', userId: this.user.id })
	})
	},
	blockUser () {
	const store = this.$store
	store.state.api.backendInteractor.blockUser(this.user.id)
	.then((blockedUser) => {
	store.commit('addNewUsers', [blockedUser])
	store.commit('removeStatus', { timeline: 'friends', userId: this.user.id })
	store.commit('removeStatus', { timeline: 'public', userId: this.user.id })
	store.commit('removeStatus', { timeline: 'publicAndExternal', userId: this.user.id })
	})
	},
	unblockUser () {
	const store = this.$store
	store.state.api.backendInteractor.unblockUser(this.user.id)
	.then((unblockedUser) => store.commit('addNewUsers', [unblockedUser]))
	},
	toggleMute () {
	const store = this.$store
	store.commit('setMuted', {user: this.user, muted: !this.user.muted})
	store.state.api.backendInteractor.setUserMute(this.user)
	},
	setProfileView (v) {
	if (this.switcher) {
	const store = this.$store
	store.commit('setProfileView', { v })
	}
	},
	linkClicked ({target}) {
	if (target.tagName === 'SPAN') {
	target = target.parentNode
	}
	if (target.tagName === 'A') {
	window.open(target.href, '_blank')
	}
	},
	userProfileLink (user) {
	return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
	}
	}
	}
	diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
	index 690e1bde92..f4114e6e60 100644
	--- a/src/components/user_card/user_card.vue
	+++ b/src/components/user_card/user_card.vue
	@@ -1,431 +1,420 @@
	<template>
	<div class="user-card" :class="classes" :style="style">
	<div class="panel-heading">
	<div class='user-info'>
	<div class='container'>
	<router-link :to="userProfileLink(user)">
	<UserAvatar :betterShadow="betterShadow" :src="user.profile_image_url_original"/>
	</router-link>
	<div class="name-and-screen-name">
	<div class="top-line">
	<div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
	<div :title="user.name" class='user-name' v-else>{{user.name}}</div>
	<router-link :to="{ name: 'user-settings' }" v-if="!isOtherUser">
	<i class="button-icon icon-pencil usersettings" :title="$t('tool_tip.user_settings')"></i>
	</router-link>
	<a :href="user.statusnet_profile_url" target="_blank" v-if="isOtherUser && !user.is_local">
	<i class="icon-link-ext usersettings"></i>
	</a>
	</div>

	<router-link class='user-screen-name' :to="userProfileLink(user)">
	<span class="handle">@{{user.screen_name}}
	<span class="alert staff" v-if="!hideBio && !!visibleRole">{{visibleRole}}</span>
	</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
	<span v-if="!hideUserStatsLocal && !hideBio" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
	</router-link>
	</div>
	</div>
	<div class="user-meta">
	<div v-if="user.follows_you && loggedIn && isOtherUser" class="following">
	{{ $t('user_card.follows_you') }}
	</div>
	<div class="highlighter" v-if="isOtherUser && (loggedIn \|\| !switcher)">
	<!-- id's need to be unique, otherwise vue confuses which user-card checkbox belongs to -->
	<input class="userHighlightText" type="text" :id="'userHighlightColorTx'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/>
	<input class="userHighlightCl" type="color" :id="'userHighlightColor'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/>
	<label for="style-switcher" class='userHighlightSel select'>
	<select class="userHighlightSel" :id="'userHighlightSel'+user.id" v-model="userHighlightType">
	<option value="disabled">No highlight</option>
	<option value="solid">Solid bg</option>
	<option value="striped">Striped bg</option>
	<option value="side">Side stripe</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	</div>
	<div v-if="isOtherUser" class="user-interactions">
	<div class="follow" v-if="loggedIn">
	<span v-if="user.following">
	<!--Following them!-->
	<button @click="unfollowUser" class="pressed" :disabled="followRequestInProgress" :title="$t('user_card.follow_unfollow')">
	<template v-if="followRequestInProgress">
	{{ $t('user_card.follow_progress') }}
	</template>
	<template v-else>
	{{ $t('user_card.following') }}
	</template>
	</button>
	</span>
	<span v-if="!user.following">
	<button @click="followUser" :disabled="followRequestInProgress" :title="followRequestSent ? $t('user_card.follow_again') : ''">
	<template v-if="followRequestInProgress">
	{{ $t('user_card.follow_progress') }}
	</template>
	<template v-else-if="followRequestSent">
	{{ $t('user_card.follow_sent') }}
	</template>
	<template v-else>
	{{ $t('user_card.follow') }}
	</template>
	</button>
	</span>
	</div>
	<div class='mute' v-if='isOtherUser && loggedIn'>
	<span v-if='user.muted'>
	<button @click="toggleMute" class="pressed">
	{{ $t('user_card.muted') }}
	</button>
	</span>
	<span v-if='!user.muted'>
	<button @click="toggleMute">
	{{ $t('user_card.mute') }}
	</button>
	</span>
	</div>
	- <div class="remote-follow" v-if='!loggedIn && user.is_local'>
	- <form method="POST" :action='subscribeUrl'>
	- <input type="hidden" name="nickname" :value="user.screen_name">
	- <input type="hidden" name="profile" value="">
	- <button click="submit" class="remote-button">
	- {{ $t('user_card.remote_follow') }}
	- </button>
	- </form>
	+ <div v-if='!loggedIn && user.is_local'>
	+ <RemoteFollow :user="user" />
	</div>
	<div class='block' v-if='isOtherUser && loggedIn'>
	<span v-if='user.statusnet_blocking'>
	<button @click="unblockUser" class="pressed">
	{{ $t('user_card.blocked') }}
	</button>
	</span>
	<span v-if='!user.statusnet_blocking'>
	<button @click="blockUser">
	{{ $t('user_card.block') }}
	</button>
	</span>
	</div>
	</div>
	</div>
	</div>
	<div class="panel-body" v-if="!hideBio">
	<div v-if="!hideUserStatsLocal && switcher" class="user-counts">
	<div class="user-count" v-on:click.prevent="setProfileView('statuses')">
	<h5>{{ $t('user_card.statuses') }}</h5>
	<span>{{user.statuses_count}} <br></span>
	</div>
	<div class="user-count" v-on:click.prevent="setProfileView('friends')">
	<h5>{{ $t('user_card.followees') }}</h5>
	<span>{{user.friends_count}}</span>
	</div>
	<div class="user-count" v-on:click.prevent="setProfileView('followers')">
	<h5>{{ $t('user_card.followers') }}</h5>
	<span>{{user.followers_count}}</span>
	</div>
	</div>
	<p @click.prevent="linkClicked" v-if="!hideBio && user.description_html" class="user-card-bio" v-html="user.description_html"></p>
	<p v-else-if="!hideBio" class="user-card-bio">{{ user.description }}</p>
	</div>
	</div>
	</template>

	<script src="./user_card.js"></script>

	<style lang="scss">
	@import '../../_variables.scss';

	.user-card {
	background-size: cover;
	overflow: hidden;

	.panel-heading {
	padding: .5em 0;
	text-align: center;
	box-shadow: none;
	background: transparent;
	flex-direction: column;
	align-items: stretch;
	}

	.panel-body {
	word-wrap: break-word;
	background: linear-gradient(to bottom, rgba(0, 0, 0, 0), $fallback--bg 80%);
	background: linear-gradient(to bottom, rgba(0, 0, 0, 0), var(--bg, $fallback--bg) 80%);
	}

	p {
	margin-bottom: 0;
	}

	&-bio {
	text-align: center;

	img {
	object-fit: contain;
	vertical-align: middle;
	max-width: 100%;
	max-height: 400px;

	.emoji {
	width: 32px;
	height: 32px;
	}
	}
	}

	// Modifiers

	&-rounded-t {
	border-top-left-radius: $fallback--panelRadius;
	border-top-left-radius: var(--panelRadius, $fallback--panelRadius);
	border-top-right-radius: $fallback--panelRadius;
	border-top-right-radius: var(--panelRadius, $fallback--panelRadius);
	}

	&-rounded {
	border-radius: $fallback--panelRadius;
	border-radius: var(--panelRadius, $fallback--panelRadius);
	}

	&-bordered {
	border-width: 1px;
	border-style: solid;
	border-color: $fallback--border;
	border-color: var(--border, $fallback--border);
	}
	}

	.user-info {
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	padding: 0 26px;

	.container {
	padding: 16px 0 6px;
	display: flex;
	max-height: 56px;

	.avatar {
	flex: 1 0 100%;
	width: 56px;
	height: 56px;
	box-shadow: 0px 1px 8px rgba(0,0,0,0.75);
	box-shadow: var(--avatarShadow);
	object-fit: cover;
	}
	}

	&:hover .animated.avatar {
	canvas {
	display: none;
	}
	img {
	visibility: visible;
	}
	}

	.usersettings {
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	opacity: .8;
	}

	.name-and-screen-name {
	display: block;
	margin-left: 0.6em;
	text-align: left;
	text-overflow: ellipsis;
	white-space: nowrap;
	flex: 1 1 0;
	// This is so that text doesn't get overlapped by avatar's shadow if it has
	// big one
	z-index: 1;

	img {
	width: 26px;
	height: 26px;
	vertical-align: middle;
	object-fit: contain
	}
	.top-line {
	display: flex;
	}
	}

	.user-name {
	text-overflow: ellipsis;
	overflow: hidden;
	flex: 1 1 auto;
	margin-right: 1em;
	font-size: 15px;

	img {
	object-fit: contain;
	height: 16px;
	width: 16px;
	vertical-align: middle;
	}
	}

	.user-screen-name {
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	display: inline-block;
	font-weight: light;
	font-size: 15px;
	padding-right: 0.1em;
	width: 100%;
	display: flex;

	.dailyAvg {
	min-width: 1px;
	flex: 0 0 auto;
	margin-left: 1em;
	font-size: 0.7em;
	color: $fallback--text;
	color: var(--text, $fallback--text);
	}

	.handle {
	min-width: 1px;
	flex: 0 1 auto;
	text-overflow: ellipsis;
	overflow: hidden;
	}

	// TODO use proper colors
	.staff {
	text-transform: capitalize;
	color: $fallback--text;
	color: var(--btnText, $fallback--text);
	background-color: $fallback--fg;
	background-color: var(--btn, $fallback--fg);
	}
	}

	.user-meta {
	margin-bottom: .15em;
	display: flex;
	align-items: baseline;
	font-size: 14px;
	line-height: 22px;
	flex-wrap: wrap;

	.following {
	flex: 1 0 auto;
	margin: 0;
	margin-bottom: .25em;
	text-align: left;
	}

	.highlighter {
	flex: 0 1 auto;
	display: flex;
	flex-wrap: wrap;
	margin-right: -.5em;
	align-self: start;

	.userHighlightCl {
	padding: 2px 10px;
	flex: 1 0 auto;
	}

	.userHighlightSel,
	.userHighlightSel.select {
	padding-top: 0;
	padding-bottom: 0;
	flex: 1 0 auto;
	}
	.userHighlightSel.select i {
	line-height: 22px;
	}

	.userHighlightText {
	width: 70px;
	flex: 1 0 auto;
	}

	.userHighlightCl,
	.userHighlightText,
	.userHighlightSel,
	.userHighlightSel.select {
	height: 22px;
	vertical-align: top;
	margin-right: .5em;
	margin-bottom: .25em;
	}
	}
	}
	.user-interactions {
	display: flex;
	flex-flow: row wrap;
	justify-content: space-between;

	margin-right: -.75em;

	div {
	flex: 1 0 0;
	margin-right: .75em;
	margin-bottom: .6em;
	white-space: nowrap;
	}

	.mute {
	max-width: 220px;
	min-height: 28px;
	}

	- .remote-follow {
	- max-width: 220px;
	- min-height: 28px;
	- }
	-
	.follow {
	max-width: 220px;
	min-height: 28px;
	}

	button {
	width: 100%;
	height: 100%;
	margin: 0;
	}

	.remote-button {
	height: 28px !important;
	width: 92%;
	}

	.pressed {
	border-bottom-color: rgba(255, 255, 255, 0.2);
	border-top-color: rgba(0, 0, 0, 0.2);
	}
	}
	}

	.user-counts {
	display: flex;
	line-height:16px;
	padding: .5em 1.5em 0em 1.5em;
	text-align: center;
	justify-content: space-between;
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	flex-wrap: wrap;
	}

	.user-count {
	flex: 1 0 auto;
	padding: .5em 0 .5em 0;
	margin: 0 .5em;

	h5 {
	font-size:1em;
	font-weight: bolder;
	margin: 0 0 0.25em;
	}
	a {
	text-decoration: none;
	}
	}
	</style>
	diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
	index 54126514ed..82df4510f4 100644
	--- a/src/components/user_profile/user_profile.js
	+++ b/src/components/user_profile/user_profile.js
	@@ -1,157 +1,165 @@
	import { compose } from 'vue-compose'
	import get from 'lodash/get'
	import UserCard from '../user_card/user_card.vue'
	import FollowCard from '../follow_card/follow_card.vue'
	import Timeline from '../timeline/timeline.vue'
	import withLoadMore from '../../hocs/with_load_more/with_load_more'
	import withList from '../../hocs/with_list/with_list'

	const FollowerList = compose(
	withLoadMore({
	fetch: (props, $store) => $store.dispatch('addFollowers', props.userId),
	- select: (props, $store) => get($store.getters.userById(props.userId), 'followers', []),
	+ select: (props, $store) => get($store.getters.findUser(props.userId), 'followers', []),
	destory: (props, $store) => $store.dispatch('clearFollowers', props.userId),
	childPropName: 'entries',
	additionalPropNames: ['userId']
	}),
	withList({ getEntryProps: user => ({ user }) })
	)(FollowCard)

	const FriendList = compose(
	withLoadMore({
	fetch: (props, $store) => $store.dispatch('addFriends', props.userId),
	- select: (props, $store) => get($store.getters.userById(props.userId), 'friends', []),
	+ select: (props, $store) => get($store.getters.findUser(props.userId), 'friends', []),
	destory: (props, $store) => $store.dispatch('clearFriends', props.userId),
	childPropName: 'entries',
	additionalPropNames: ['userId']
	}),
	withList({ getEntryProps: user => ({ user }) })
	)(FollowCard)

	const UserProfile = {
	data () {
	return {
	- error: false
	+ error: false,
	+ fetchedUserId: null
	}
	},
	created () {
	- this.$store.commit('clearTimeline', { timeline: 'user' })
	- this.$store.commit('clearTimeline', { timeline: 'favorites' })
	- this.$store.commit('clearTimeline', { timeline: 'media' })
	- this.$store.dispatch('startFetching', { timeline: 'user', userId: this.fetchBy })
	- this.$store.dispatch('startFetching', { timeline: 'media', userId: this.fetchBy })
	- this.startFetchFavorites()
	if (!this.user.id) {
	- this.$store.dispatch('fetchUser', this.fetchBy)
	- .catch((reason) => {
	- const errorMessage = get(reason, 'error.error')
	- if (errorMessage === 'No user with such user_id') { // Known error
	- this.error = this.$t('user_profile.profile_does_not_exist')
	- } else if (errorMessage) {
	- this.error = errorMessage
	- } else {
	- this.error = this.$t('user_profile.profile_loading_error')
	- }
	- })
	+ this.fetchUserId()
	+ .then(() => this.startUp())
	+ } else {
	+ this.startUp()
	}
	},
	destroyed () {
	this.cleanUp()
	},
	computed: {
	timeline () {
	return this.$store.state.statuses.timelines.user
	},
	favorites () {
	return this.$store.state.statuses.timelines.favorites
	},
	media () {
	return this.$store.state.statuses.timelines.media
	},
	userId () {
	- return this.$route.params.id \|\| this.user.id
	+ return this.$route.params.id \|\| this.user.id \|\| this.fetchedUserId
	},
	userName () {
	return this.$route.params.name \|\| this.user.screen_name
	},
	isUs () {
	return this.userId && this.$store.state.users.currentUser.id &&
	this.userId === this.$store.state.users.currentUser.id
	},
	userInStore () {
	- if (this.isExternal) {
	- return this.$store.getters.userById(this.userId)
	- }
	- return this.$store.getters.userByName(this.userName)
	+ const routeParams = this.$route.params
	+ // This needs fetchedUserId so that computed will be refreshed when user is fetched
	+ return this.$store.getters.findUser(this.fetchedUserId \|\| routeParams.name \|\| routeParams.id)
	},
	user () {
	if (this.timeline.statuses[0]) {
	return this.timeline.statuses[0].user
	}
	if (this.userInStore) {
	return this.userInStore
	}
	return {}
	},
	- fetchBy () {
	- return this.isExternal ? this.userId : this.userName
	- },
	isExternal () {
	return this.$route.name === 'external-user-profile'
	},
	followsTabVisible () {
	return this.isUs \|\| !this.user.hide_follows
	},
	followersTabVisible () {
	return this.isUs \|\| !this.user.hide_followers
	}
	},
	methods: {
	startFetchFavorites () {
	if (this.isUs) {
	- this.$store.dispatch('startFetching', { timeline: 'favorites', userId: this.fetchBy })
	+ this.$store.dispatch('startFetching', { timeline: 'favorites', userId: this.userId })
	+ }
	+ },
	+ fetchUserId () {
	+ let fetchPromise
	+ if (this.userId && !this.$route.params.name) {
	+ fetchPromise = this.$store.dispatch('fetchUser', this.userId)
	+ } else {
	+ fetchPromise = this.$store.dispatch('fetchUser', this.userName)
	+ .then(({ id }) => {
	+ this.fetchedUserId = id
	+ })
	}
	+ return fetchPromise
	+ .catch((reason) => {
	+ const errorMessage = get(reason, 'error.error')
	+ if (errorMessage === 'No user with such user_id') { // Known error
	+ this.error = this.$t('user_profile.profile_does_not_exist')
	+ } else if (errorMessage) {
	+ this.error = errorMessage
	+ } else {
	+ this.error = this.$t('user_profile.profile_loading_error')
	+ }
	+ })
	+ .then(() => this.startUp())
	},
	startUp () {
	- this.$store.dispatch('startFetching', { timeline: 'user', userId: this.fetchBy })
	- this.$store.dispatch('startFetching', { timeline: 'media', userId: this.fetchBy })
	-
	- this.startFetchFavorites()
	+ if (this.userId) {
	+ this.$store.dispatch('startFetching', { timeline: 'user', userId: this.userId })
	+ this.$store.dispatch('startFetching', { timeline: 'media', userId: this.userId })
	+ this.startFetchFavorites()
	+ }
	},
	cleanUp () {
	this.$store.dispatch('stopFetching', 'user')
	this.$store.dispatch('stopFetching', 'favorites')
	this.$store.dispatch('stopFetching', 'media')
	this.$store.commit('clearTimeline', { timeline: 'user' })
	this.$store.commit('clearTimeline', { timeline: 'favorites' })
	this.$store.commit('clearTimeline', { timeline: 'media' })
	}
	},
	watch: {
	- userName () {
	- if (this.isExternal) {
	- return
	+ // userId can be undefined if we don't know it yet
	+ userId (newVal) {
	+ if (newVal) {
	+ this.cleanUp()
	+ this.startUp()
	}
	- this.cleanUp()
	- this.startUp()
	},
	- userId () {
	- if (!this.isExternal) {
	- return
	+ userName () {
	+ if (this.$route.params.name) {
	+ this.fetchUserId()
	+ this.cleanUp()
	+ this.startUp()
	}
	- this.cleanUp()
	- this.startUp()
	},
	$route () {
	this.$refs.tabSwitcher.activateTab(0)()
	}
	},
	components: {
	UserCard,
	Timeline,
	FollowerList,
	FriendList
	}
	}

	export default UserProfile
	diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
	index 7d4a8b1f6f..d449eb85b2 100644
	--- a/src/components/user_profile/user_profile.vue
	+++ b/src/components/user_profile/user_profile.vue
	@@ -1,96 +1,96 @@
	<template>
	<div>
	<div v-if="user.id" class="user-profile panel panel-default">
	<UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/>
	<tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
	<Timeline
	:label="$t('user_card.statuses')"
	:disabled="!user.statuses_count"
	:count="user.statuses_count"
	:embedded="true"
	:title="$t('user_profile.timeline_title')"
	:timeline="timeline"
	:timeline-name="'user'"
	- :user-id="fetchBy"
	+ :user-id="userId"
	/>
	<div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count">
	<FriendList :userId="userId" />
	</div>
	<div :label="$t('user_card.followers')" v-if="followersTabVisible" :disabled="!user.followers_count">
	<FollowerList :userId="userId" :entryProps="{noFollowsYou: isUs}" />
	</div>
	<Timeline
	:label="$t('user_card.media')"
	:disabled="!media.visibleStatuses.length"
	:embedded="true" :title="$t('user_card.media')"
	timeline-name="media"
	:timeline="media"
	- :user-id="fetchBy"
	+ :user-id="userId"
	/>
	<Timeline
	v-if="isUs"
	:label="$t('user_card.favorites')"
	:disabled="!favorites.visibleStatuses.length"
	:embedded="true"
	:title="$t('user_card.favorites')"
	timeline-name="favorites"
	:timeline="favorites"
	/>
	</tab-switcher>
	</div>
	<div v-else class="panel user-profile-placeholder">
	<div class="panel-heading">
	<div class="title">
	{{ $t('settings.profile_tab') }}
	</div>
	</div>
	<div class="panel-body">
	<span v-if="error">{{ error }}</span>
	<i class="icon-spin3 animate-spin" v-else></i>
	</div>
	</div>
	</div>
	</template>

	<script src="./user_profile.js"></script>

	<style lang="scss">

	.user-profile {
	flex: 2;
	flex-basis: 500px;

	.userlist-placeholder {
	display: flex;
	justify-content: center;
	align-items: middle;
	padding: 2em;
	}

	.timeline-heading {
	display: flex;
	justify-content: center;

	.loadmore-button, .alert {
	flex: 1;
	}

	.loadmore-button {
	height: 28px;
	margin: 10px .6em;
	}

	.title, .loadmore-text {
	display: none
	}
	}
	}
	.user-profile-placeholder {
	.panel-body {
	display: flex;
	justify-content: center;
	align-items: middle;
	padding: 7em;
	}
	}
	</style>
	diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
	index c0ab759cf1..72e7bb5311 100644
	--- a/src/components/user_settings/user_settings.js
	+++ b/src/components/user_settings/user_settings.js
	@@ -1,331 +1,337 @@
	import { compose } from 'vue-compose'
	import unescape from 'lodash/unescape'
	import get from 'lodash/get'
	import TabSwitcher from '../tab_switcher/tab_switcher.js'
	import ImageCropper from '../image_cropper/image_cropper.vue'
	import StyleSwitcher from '../style_switcher/style_switcher.vue'
	import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
	import BlockCard from '../block_card/block_card.vue'
	import MuteCard from '../mute_card/mute_card.vue'
	import withSubscription from '../../hocs/with_subscription/with_subscription'
	import withList from '../../hocs/with_list/with_list'

	const BlockList = compose(
	withSubscription({
	fetch: (props, $store) => $store.dispatch('fetchBlocks'),
	select: (props, $store) => get($store.state.users.currentUser, 'blockIds', []),
	childPropName: 'entries'
	}),
	withList({ getEntryProps: userId => ({ userId }) })
	)(BlockCard)

	const MuteList = compose(
	withSubscription({
	fetch: (props, $store) => $store.dispatch('fetchMutes'),
	select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
	childPropName: 'entries'
	}),
	withList({ getEntryProps: userId => ({ userId }) })
	)(MuteCard)

	const UserSettings = {
	data () {
	return {
	newName: this.$store.state.users.currentUser.name,
	newBio: unescape(this.$store.state.users.currentUser.description),
	newLocked: this.$store.state.users.currentUser.locked,
	newNoRichText: this.$store.state.users.currentUser.no_rich_text,
	newDefaultScope: this.$store.state.users.currentUser.default_scope,
	hideFollows: this.$store.state.users.currentUser.hide_follows,
	hideFollowers: this.$store.state.users.currentUser.hide_followers,
	showRole: this.$store.state.users.currentUser.show_role,
	role: this.$store.state.users.currentUser.role,
	followList: null,
	followImportError: false,
	followsImported: false,
	enableFollowsExport: true,
	pickAvatarBtnVisible: true,
	bannerUploading: false,
	backgroundUploading: false,
	followListUploading: false,
	bannerPreview: null,
	backgroundPreview: null,
	bannerUploadError: null,
	backgroundUploadError: null,
	deletingAccount: false,
	deleteAccountConfirmPasswordInput: '',
	deleteAccountError: false,
	changePasswordInputs: [ '', '', '' ],
	changedPassword: false,
	changePasswordError: false,
	activeTab: 'profile'
	}
	},
	created () {
	this.$store.dispatch('fetchTokens')
	},
	components: {
	StyleSwitcher,
	TabSwitcher,
	ImageCropper,
	BlockList,
	MuteList
	},
	computed: {
	user () {
	return this.$store.state.users.currentUser
	},
	pleromaBackend () {
	return this.$store.state.instance.pleromaBackend
	},
	scopeOptionsEnabled () {
	return this.$store.state.instance.scopeOptionsEnabled
	},
	vis () {
	return {
	public: { selected: this.newDefaultScope === 'public' },
	unlisted: { selected: this.newDefaultScope === 'unlisted' },
	private: { selected: this.newDefaultScope === 'private' },
	direct: { selected: this.newDefaultScope === 'direct' }
	}
	},
	currentSaveStateNotice () {
	return this.$store.state.interface.settings.currentSaveStateNotice
	},
	oauthTokens () {
	return this.$store.state.oauthTokens.tokens.map(oauthToken => {
	return {
	id: oauthToken.id,
	appName: oauthToken.app_name,
	validUntil: new Date(oauthToken.valid_until).toLocaleDateString()
	}
	})
	}
	},
	methods: {
	updateProfile () {
	const name = this.newName
	const description = this.newBio
	const locked = this.newLocked
	// Backend notation.
	/* eslint-disable camelcase */
	const default_scope = this.newDefaultScope
	const no_rich_text = this.newNoRichText
	const hide_follows = this.hideFollows
	const hide_followers = this.hideFollowers
	const show_role = this.showRole

	/* eslint-enable camelcase */
	this.$store.state.api.backendInteractor
	.updateProfile({
	params: {
	name,
	description,
	locked,
	// Backend notation.
	/* eslint-disable camelcase */
	default_scope,
	no_rich_text,
	hide_follows,
	hide_followers,
	show_role
	/* eslint-enable camelcase */
	}}).then((user) => {
	if (!user.error) {
	this.$store.commit('addNewUsers', [user])
	this.$store.commit('setCurrentUser', user)
	}
	})
	},
	changeVis (visibility) {
	this.newDefaultScope = visibility
	},
	uploadFile (slot, e) {
	const file = e.target.files[0]
	if (!file) { return }
	if (file.size > this.$store.state.instance[slot + 'limit']) {
	const filesize = fileSizeFormatService.fileSizeFormat(file.size)
	const allowedsize = fileSizeFormatService.fileSizeFormat(this.$store.state.instance[slot + 'limit'])
	this[slot + 'UploadError'] = this.$t('upload.error.base') + ' ' + this.$t('upload.error.file_too_big', {filesize: filesize.num, filesizeunit: filesize.unit, allowedsize: allowedsize.num, allowedsizeunit: allowedsize.unit})
	return
	}
	// eslint-disable-next-line no-undef
	const reader = new FileReader()
	reader.onload = ({target}) => {
	const img = target.result
	this[slot + 'Preview'] = img
	}
	reader.readAsDataURL(file)
	},
	submitAvatar (cropper, file) {
	- const img = cropper.getCroppedCanvas().toDataURL(file.type)
	+ let img
	+ if (cropper) {
	+ img = cropper.getCroppedCanvas().toDataURL(file.type)
	+ } else {
	+ img = file
	+ }
	+
	return this.$store.state.api.backendInteractor.updateAvatar({ params: { img } }).then((user) => {
	if (!user.error) {
	this.$store.commit('addNewUsers', [user])
	this.$store.commit('setCurrentUser', user)
	} else {
	throw new Error(this.$t('upload.error.base') + user.error)
	}
	})
	},
	clearUploadError (slot) {
	this[slot + 'UploadError'] = null
	},
	submitBanner () {
	if (!this.bannerPreview) { return }

	let banner = this.bannerPreview
	// eslint-disable-next-line no-undef
	let imginfo = new Image()
	/* eslint-disable camelcase */
	let offset_top, offset_left, width, height
	imginfo.src = banner
	width = imginfo.width
	height = imginfo.height
	offset_top = 0
	offset_left = 0
	this.bannerUploading = true
	this.$store.state.api.backendInteractor.updateBanner({params: {banner, offset_top, offset_left, width, height}}).then((data) => {
	if (!data.error) {
	let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser))
	clone.cover_photo = data.url
	this.$store.commit('addNewUsers', [clone])
	this.$store.commit('setCurrentUser', clone)
	this.bannerPreview = null
	} else {
	this.bannerUploadError = this.$t('upload.error.base') + data.error
	}
	this.bannerUploading = false
	})
	/* eslint-enable camelcase */
	},
	submitBg () {
	if (!this.backgroundPreview) { return }
	let img = this.backgroundPreview
	// eslint-disable-next-line no-undef
	let imginfo = new Image()
	let cropX, cropY, cropW, cropH
	imginfo.src = img
	cropX = 0
	cropY = 0
	cropW = imginfo.width
	cropH = imginfo.width
	this.backgroundUploading = true
	this.$store.state.api.backendInteractor.updateBg({params: {img, cropX, cropY, cropW, cropH}}).then((data) => {
	if (!data.error) {
	let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser))
	clone.background_image = data.url
	this.$store.commit('addNewUsers', [clone])
	this.$store.commit('setCurrentUser', clone)
	this.backgroundPreview = null
	} else {
	this.backgroundUploadError = this.$t('upload.error.base') + data.error
	}
	this.backgroundUploading = false
	})
	},
	importFollows () {
	this.followListUploading = true
	const followList = this.followList
	this.$store.state.api.backendInteractor.followImport({params: followList})
	.then((status) => {
	if (status) {
	this.followsImported = true
	} else {
	this.followImportError = true
	}
	this.followListUploading = false
	})
	},
	/* This function takes an Array of Users
	* and outputs a file with all the addresses for the user to download
	*/
	exportPeople (users, filename) {
	// Get all the friends addresses
	var UserAddresses = users.map(function (user) {
	// check is it's a local user
	if (user && user.is_local) {
	// append the instance address
	// eslint-disable-next-line no-undef
	user.screen_name += '@' + location.hostname
	}
	return user.screen_name
	}).join('\n')
	// Make the user download the file
	var fileToDownload = document.createElement('a')
	fileToDownload.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(UserAddresses))
	fileToDownload.setAttribute('download', filename)
	fileToDownload.style.display = 'none'
	document.body.appendChild(fileToDownload)
	fileToDownload.click()
	document.body.removeChild(fileToDownload)
	},
	exportFollows () {
	this.enableFollowsExport = false
	this.$store.state.api.backendInteractor
	.exportFriends({
	id: this.$store.state.users.currentUser.id
	})
	.then((friendList) => {
	this.exportPeople(friendList, 'friends.csv')
	setTimeout(() => { this.enableFollowsExport = true }, 2000)
	})
	},
	followListChange () {
	// eslint-disable-next-line no-undef
	let formData = new FormData()
	formData.append('list', this.$refs.followlist.files[0])
	this.followList = formData
	},
	dismissImported () {
	this.followsImported = false
	this.followImportError = false
	},
	confirmDelete () {
	this.deletingAccount = true
	},
	deleteAccount () {
	this.$store.state.api.backendInteractor.deleteAccount({password: this.deleteAccountConfirmPasswordInput})
	.then((res) => {
	if (res.status === 'success') {
	this.$store.dispatch('logout')
	this.$router.push({name: 'root'})
	} else {
	this.deleteAccountError = res.error
	}
	})
	},
	changePassword () {
	const params = {
	password: this.changePasswordInputs[0],
	newPassword: this.changePasswordInputs[1],
	newPasswordConfirmation: this.changePasswordInputs[2]
	}
	this.$store.state.api.backendInteractor.changePassword(params)
	.then((res) => {
	if (res.status === 'success') {
	this.changedPassword = true
	this.changePasswordError = false
	this.logout()
	} else {
	this.changedPassword = false
	this.changePasswordError = res.error
	}
	})
	},
	activateTab (tabName) {
	this.activeTab = tabName
	},
	logout () {
	this.$store.dispatch('logout')
	this.$router.replace('/')
	},
	revokeToken (id) {
	if (window.confirm(`${this.$i18n.t('settings.revoke_token')}?`)) {
	this.$store.dispatch('revokeToken', id)
	}
	}
	}
	}

	export default UserSettings
	diff --git a/src/i18n/ar.json b/src/i18n/ar.json
	index 242dab7897..72e3010fb0 100644
	--- a/src/i18n/ar.json
	+++ b/src/i18n/ar.json
	@@ -1,206 +1,206 @@
	{
	"chat": {
	"title": "الدردشة"
	},
	"features_panel": {
	"chat": "الدردشة",
	"gopher": "غوفر",
	"media_proxy": "بروكسي الوسائط",
	"scope_options": "",
	"text_limit": "الحد الأقصى للنص",
	"title": "الميّزات",
	"who_to_follow": "للمتابعة"
	},
	"finder": {
	"error_fetching_user": "خطأ أثناء جلب صفحة المستخدم",
	"find_user": "البحث عن مستخدِم"
	},
	"general": {
	"apply": "تطبيق",
	"submit": "إرسال"
	},
	"login": {
	"login": "تسجيل الدخول",
	"logout": "الخروج",
	"password": "الكلمة السرية",
	"placeholder": "مثال lain",
	"register": "انشاء حساب",
	"username": "إسم المستخدم"
	},
	"nav": {
	"chat": "الدردشة المحلية",
	"friend_requests": "طلبات المتابَعة",
	"mentions": "الإشارات",
	"public_tl": "الخيط الزمني العام",
	"timeline": "الخيط الزمني",
	"twkn": "كافة الشبكة المعروفة"
	},
	"notifications": {
	"broken_favorite": "منشور مجهول، جارٍ البحث عنه…",
	"favorited_you": "أعجِب بمنشورك",
	"followed_you": "يُتابعك",
	"load_older": "تحميل الإشعارات الأقدم",
	"notifications": "الإخطارات",
	"read": "مقروء!",
	"repeated_you": "شارَك منشورك"
	},
	"post_status": {
	"account_not_locked_warning": "",
	"account_not_locked_warning_link": "مقفل",
	"attachments_sensitive": "اعتبر المرفقات كلها كمحتوى حساس",
	"content_type": {
	- "plain_text": "نص صافٍ"
	+ "text/plain": "نص صافٍ"
	},
	"content_warning": "الموضوع (اختياري)",
	"default": "وصلت للتوّ إلى لوس أنجلس.",
	"direct_warning": "",
	"posting": "النشر",
	"scope": {
	"direct": "",
	"private": "",
	"public": "علني - يُنشر على الخيوط الزمنية العمومية",
	"unlisted": "غير مُدرَج - لا يُنشَر على الخيوط الزمنية العمومية"
	}
	},
	"registration": {
	"bio": "السيرة الذاتية",
	"email": "عنوان البريد الإلكتروني",
	"fullname": "الإسم المعروض",
	"password_confirm": "تأكيد الكلمة السرية",
	"registration": "التسجيل",
	"token": "رمز الدعوة"
	},
	"settings": {
	"attachmentRadius": "المُرفَقات",
	"attachments": "المُرفَقات",
	"autoload": "",
	"avatar": "الصورة الرمزية",
	"avatarAltRadius": "الصور الرمزية (الإشعارات)",
	"avatarRadius": "الصور الرمزية",
	"background": "الخلفية",
	"bio": "السيرة الذاتية",
	"btnRadius": "الأزرار",
	"cBlue": "أزرق (الرد، المتابَعة)",
	"cGreen": "أخضر (إعادة النشر)",
	"cOrange": "برتقالي (مفضلة)",
	"cRed": "أحمر (إلغاء)",
	"change_password": "تغيير كلمة السر",
	"change_password_error": "وقع هناك خلل أثناء تعديل كلمتك السرية.",
	"changed_password": "تم تغيير كلمة المرور بنجاح!",
	"collapse_subject": "",
	"confirm_new_password": "تأكيد كلمة السر الجديدة",
	"current_avatar": "صورتك الرمزية الحالية",
	"current_password": "كلمة السر الحالية",
	"current_profile_banner": "الرأسية الحالية لصفحتك الشخصية",
	"data_import_export_tab": "تصدير واستيراد البيانات",
	"default_vis": "أسلوب العرض الافتراضي",
	"delete_account": "حذف الحساب",
	"delete_account_description": "حذف حسابك و كافة منشوراتك نهائيًا.",
	"delete_account_error": "",
	"delete_account_instructions": "يُرجى إدخال كلمتك السرية أدناه لتأكيد عملية حذف الحساب.",
	"export_theme": "حفظ النموذج",
	"filtering": "التصفية",
	"filtering_explanation": "سيتم إخفاء كافة المنشورات التي تحتوي على هذه الكلمات، كلمة واحدة في كل سطر",
	"follow_export": "تصدير الاشتراكات",
	"follow_export_button": "تصدير الاشتراكات كملف csv",
	"follow_export_processing": "التصدير جارٍ، سوف يُطلَب منك تنزيل ملفك بعد حين",
	"follow_import": "استيراد الاشتراكات",
	"follow_import_error": "خطأ أثناء استيراد المتابِعين",
	"follows_imported": "",
	"foreground": "الأمامية",
	"general": "الإعدادات العامة",
	"hide_attachments_in_convo": "إخفاء المرفقات على المحادثات",
	"hide_attachments_in_tl": "إخفاء المرفقات على الخيط الزمني",
	"hide_post_stats": "",
	"hide_user_stats": "",
	"import_followers_from_a_csv_file": "",
	"import_theme": "تحميل نموذج",
	"inputRadius": "",
	"instance_default": "",
	"interfaceLanguage": "لغة الواجهة",
	"invalid_theme_imported": "",
	"limited_availability": "غير متوفر على متصفحك",
	"links": "الروابط",
	"lock_account_description": "",
	"loop_video": "",
	"loop_video_silent_only": "",
	"name": "الاسم",
	"name_bio": "الاسم والسيرة الذاتية",
	"new_password": "كلمة السر الجديدة",
	"no_rich_text_description": "",
	"notification_visibility": "نوع الإشعارات التي تريد عرضها",
	"notification_visibility_follows": "يتابع",
	"notification_visibility_likes": "الإعجابات",
	"notification_visibility_mentions": "الإشارات",
	"notification_visibility_repeats": "",
	"nsfw_clickthrough": "",
	"oauth_tokens": "رموز OAuth",
	"token": "رمز",
	"refresh_token": "رمز التحديث",
	"valid_until": "صالح حتى",
	"revoke_token": "سحب",
	"panelRadius": "",
	"pause_on_unfocused": "",
	"presets": "النماذج",
	"profile_background": "خلفية الصفحة الشخصية",
	"profile_banner": "رأسية الصفحة الشخصية",
	"profile_tab": "الملف الشخصي",
	"radii_help": "",
	"replies_in_timeline": "الردود على الخيط الزمني",
	"reply_link_preview": "",
	"reply_visibility_all": "عرض كافة الردود",
	"reply_visibility_following": "",
	"reply_visibility_self": "",
	"saving_err": "خطأ أثناء حفظ الإعدادات",
	"saving_ok": "تم حفظ الإعدادات",
	"security_tab": "الأمان",
	"set_new_avatar": "اختيار صورة رمزية جديدة",
	"set_new_profile_background": "اختيار خلفية جديدة للملف الشخصي",
	"set_new_profile_banner": "اختيار رأسية جديدة للصفحة الشخصية",
	"settings": "الإعدادات",
	"stop_gifs": "",
	"streaming": "",
	"text": "النص",
	"theme": "المظهر",
	"theme_help": "",
	"tooltipRadius": "",
	"user_settings": "إعدادات المستخدم",
	"values": {
	"false": "لا",
	"true": "نعم"
	}
	},
	"timeline": {
	"collapse": "",
	"conversation": "محادثة",
	"error_fetching": "خطأ أثناء جلب التحديثات",
	"load_older": "تحميل المنشورات القديمة",
	"no_retweet_hint": "",
	"repeated": "",
	"show_new": "عرض الجديد",
	"up_to_date": "تم تحديثه"
	},
	"user_card": {
	"approve": "قبول",
	"block": "حظر",
	"blocked": "تم حظره!",
	"deny": "رفض",
	"follow": "اتبع",
	"followees": "",
	"followers": "مُتابِعون",
	"following": "",
	"follows_you": "يتابعك!",
	"mute": "كتم",
	"muted": "تم كتمه",
	"per_day": "في اليوم",
	"remote_follow": "مُتابَعة عن بُعد",
	"statuses": "المنشورات"
	},
	"user_profile": {
	"timeline_title": "الخيط الزمني للمستخدم"
	},
	"who_to_follow": {
	"more": "المزيد",
	"who_to_follow": "للمتابعة"
	}
	}
	\ No newline at end of file
	diff --git a/src/i18n/ca.json b/src/i18n/ca.json
	index d2f285dff3..8fa3a88b36 100644
	--- a/src/i18n/ca.json
	+++ b/src/i18n/ca.json
	@@ -1,204 +1,204 @@
	{
	"chat": {
	"title": "Xat"
	},
	"features_panel": {
	"chat": "Xat",
	"gopher": "Gopher",
	"media_proxy": "Proxy per multimèdia",
	"scope_options": "Opcions d'abast i visibilitat",
	"text_limit": "Límit de text",
	"title": "Funcionalitats",
	"who_to_follow": "A qui seguir"
	},
	"finder": {
	"error_fetching_user": "No s'ha pogut carregar l'usuari/a",
	"find_user": "Find user"
	},
	"general": {
	"apply": "Aplica",
	"submit": "Desa"
	},
	"login": {
	"login": "Inicia sessió",
	"logout": "Tanca la sessió",
	"password": "Contrasenya",
	"placeholder": "p.ex.: Maria",
	"register": "Registra't",
	"username": "Nom d'usuari/a"
	},
	"nav": {
	"chat": "Xat local públic",
	"friend_requests": "Soŀlicituds de connexió",
	"mentions": "Mencions",
	"public_tl": "Flux públic del node",
	"timeline": "Flux personal",
	"twkn": "Flux de la xarxa coneguda"
	},
	"notifications": {
	"broken_favorite": "No es coneix aquest estat. S'està cercant.",
	"favorited_you": "ha marcat un estat teu",
	"followed_you": "ha començat a seguir-te",
	"load_older": "Carrega més notificacions",
	"notifications": "Notificacions",
	"read": "Read!",
	"repeated_you": "ha repetit el teu estat"
	},
	"post_status": {
	"account_not_locked_warning": "El teu compte no està {0}. Qualsevol persona pot seguir-te per llegir les teves entrades reservades només a seguidores.",
	"account_not_locked_warning_link": "bloquejat",
	"attachments_sensitive": "Marca l'adjunt com a delicat",
	"content_type": {
	- "plain_text": "Text pla"
	+ "text/plain": "Text pla"
	},
	"content_warning": "Assumpte (opcional)",
	"default": "Em sento…",
	"direct_warning": "Aquesta entrada només serà visible per les usuràries que etiquetis",
	"posting": "Publicació",
	"scope": {
	"direct": "Directa - Publica només per les usuàries etiquetades",
	"private": "Només seguidors/es - Publica només per comptes que et segueixin",
	"public": "Pública - Publica als fluxos públics",
	"unlisted": "Silenciosa - No la mostris en fluxos públics"
	}
	},
	"registration": {
	"bio": "Presentació",
	"email": "Correu",
	"fullname": "Nom per mostrar",
	"password_confirm": "Confirma la contrasenya",
	"registration": "Registra't",
	"token": "Codi d'invitació"
	},
	"settings": {
	"attachmentRadius": "Adjunts",
	"attachments": "Adjunts",
	"autoload": "Recarrega automàticament en arribar a sota de tot.",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars en les notificacions",
	"avatarRadius": "Avatars",
	"background": "Fons de pantalla",
	"bio": "Presentació",
	"btnRadius": "Botons",
	"cBlue": "Blau (respon, segueix)",
	"cGreen": "Verd (republica)",
	"cOrange": "Taronja (marca com a preferit)",
	"cRed": "Vermell (canceŀla)",
	"change_password": "Canvia la contrasenya",
	"change_password_error": "No s'ha pogut canviar la contrasenya",
	"changed_password": "S'ha canviat la contrasenya",
	"collapse_subject": "Replega les entrades amb títol",
	"confirm_new_password": "Confirma la nova contrasenya",
	"current_avatar": "L'avatar actual",
	"current_password": "La contrasenya actual",
	"current_profile_banner": "El fons de perfil actual",
	"data_import_export_tab": "Importa o exporta dades",
	"default_vis": "Abast per defecte de les entrades",
	"delete_account": "Esborra el compte",
	"delete_account_description": "Esborra permanentment el teu compte i tots els missatges",
	"delete_account_error": "No s'ha pogut esborrar el compte. Si continua el problema, contacta amb l'administració del node",
	"delete_account_instructions": "Confirma que vols esborrar el compte escrivint la teva contrasenya aquí sota",
	"export_theme": "Desa el tema",
	"filtering": "Filtres",
	"filtering_explanation": "Es silenciaran totes les entrades que continguin aquestes paraules. Separa-les per línies",
	"follow_export": "Exporta la llista de contactes",
	"follow_export_button": "Exporta tots els comptes que segueixes a un fitxer CSV",
	"follow_export_processing": "S'està processant la petició. Aviat podràs descarregar el fitxer",
	"follow_import": "Importa els contactes",
	"follow_import_error": "No s'ha pogut importar els contactes",
	"follows_imported": "S'han importat els contactes. Trigaran una estoneta en ser processats.",
	"foreground": "Primer pla",
	"general": "General",
	"hide_attachments_in_convo": "Amaga els adjunts en les converses",
	"hide_attachments_in_tl": "Amaga els adjunts en el flux d'entrades",
	"import_followers_from_a_csv_file": "Importa els contactes des d'un fitxer CSV",
	"import_theme": "Carrega un tema",
	"inputRadius": "Caixes d'entrada de text",
	"instance_default": "(default: {value})",
	"interfaceLanguage": "Llengua de la interfície",
	"invalid_theme_imported": "No s'ha entès l'arxiu carregat perquè no és un tema vàlid de Pleroma. No s'ha fet cap canvi als temes actuals.",
	"limited_availability": "No està disponible en aquest navegador",
	"links": "Enllaços",
	"lock_account_description": "Restringeix el teu compte només a seguidores aprovades.",
	"loop_video": "Reprodueix els vídeos en bucle",
	"loop_video_silent_only": "Reprodueix en bucles només els vídeos sense so (com els \"GIF\" de Mastodon)",
	"name": "Nom",
	"name_bio": "Nom i presentació",
	"new_password": "Contrasenya nova",
	"notification_visibility": "Notifica'm quan algú",
	"notification_visibility_follows": "Comença a seguir-me",
	"notification_visibility_likes": "Marca com a preferida una entrada meva",
	"notification_visibility_mentions": "Em menciona",
	"notification_visibility_repeats": "Republica una entrada meva",
	"no_rich_text_description": "Neteja el formatat de text de totes les entrades",
	"nsfw_clickthrough": "Amaga el contingut NSFW darrer d'una imatge clicable",
	"oauth_tokens": "Llistats OAuth",
	"token": "Token",
	"refresh_token": "Actualitza el token",
	"valid_until": "Vàlid fins",
	"revoke_token": "Revocar",
	"panelRadius": "Panells",
	"pause_on_unfocused": "Pausa la reproducció en continu quan la pestanya perdi el focus",
	"presets": "Temes",
	"profile_background": "Fons de pantalla",
	"profile_banner": "Fons de perfil",
	"profile_tab": "Perfil",
	"radii_help": "Configura l'arrodoniment de les vores (en píxels)",
	"replies_in_timeline": "Replies in timeline",
	"reply_link_preview": "Mostra el missatge citat en passar el ratolí per sobre de l'enllaç de resposta",
	"reply_visibility_all": "Mostra totes les respostes",
	"reply_visibility_following": "Mostra només les respostes a entrades meves o d'usuàries que jo segueixo",
	"reply_visibility_self": "Mostra només les respostes a entrades meves",
	"saving_err": "No s'ha pogut desar la configuració",
	"saving_ok": "S'ha desat la configuració",
	"security_tab": "Seguretat",
	"set_new_avatar": "Canvia l'avatar",
	"set_new_profile_background": "Canvia el fons de pantalla",
	"set_new_profile_banner": "Canvia el fons del perfil",
	"settings": "Configuració",
	"stop_gifs": "Anima els GIF només en passar-hi el ratolí per sobre",
	"streaming": "Carrega automàticament entrades noves quan estigui a dalt de tot",
	"text": "Text",
	"theme": "Tema",
	"theme_help": "Personalitza els colors del tema. Escriu-los en format RGB hexadecimal (#rrggbb)",
	"tooltipRadius": "Missatges sobreposats",
	"user_settings": "Configuració personal",
	"values": {
	"false": "no",
	"true": "sí"
	}
	},
	"timeline": {
	"collapse": "Replega",
	"conversation": "Conversa",
	"error_fetching": "S'ha produït un error en carregar les entrades",
	"load_older": "Carrega entrades anteriors",
	"no_retweet_hint": "L'entrada és només per a seguidores o és \"directa\", i per tant no es pot republicar",
	"repeated": "republicat",
	"show_new": "Mostra els nous",
	"up_to_date": "Actualitzat"
	},
	"user_card": {
	"approve": "Aprova",
	"block": "Bloqueja",
	"blocked": "Bloquejat!",
	"deny": "Denega",
	"follow": "Segueix",
	"followees": "Segueixo",
	"followers": "Seguidors/es",
	"following": "Seguint!",
	"follows_you": "Et segueix!",
	"mute": "Silencia",
	"muted": "Silenciat",
	"per_day": "per dia",
	"remote_follow": "Seguiment remot",
	"statuses": "Estats"
	},
	"user_profile": {
	"timeline_title": "Flux personal"
	},
	"who_to_follow": {
	"more": "More",
	"who_to_follow": "A qui seguir"
	}
	}
	diff --git a/src/i18n/cs.json b/src/i18n/cs.json
	index 51e9d34299..020092a6b1 100644
	--- a/src/i18n/cs.json
	+++ b/src/i18n/cs.json
	@@ -1,428 +1,428 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Mediální proxy",
	"scope_options": "Možnosti rozsahů",
	"text_limit": "Textový limit",
	"title": "Vlastnosti",
	"who_to_follow": "Koho sledovat"
	},
	"finder": {
	"error_fetching_user": "Chyba při načítání uživatele",
	"find_user": "Najít uživatele"
	},
	"general": {
	"apply": "Použít",
	"submit": "Odeslat",
	"more": "Více",
	"generic_error": "Vyskytla se chyba",
	"optional": "volitelné"
	},
	"image_cropper": {
	"crop_picture": "Oříznout obrázek",
	"save": "Uložit",
	"cancel": "Zrušit"
	},
	"login": {
	"login": "Přihlásit",
	"description": "Přihlásit pomocí OAuth",
	"logout": "Odhlásit",
	"password": "Heslo",
	"placeholder": "např. lain",
	"register": "Registrovat",
	"username": "Uživatelské jméno",
	"hint": "Chcete-li se přidat do diskuze, přihlaste se"
	},
	"media_modal": {
	"previous": "Předchozí",
	"next": "Další"
	},
	"nav": {
	"about": "O instanci",
	"back": "Zpět",
	"chat": "Místní chat",
	"friend_requests": "Požadavky o sledování",
	"mentions": "Zmínky",
	"dms": "Přímé zprávy",
	"public_tl": "Veřejná časová osa",
	"timeline": "Časová osa",
	"twkn": "Celá známá síť",
	"user_search": "Hledání uživatelů",
	"who_to_follow": "Koho sledovat",
	"preferences": "Předvolby"
	},
	"notifications": {
	"broken_favorite": "Neznámý příspěvek, hledám jej…",
	"favorited_you": "si oblíbil/a váš příspěvek",
	"followed_you": "vás nyní sleduje",
	"load_older": "Načíst starší oznámení",
	"notifications": "Oznámení",
	"read": "Číst!",
	"repeated_you": "zopakoval/a váš příspěvek",
	"no_more_notifications": "Žádná další oznámení"
	},
	"post_status": {
	"new_status": "Napsat nový příspěvek",
	"account_not_locked_warning": "Váš účet není {0}. Kdokoliv vás může sledovat a vidět vaše příspěvky pouze pro sledující.",
	"account_not_locked_warning_link": "uzamčen",
	"attachments_sensitive": "Označovat přílohy jako citlivé",
	"content_type": {
	- "plain_text": "Prostý text",
	+ "text/plain": "Prostý text",
	"text/html": "HTML",
	"text/markdown": "Markdown"
	},
	"content_warning": "Předmět (volitelný)",
	"default": "Právě jsem přistál v L.A.",
	"direct_warning": "Tento příspěvek uvidí pouze všichni zmínění uživatelé.",
	"posting": "Přispívání",
	"scope": {
	"direct": "Přímý - Poslat pouze zmíněným uživatelům",
	"private": "Pouze pro sledující - Poslat pouze sledujícím",
	"public": "Veřejný - Poslat na veřejné časové osy",
	"unlisted": "Neuvedený - Neposlat na veřejné časové osy"
	}
	},
	"registration": {
	"bio": "O vás",
	"email": "E-mail",
	"fullname": "Zobrazované jméno",
	"password_confirm": "Potvrzení hesla",
	"registration": "Registrace",
	"token": "Token pozvánky",
	"captcha": "CAPTCHA",
	"new_captcha": "Kliknutím na obrázek získáte novou CAPTCHA",
	"username_placeholder": "např. lain",
	"fullname_placeholder": "např. Lain Iwakura",
	"bio_placeholder": "např.\nNazdar, jsem Lain\nJsem anime dívka žijící v příměstském Japonsku. Možná mě znáte z Wired.",
	"validations": {
	"username_required": "nemůže být prázdné",
	"fullname_required": "nemůže být prázdné",
	"email_required": "nemůže být prázdný",
	"password_required": "nemůže být prázdné",
	"password_confirmation_required": "nemůže být prázdné",
	"password_confirmation_match": "musí být stejné jako heslo"
	}
	},
	"settings": {
	"app_name": "Název aplikace",
	"attachmentRadius": "Přílohy",
	"attachments": "Přílohy",
	"autoload": "Povolit automatické načítání při rolování dolů",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatary (oznámení)",
	"avatarRadius": "Avatary",
	"background": "Pozadí",
	"bio": "O vás",
	"blocks_tab": "Blokování",
	"btnRadius": "Tlačítka",
	"cBlue": "Modrá (Odpovědět, sledovat)",
	"cGreen": "Zelená (Zopakovat)",
	"cOrange": "Oranžová (Oblíbit)",
	"cRed": "Červená (Zrušit)",
	"change_password": "Změnit heslo",
	"change_password_error": "Při změně vašeho hesla se vyskytla chyba.",
	"changed_password": "Heslo bylo úspěšně změněno!",
	"collapse_subject": "Zabalit příspěvky s předměty",
	"composing": "Komponování",
	"confirm_new_password": "Potvrďte nové heslo",
	"current_avatar": "Váš současný avatar",
	"current_password": "Současné heslo",
	"current_profile_banner": "Váš současný profilový banner",
	"data_import_export_tab": "Import/export dat",
	"default_vis": "Výchozí rozsah viditelnosti",
	"delete_account": "Smazat účet",
	"delete_account_description": "Trvale smaže váš účet a všechny vaše příspěvky.",
	"delete_account_error": "Při mazání vašeho účtu nastala chyba. Pokud tato chyba bude trvat, kontaktujte prosím admministrátora vaší instance.",
	"delete_account_instructions": "Pro potvrzení smazání účtu napište své heslo do pole níže.",
	"avatar_size_instruction": "Doporučená minimální velikost pro avatarové obrázky je 150x150 pixelů.",
	"export_theme": "Uložit přednastavení",
	"filtering": "Filtrování",
	"filtering_explanation": "Všechny příspěvky obsahující tato slova budou skryty. Napište jedno slovo na každý řádek",
	"follow_export": "Export sledovaných",
	"follow_export_button": "Exportovat vaše sledované do souboru CSV",
	"follow_export_processing": "Zpracovávám, brzy si budete moci stáhnout váš soubor",
	"follow_import": "Import sledovaných",
	"follow_import_error": "Chyba při importování sledovaných",
	"follows_imported": "Sledovaní importováni! Jejich zpracování bude chvilku trvat.",
	"foreground": "Popředí",
	"general": "Obecné",
	"hide_attachments_in_convo": "Skrývat přílohy v konverzacích",
	"hide_attachments_in_tl": "Skrývat přílohy v časové ose",
	"max_thumbnails": "Maximální počet miniatur na příspěvek",
	"hide_isp": "Skrýt panel specifický pro instanci",
	"preload_images": "Přednačítat obrázky",
	"use_one_click_nsfw": "Otevírat citlivé přílohy pouze jedním kliknutím",
	"hide_post_stats": "Skrývat statistiky příspěvků (např. počet oblíbení)",
	"hide_user_stats": "Skrývat statistiky uživatelů (např. počet sledujících)",
	"hide_filtered_statuses": "Skrývat filtrované příspěvky",
	"import_followers_from_a_csv_file": "Importovat sledované ze souboru CSV",
	"import_theme": "Načíst přednastavení",
	"inputRadius": "Vstupní pole",
	"checkboxRadius": "Zaškrtávací pole",
	"instance_default": "(výchozí: {value})",
	"instance_default_simple": "(výchozí)",
	"interface": "Rozhraní",
	"interfaceLanguage": "Jazyk rozhraní",
	"invalid_theme_imported": "Zvolený soubor není podporovaný motiv Pleroma. Nebyly provedeny žádné změny s vaším motivem.",
	"limited_availability": "Nedostupné ve vašem prohlížeči",
	"links": "Odkazy",
	"lock_account_description": "Omezit váš účet pouze na schválené sledující",
	"loop_video": "Opakovat videa",
	"loop_video_silent_only": "Opakovat pouze videa beze zvuku (t.j. „GIFy“ na Mastodonu)",
	"mutes_tab": "Ignorování",
	"play_videos_in_modal": "Přehrávat videa přímo v prohlížeči médií",
	"use_contain_fit": "Neořezávat přílohu v miniaturách",
	"name": "Jméno",
	"name_bio": "Jméno a popis",
	"new_password": "Nové heslo",
	"notification_visibility": "Typy oznámení k zobrazení",
	"notification_visibility_follows": "Sledující",
	"notification_visibility_likes": "Oblíbení",
	"notification_visibility_mentions": "Zmínky",
	"notification_visibility_repeats": "Zopakování",
	"no_rich_text_description": "Odstranit ze všech příspěvků formátování textu",
	"no_blocks": "Žádná blokování",
	"no_mutes": "Žádná ignorování",
	"hide_follows_description": "Nezobrazovat, koho sleduji",
	"hide_followers_description": "Nezobrazovat, kdo mě sleduje",
	"show_admin_badge": "Zobrazovat v mém profilu odznak administrátora",
	"show_moderator_badge": "Zobrazovat v mém profilu odznak moderátora",
	"nsfw_clickthrough": "Povolit prokliknutelné skrývání citlivých příloh",
	"oauth_tokens": "Tokeny OAuth",
	"token": "Token",
	"refresh_token": "Obnovit token",
	"valid_until": "Platný do",
	"revoke_token": "Odvolat",
	"panelRadius": "Panely",
	"pause_on_unfocused": "Pozastavit streamování, pokud není záložka prohlížeče v soustředění",
	"presets": "Přednastavení",
	"profile_background": "Profilové pozadí",
	"profile_banner": "Profilový banner",
	"profile_tab": "Profil",
	"radii_help": "Nastavit zakulacení rohů rozhraní (v pixelech)",
	"replies_in_timeline": "Odpovědi v časové ose",
	"reply_link_preview": "Povolit náhledy odkazu pro odpověď při přejetí myši",
	"reply_visibility_all": "Zobrazit všechny odpovědi",
	"reply_visibility_following": "Zobrazit pouze odpovědi směřované na mě nebo uživatele, které sleduji",
	"reply_visibility_self": "Zobrazit pouze odpovědi směřované na mě",
	"saving_err": "Chyba při ukládání nastavení",
	"saving_ok": "Nastavení uložena",
	"security_tab": "Bezpečnost",
	"scope_copy": "Kopírovat rozsah při odpovídání (přímé zprávy jsou vždy kopírovány)",
	"set_new_avatar": "Nastavit nový avatar",
	"set_new_profile_background": "Nastavit nové profilové pozadí",
	"set_new_profile_banner": "Nastavit nový profilový banner",
	"settings": "Nastavení",
	"subject_input_always_show": "Vždy zobrazit pole pro předmět",
	"subject_line_behavior": "Kopírovat předmět při odpovídání",
	"subject_line_email": "Jako u e-mailu: „re: předmět“",
	"subject_line_mastodon": "Jako u Mastodonu: zkopírovat tak, jak je",
	"subject_line_noop": "Nekopírovat",
	"post_status_content_type": "Publikovat typ obsahu příspěvku",
	"stop_gifs": "Přehrávat GIFy při přejetí myši",
	"streaming": "Povolit automatické streamování nových příspěvků při rolování nahoru",
	"text": "Text",
	"theme": "Motiv",
	"theme_help": "Použijte hexadecimální barevné kódy (#rrggbb) pro přizpůsobení vašeho barevného motivu.",
	"theme_help_v2_1": "Zaškrtnutím pole můžete také přepsat barvy a průhlednost některých komponentů, pro smazání všech přednastavení použijte tlačítko „Smazat vše“.",
	"theme_help_v2_2": "Ikony pod některými položkami jsou indikátory kontrastu pozadí/textu, pro detailní informace nad nimi přejeďte myší. Prosím berte na vědomí, že při používání kontrastu průhlednosti ukazují indikátory nejhorší možný případ.",
	"tooltipRadius": "Popisky/upozornění",
	"upload_a_photo": "Nahrát fotku",
	"user_settings": "Uživatelská nastavení",
	"values": {
	"false": "ne",
	"true": "ano"
	},
	"notifications": "Oznámení",
	"enable_web_push_notifications": "Povolit webová push oznámení",
	"style": {
	"switcher": {
	"keep_color": "Ponechat barvy",
	"keep_shadows": "Ponechat stíny",
	"keep_opacity": "Ponechat průhlednost",
	"keep_roundness": "Ponechat kulatost",
	"keep_fonts": "Keep fonts",
	"save_load_hint": "Možnosti „Ponechat“ dočasně ponechávají aktuálně nastavené možností při volení či nahrávání motivů, také tyto možnosti ukládají při exportování motivu. Pokud není žádné pole zaškrtnuto, uloží export motivu všechno.",
	"reset": "Resetovat",
	"clear_all": "Vymazat vše",
	"clear_opacity": "Vymazat průhlednost"
	},
	"common": {
	"color": "Barva",
	"opacity": "Průhlednost",
	"contrast": {
	"hint": "Poměr kontrastu je {ratio}, {level} {context}",
	"level": {
	"aa": "splňuje směrnici úrovně AA (minimální)",
	"aaa": "splňuje směrnici úrovně AAA (doporučováno)",
	"bad": "nesplňuje žádné směrnice přístupnosti"
	},
	"context": {
	"18pt": "pro velký (18+ bodů) text",
	"text": "pro text"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Obvyklé",
	"main": "Obvyklé barvy",
	"foreground_hint": "Pro detailnější kontrolu viz záložka „Pokročilé“",
	"rgbo": "Ikony, odstíny, odznaky"
	},
	"advanced_colors": {
	"_tab_label": "Pokročilé",
	"alert": "Pozadí upozornění",
	"alert_error": "Chyba",
	"badge": "Pozadí odznaků",
	"badge_notification": "Oznámení",
	"panel_header": "Záhlaví panelu",
	"top_bar": "Vrchní pruh",
	"borders": "Okraje",
	"buttons": "Tlačítka",
	"inputs": "Vstupní pole",
	"faint_text": "Vybledlý text"
	},
	"radii": {
	"_tab_label": "Kulatost"
	},
	"shadows": {
	"_tab_label": "Stín a osvětlení",
	"component": "Komponent",
	"override": "Přepsat",
	"shadow_id": "Stín #{value}",
	"blur": "Rozmazání",
	"spread": "Rozsah",
	"inset": "Vsazení",
	"hint": "Pro stíny můžete také použít --variable jako hodnotu barvy pro použití proměnných CSS3. Prosím berte na vědomí, že nastavení průhlednosti v tomto případě nebude fungovat.",
	"filter_hint": {
	"always_drop_shadow": "Varování, tento stín vždy používá {0}, když to prohlížeč podporuje.",
	"drop_shadow_syntax": "{0} nepodporuje parametr {1} a klíčové slovo {2}.",
	"avatar_inset": "Prosím berte na vědomí, že kombinování vsazených i nevsazených stínů u avatarů může u průhledných avatarů dát neočekávané výsledky.",
	"spread_zero": "Stíny s rozsahem > 0 se zobrazí, jako kdyby byl rozsah nastaven na nulu",
	"inset_classic": "Vsazené stíny budou používat {0}"
	},
	"components": {
	"panel": "Panel",
	"panelHeader": "Záhlaví panelu",
	"topBar": "Vrchní pruh",
	"avatar": "Avatar uživatele (v zobrazení profilu)",
	"avatarStatus": "Avatar uživatele (v zobrazení příspěvku)",
	"popup": "Vyskakovací okna a popisky",
	"button": "Tlačítko",
	"buttonHover": "Tlačítko (přejetí myši)",
	"buttonPressed": "Tlačítko (stisknuto)",
	"buttonPressedHover": "Button (stisknuto+přejetí myši)",
	"input": "Vstupní pole"
	}
	},
	"fonts": {
	"_tab_label": "Písma",
	"help": "Zvolte písmo, které bude použito pro prvky rozhraní. U možnosti „vlastní“ musíte zadat přesný název písma tak, jak se zobrazuje v systému.",
	"components": {
	"interface": "Rozhraní",
	"input": "Vstupní pole",
	"post": "Text příspěvků",
	"postCode": "Neproporcionální text v příspěvku (formátovaný text)"
	},
	"family": "Název písma",
	"size": "Velikost (v pixelech)",
	"weight": "Tloušťka",
	"custom": "Vlastní"
	},
	"preview": {
	"header": "Náhled",
	"content": "Obsah",
	"error": "Příklad chyby",
	"button": "Tlačítko",
	"text": "Spousta dalšího {0} a {1}",
	"mono": "obsahu",
	"input": "Právě jsem přistál v L.A.",
	"faint_link": "pomocný manuál",
	"fine_print": "Přečtěte si náš {0} a nenaučte se nic užitečného!",
	"header_faint": "Tohle je v pohodě",
	"checkbox": "Pročetl/a jsem podmínky používání",
	"link": "hezký malý odkaz"
	}
	}
	},
	"timeline": {
	"collapse": "Zabalit",
	"conversation": "Konverzace",
	"error_fetching": "Chyba při načítání aktualizací",
	"load_older": "Načíst starší příspěvky",
	"no_retweet_hint": "Příspěvek je označen jako pouze pro sledující či přímý a nemůže být zopakován",
	"repeated": "zopakoval/a",
	"show_new": "Zobrazit nové",
	"up_to_date": "Aktuální",
	"no_more_statuses": "Žádné další příspěvky",
	"no_statuses": "Žádné příspěvky"
	},
	"status": {
	"reply_to": "Odpověď uživateli",
	"replies_list": "Odpovědi:"
	},

	"user_card": {
	"approve": "Schválit",
	"block": "Blokovat",
	"blocked": "Blokován/a!",
	"deny": "Zamítnout",
	"favorites": "Oblíbené",
	"follow": "Sledovat",
	"follow_sent": "Požadavek odeslán!",
	"follow_progress": "Odeslílám požadavek…",
	"follow_again": "Odeslat požadavek znovu?",
	"follow_unfollow": "Přestat sledovat",
	"followees": "Sledovaní",
	"followers": "Sledující",
	"following": "Sledujete!",
	"follows_you": "Sleduje vás!",
	"its_you": "Jste to vy!",
	"media": "Média",
	"mute": "Ignorovat",
	"muted": "Ignorován/a",
	"per_day": "za den",
	"remote_follow": "Vzdálené sledování",
	"statuses": "Příspěvky",
	"unblock": "Odblokovat",
	"unblock_progress": "Odblokuji…",
	"block_progress": "Blokuji…",
	"unmute": "Přestat ignorovat",
	"unmute_progress": "Ruším ignorování…",
	"mute_progress": "Ignoruji…"
	},
	"user_profile": {
	"timeline_title": "Uživatelská časová osa",
	"profile_does_not_exist": "Omlouváme se, tento profil neexistuje.",
	"profile_loading_error": "Omlouváme se, při načítání tohoto profilu se vyskytla chyba."
	},
	"who_to_follow": {
	"more": "Více",
	"who_to_follow": "Koho sledovat"
	},
	"tool_tip": {
	"media_upload": "Nahrát média",
	"repeat": "Zopakovat",
	"reply": "Odpovědět",
	"favorite": "Oblíbit",
	"user_settings": "Uživatelské nastavení"
	},
	"upload":{
	"error": {
	"base": "Nahrávání selhalo.",
	"file_too_big": "Soubor je příliš velký [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Zkuste to znovu později"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/de.json b/src/i18n/de.json
	index 07d44348c3..fa9db16c7c 100644
	--- a/src/i18n/de.json
	+++ b/src/i18n/de.json
	@@ -1,376 +1,376 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media Proxy",
	"scope_options": "Reichweitenoptionen",
	"text_limit": "Textlimit",
	"title": "Features",
	"who_to_follow": "Who to follow"
	},
	"finder": {
	"error_fetching_user": "Fehler beim Suchen des Benutzers",
	"find_user": "Finde Benutzer"
	},
	"general": {
	"apply": "Anwenden",
	"submit": "Absenden"
	},
	"login": {
	"login": "Anmelden",
	"description": "Mit OAuth anmelden",
	"logout": "Abmelden",
	"password": "Passwort",
	"placeholder": "z.B. lain",
	"register": "Registrieren",
	"username": "Benutzername"
	},
	"nav": {
	"back": "Zurück",
	"chat": "Lokaler Chat",
	"friend_requests": "Followanfragen",
	"mentions": "Erwähnungen",
	"dms": "Direktnachrichten",
	"public_tl": "Öffentliche Zeitleiste",
	"timeline": "Zeitleiste",
	"twkn": "Das gesamte bekannte Netzwerk",
	"user_search": "Benutzersuche",
	"preferences": "Voreinstellungen"
	},
	"notifications": {
	"broken_favorite": "Unbekannte Nachricht, suche danach...",
	"favorited_you": "favorisierte deine Nachricht",
	"followed_you": "folgt dir",
	"load_older": "Ältere Benachrichtigungen laden",
	"notifications": "Benachrichtigungen",
	"read": "Gelesen!",
	"repeated_you": "wiederholte deine Nachricht"
	},
	"post_status": {
	"new_status": "Neuen Status veröffentlichen",
	"account_not_locked_warning": "Dein Profil ist nicht {0}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
	"account_not_locked_warning_link": "gesperrt",
	"attachments_sensitive": "Anhänge als heikel markieren",
	"content_type": {
	- "plain_text": "Nur Text"
	+ "text/plain": "Nur Text"
	},
	"content_warning": "Betreff (optional)",
	"default": "Sitze gerade im Hofbräuhaus.",
	"direct_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
	"posting": "Veröffentlichen",
	"scope": {
	"direct": "Direkt - Beitrag nur an erwähnte Profile",
	"private": "Nur Follower - Beitrag nur für Follower sichtbar",
	"public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
	"unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
	}
	},
	"registration": {
	"bio": "Bio",
	"email": "Email",
	"fullname": "Angezeigter Name",
	"password_confirm": "Passwort bestätigen",
	"registration": "Registrierung",
	"token": "Einladungsschlüssel",
	"captcha": "CAPTCHA",
	"new_captcha": "Zum Erstellen eines neuen Captcha auf das Bild klicken.",
	"validations": {
	"username_required": "darf nicht leer sein",
	"fullname_required": "darf nicht leer sein",
	"email_required": "darf nicht leer sein",
	"password_required": "darf nicht leer sein",
	"password_confirmation_required": "darf nicht leer sein",
	"password_confirmation_match": "sollte mit dem Passwort identisch sein."
	}
	},
	"settings": {
	"attachmentRadius": "Anhänge",
	"attachments": "Anhänge",
	"autoload": "Aktiviere automatisches Laden von älteren Beiträgen beim scrollen",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatare (Benachrichtigungen)",
	"avatarRadius": "Avatare",
	"background": "Hintergrund",
	"bio": "Bio",
	"btnRadius": "Buttons",
	"cBlue": "Blau (Antworten, Folgt dir)",
	"cGreen": "Grün (Retweet)",
	"cOrange": "Orange (Favorisieren)",
	"cRed": "Rot (Abbrechen)",
	"change_password": "Passwort ändern",
	"change_password_error": "Es gab ein Problem bei der Änderung des Passworts.",
	"changed_password": "Passwort erfolgreich geändert!",
	"collapse_subject": "Beiträge mit Betreff einklappen",
	"composing": "Verfassen",
	"confirm_new_password": "Neues Passwort bestätigen",
	"current_avatar": "Dein derzeitiger Avatar",
	"current_password": "Aktuelles Passwort",
	"current_profile_banner": "Der derzeitige Banner deines Profils",
	"data_import_export_tab": "Datenimport/-export",
	"default_vis": "Standard-Sichtbarkeitsumfang",
	"delete_account": "Account löschen",
	"delete_account_description": "Lösche deinen Account und alle deine Nachrichten unwiderruflich.",
	"delete_account_error": "Es ist ein Fehler beim Löschen deines Accounts aufgetreten. Tritt dies weiterhin auf, wende dich an den Administrator der Instanz.",
	"delete_account_instructions": "Tippe dein Passwort unten in das Feld ein, um die Löschung deines Accounts zu bestätigen.",
	"export_theme": "Farbschema speichern",
	"filtering": "Filtern",
	"filtering_explanation": "Alle Beiträge die diese Wörter enthalten werden ausgeblendet. Ein Wort pro Zeile.",
	"follow_export": "Follower exportieren",
	"follow_export_button": "Exportiere deine Follows in eine csv-Datei",
	"follow_export_processing": "In Bearbeitung. Die Liste steht gleich zum herunterladen bereit.",
	"follow_import": "Followers importieren",
	"follow_import_error": "Fehler beim importieren der Follower",
	"follows_imported": "Followers importiert! Die Bearbeitung kann eine Zeit lang dauern.",
	"foreground": "Vordergrund",
	"general": "Allgemein",
	"hide_attachments_in_convo": "Anhänge in Unterhaltungen ausblenden",
	"hide_attachments_in_tl": "Anhänge in der Zeitleiste ausblenden",
	"hide_isp": "Instanz-spezifisches Panel ausblenden",
	"preload_images": "Bilder vorausladen",
	"hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
	"hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)",
	"hide_filtered_statuses": "Gefilterte Beiträge verbergen",
	"import_followers_from_a_csv_file": "Importiere Follower, denen du folgen möchtest, aus einer CSV-Datei",
	"import_theme": "Farbschema laden",
	"inputRadius": "Eingabefelder",
	"checkboxRadius": "Auswahlfelder",
	"instance_default": "(Standard: {value})",
	"instance_default_simple": "(Standard)",
	"interface": "Oberfläche",
	"interfaceLanguage": "Sprache der Oberfläche",
	"invalid_theme_imported": "Die ausgewählte Datei ist kein unterstütztes Pleroma-Theme. Keine Änderungen wurden vorgenommen.",
	"limited_availability": "In deinem Browser nicht verfügbar",
	"links": "Links",
	"lock_account_description": "Sperre deinen Account, um neue Follower zu genehmigen oder abzulehnen",
	"loop_video": "Videos wiederholen",
	"loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")",
	"name": "Name",
	"name_bio": "Name & Bio",
	"new_password": "Neues Passwort",
	"notification_visibility": "Benachrichtigungstypen, die angezeigt werden sollen",
	"notification_visibility_follows": "Follows",
	"notification_visibility_likes": "Favoriten",
	"notification_visibility_mentions": "Erwähnungen",
	"notification_visibility_repeats": "Wiederholungen",
	"no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen",
	"hide_follows_description": "Zeige nicht, wem ich folge",
	"hide_followers_description": "Zeige nicht, wer mir folgt",
	"nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind",
	"oauth_tokens": "OAuth-Token",
	"token": "Zeichen",
	"refresh_token": "Token aktualisieren",
	"valid_until": "Gültig bis",
	"revoke_token": "Widerrufen",
	"panelRadius": "Panel",
	"pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
	"presets": "Voreinstellungen",
	"profile_background": "Profilhintergrund",
	"profile_banner": "Profilbanner",
	"profile_tab": "Profil",
	"radii_help": "Kantenrundung (in Pixel) der Oberfläche anpassen",
	"replies_in_timeline": "Antworten in der Zeitleiste",
	"reply_link_preview": "Antwortlink-Vorschau beim Überfahren mit der Maus aktivieren",
	"reply_visibility_all": "Alle Antworten zeigen",
	"reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
	"reply_visibility_self": "Nur Antworten an mich anzeigen",
	"saving_err": "Fehler beim Speichern der Einstellungen",
	"saving_ok": "Einstellungen gespeichert",
	"security_tab": "Sicherheit",
	"scope_copy": "Reichweite beim Antworten übernehmen (Direktnachrichten werden immer kopiert)",
	"set_new_avatar": "Setze einen neuen Avatar",
	"set_new_profile_background": "Setze einen neuen Hintergrund für dein Profil",
	"set_new_profile_banner": "Setze einen neuen Banner für dein Profil",
	"settings": "Einstellungen",
	"subject_input_always_show": "Betreff-Feld immer anzeigen",
	"subject_line_behavior": "Betreff beim Antworten kopieren",
	"subject_line_email": "Wie Email: \"re: Betreff\"",
	"subject_line_mastodon": "Wie Mastodon: unverändert kopieren",
	"subject_line_noop": "Nicht kopieren",
	"stop_gifs": "Play-on-hover GIFs",
	"streaming": "Aktiviere automatisches Laden (Streaming) von neuen Beiträgen",
	"text": "Text",
	"theme": "Farbschema",
	"theme_help": "Benutze HTML-Farbcodes (#rrggbb) um dein Farbschema anzupassen",
	"theme_help_v2_1": "Du kannst auch die Farben und die Deckkraft bestimmter Komponenten überschreiben, indem du das Kontrollkästchen umschaltest. Verwende die Schaltfläche \"Alle löschen\", um alle Überschreibungen zurückzusetzen.",
	"theme_help_v2_2": "Unter einigen Einträgen befinden sich Symbole für Hintergrund-/Textkontrastindikatoren, für detaillierte Informationen fahre mit der Maus darüber. Bitte beachte, dass bei der Verwendung von Transparenz Kontrastindikatoren den schlechtest möglichen Fall darstellen.",
	"tooltipRadius": "Tooltips/Warnungen",
	"user_settings": "Benutzereinstellungen",
	"values": {
	"false": "nein",
	"true": "Ja"
	},
	"notifications": "Benachrichtigungen",
	"enable_web_push_notifications": "Web-Pushbenachrichtigungen aktivieren",
	"style": {
	"switcher": {
	"keep_color": "Farben beibehalten",
	"keep_shadows": "Schatten beibehalten",
	"keep_opacity": "Deckkraft beibehalten",
	"keep_roundness": "Abrundungen beibehalten",
	"keep_fonts": "Schriften beibehalten",
	"save_load_hint": "Die \"Beibehalten\"-Optionen behalten die aktuell eingestellten Optionen beim Auswählen oder Laden von Designs bei, sie speichern diese Optionen auch beim Exportieren eines Designs. Wenn alle Kontrollkästchen deaktiviert sind, wird beim Exportieren des Designs alles gespeichert.",
	"reset": "Zurücksetzen",
	"clear_all": "Alles leeren",
	"clear_opacity": "Deckkraft leeren"
	},
	"common": {
	"color": "Farbe",
	"opacity": "Deckkraft",
	"contrast": {
	"hint": "Das Kontrastverhältnis ist {ratio}, es {level} {context}",
	"level": {
	"aa": "entspricht Level AA Richtlinie (minimum)",
	"aaa": "entspricht Level AAA Richtlinie (empfohlen)",
	"bad": "entspricht keiner Richtlinien zur Barrierefreiheit"
	},
	"context": {
	"18pt": "für großen (18pt+) Text",
	"text": "für Text"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Allgemein",
	"main": "Allgemeine Farben",
	"foreground_hint": "Siehe Reiter \"Erweitert\" für eine detailliertere Einstellungen",
	"rgbo": "Symbole, Betonungen, Kennzeichnungen"
	},
	"advanced_colors": {
	"_tab_label": "Erweitert",
	"alert": "Warnhinweis-Hintergrund",
	"alert_error": "Fehler",
	"badge": "Kennzeichnungs-Hintergrund",
	"badge_notification": "Benachrichtigung",
	"panel_header": "Panel-Kopf",
	"top_bar": "Obere Leiste",
	"borders": "Rahmen",
	"buttons": "Schaltflächen",
	"inputs": "Eingabefelder",
	"faint_text": "Verblasster Text"
	},
	"radii": {
	"_tab_label": "Abrundungen"
	},
	"shadows": {
	"_tab_label": "Schatten und Beleuchtung",
	"component": "Komponente",
	"override": "Überschreiben",
	"shadow_id": "Schatten #{value}",
	"blur": "Unschärfe",
	"spread": "Streuung",
	"inset": "Einsatz",
	"hint": "Für Schatten kannst du auch --variable als Farbwert verwenden, um CSS3-Variablen zu verwenden. Bitte beachte, dass die Einstellung der Deckkraft in diesem Fall nicht funktioniert.",
	"filter_hint": {
	"always_drop_shadow": "Achtung, dieser Schatten verwendet immer {0}, wenn der Browser dies unterstützt.",
	"drop_shadow_syntax": "{0} unterstützt Parameter {1} und Schlüsselwort {2} nicht.",
	"avatar_inset": "Bitte beachte, dass die Kombination von eingesetzten und nicht eingesetzten Schatten auf Avataren zu unerwarteten Ergebnissen bei transparenten Avataren führen kann.",
	"spread_zero": "Schatten mit einer Streuung > 0 erscheinen so, als ob sie auf Null gesetzt wären.",
	"inset_classic": "Eingesetzte Schatten werden mit {0} verwendet"
	},
	"components": {
	"panel": "Panel",
	"panelHeader": "Panel-Kopf",
	"topBar": "Obere Leiste",
	"avatar": "Benutzer-Avatar (in der Profilansicht)",
	"avatarStatus": "Benutzer-Avatar (in der Beitragsanzeige)",
	"popup": "Dialogfenster und Hinweistexte",
	"button": "Schaltfläche",
	"buttonHover": "Schaltfläche (hover)",
	"buttonPressed": "Schaltfläche (gedrückt)",
	"buttonPressedHover": "Schaltfläche (gedrückt+hover)",
	"input": "Input field"
	}
	},
	"fonts": {
	"_tab_label": "Schriften",
	"help": "Wähl die Schriftart, die für Elemente der Benutzeroberfläche verwendet werden soll. Für \" Benutzerdefiniert\" musst du den genauen Schriftnamen eingeben, wie er im System angezeigt wird.",
	"components": {
	"interface": "Oberfläche",
	"input": "Eingabefelder",
	"post": "Beitragstext",
	"postCode": "Dicktengleicher Text in einem Beitrag (Rich-Text)"
	},
	"family": "Schriftname",
	"size": "Größe (in px)",
	"weight": "Gewicht (Dicke)",
	"custom": "Benutzerdefiniert"
	},
	"preview": {
	"header": "Vorschau",
	"content": "Inhalt",
	"error": "Beispielfehler",
	"button": "Schaltfläche",
	"text": "Ein Haufen mehr von {0} und {1}",
	"mono": "Inhalt",
	"input": "Sitze gerade im Hofbräuhaus.",
	"faint_link": "Hilfreiche Anleitung",
	"fine_print": "Lies unser {0}, um nichts Nützliches zu lernen!",
	"header_faint": "Das ist in Ordnung",
	"checkbox": "Ich habe die Allgemeinen Geschäftsbedingungen überflogen",
	"link": "ein netter kleiner Link"
	}
	}
	},
	"timeline": {
	"collapse": "Einklappen",
	"conversation": "Unterhaltung",
	"error_fetching": "Fehler beim Laden",
	"load_older": "Lade ältere Beiträge",
	"no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder als Direktnachricht markiert und kann nicht wiederholt werden.",
	"repeated": "wiederholte",
	"show_new": "Zeige Neuere",
	"up_to_date": "Aktuell"
	},
	"user_card": {
	"approve": "Genehmigen",
	"block": "Blockieren",
	"blocked": "Blockiert!",
	"deny": "Ablehnen",
	"follow": "Folgen",
	"follow_sent": "Anfrage gesendet!",
	"follow_progress": "Anfragen…",
	"follow_again": "Anfrage erneut senden?",
	"follow_unfollow": "Folgen beenden",
	"followees": "Folgt",
	"followers": "Followers",
	"following": "Folgst du!",
	"follows_you": "Folgt dir!",
	"its_you": "Das bist du!",
	"mute": "Stummschalten",
	"muted": "Stummgeschaltet",
	"per_day": "pro Tag",
	"remote_follow": "Folgen",
	"statuses": "Beiträge"
	},
	"user_profile": {
	"timeline_title": "Beiträge"
	},
	"who_to_follow": {
	"more": "Mehr",
	"who_to_follow": "Wem soll ich folgen"
	},
	"tool_tip": {
	"media_upload": "Medien hochladen",
	"repeat": "Wiederholen",
	"reply": "Antworten",
	"favorite": "Favorisieren",
	"user_settings": "Benutzereinstellungen"
	},
	"upload":{
	"error": {
	"base": "Hochladen fehlgeschlagen.",
	"file_too_big": "Datei ist zu groß [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Bitte versuche es später erneut"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/en.json b/src/i18n/en.json
	index 01fe2fba21..68503f99fe 100644
	--- a/src/i18n/en.json
	+++ b/src/i18n/en.json
	@@ -1,427 +1,433 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media proxy",
	"scope_options": "Scope options",
	"text_limit": "Text limit",
	"title": "Features",
	"who_to_follow": "Who to follow"
	},
	"finder": {
	"error_fetching_user": "Error fetching user",
	"find_user": "Find user"
	},
	"general": {
	"apply": "Apply",
	"submit": "Submit",
	"more": "More",
	"generic_error": "An error occured",
	"optional": "optional"
	},
	"image_cropper": {
	"crop_picture": "Crop picture",
	"save": "Save",
	+ "save_without_cropping": "Save without cropping",
	"cancel": "Cancel"
	},
	"login": {
	"login": "Log in",
	"description": "Log in with OAuth",
	"logout": "Log out",
	"password": "Password",
	"placeholder": "e.g. lain",
	"register": "Register",
	"username": "Username",
	"hint": "Log in to join the discussion"
	},
	"media_modal": {
	"previous": "Previous",
	"next": "Next"
	},
	"nav": {
	"about": "About",
	"back": "Back",
	"chat": "Local Chat",
	"friend_requests": "Follow Requests",
	"mentions": "Mentions",
	"dms": "Direct Messages",
	"public_tl": "Public Timeline",
	"timeline": "Timeline",
	"twkn": "The Whole Known Network",
	"user_search": "User Search",
	"who_to_follow": "Who to follow",
	"preferences": "Preferences"
	},
	"notifications": {
	"broken_favorite": "Unknown status, searching for it...",
	"favorited_you": "favorited your status",
	"followed_you": "followed you",
	"load_older": "Load older notifications",
	"notifications": "Notifications",
	"read": "Read!",
	"repeated_you": "repeated your status",
	"no_more_notifications": "No more notifications"
	},
	"post_status": {
	"new_status": "Post new status",
	"account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
	"account_not_locked_warning_link": "locked",
	"attachments_sensitive": "Mark attachments as sensitive",
	"content_type": {
	"text/plain": "Plain text",
	"text/html": "HTML",
	"text/markdown": "Markdown"
	},
	"content_warning": "Subject (optional)",
	"default": "Just landed in L.A.",
	"direct_warning": "This post will only be visible to all the mentioned users.",
	"posting": "Posting",
	"scope": {
	"direct": "Direct - Post to mentioned users only",
	"private": "Followers-only - Post to followers only",
	"public": "Public - Post to public timelines",
	"unlisted": "Unlisted - Do not post to public timelines"
	}
	},
	"registration": {
	"bio": "Bio",
	"email": "Email",
	"fullname": "Display name",
	"password_confirm": "Password confirmation",
	"registration": "Registration",
	"token": "Invite token",
	"captcha": "CAPTCHA",
	"new_captcha": "Click the image to get a new captcha",
	"username_placeholder": "e.g. lain",
	"fullname_placeholder": "e.g. Lain Iwakura",
	"bio_placeholder": "e.g.\nHi, I'm Lain\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
	"validations": {
	"username_required": "cannot be left blank",
	"fullname_required": "cannot be left blank",
	"email_required": "cannot be left blank",
	"password_required": "cannot be left blank",
	"password_confirmation_required": "cannot be left blank",
	"password_confirmation_match": "should be the same as password"
	}
	},
	"settings": {
	"app_name": "App name",
	"attachmentRadius": "Attachments",
	"attachments": "Attachments",
	"autoload": "Enable automatic loading when scrolled to the bottom",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars (Notifications)",
	"avatarRadius": "Avatars",
	"background": "Background",
	"bio": "Bio",
	"blocks_tab": "Blocks",
	"btnRadius": "Buttons",
	"cBlue": "Blue (Reply, follow)",
	"cGreen": "Green (Retweet)",
	"cOrange": "Orange (Favorite)",
	"cRed": "Red (Cancel)",
	"change_password": "Change Password",
	"change_password_error": "There was an issue changing your password.",
	"changed_password": "Password changed successfully!",
	"collapse_subject": "Collapse posts with subjects",
	"composing": "Composing",
	"confirm_new_password": "Confirm new password",
	"current_avatar": "Your current avatar",
	"current_password": "Current password",
	"current_profile_banner": "Your current profile banner",
	"data_import_export_tab": "Data Import / Export",
	"default_vis": "Default visibility scope",
	"delete_account": "Delete Account",
	"delete_account_description": "Permanently delete your account and all your messages.",
	"delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
	"delete_account_instructions": "Type your password in the input below to confirm account deletion.",
	"avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
	"export_theme": "Save preset",
	"filtering": "Filtering",
	"filtering_explanation": "All statuses containing these words will be muted, one per line",
	"follow_export": "Follow export",
	"follow_export_button": "Export your follows to a csv file",
	"follow_export_processing": "Processing, you'll soon be asked to download your file",
	"follow_import": "Follow import",
	"follow_import_error": "Error importing followers",
	"follows_imported": "Follows imported! Processing them will take a while.",
	"foreground": "Foreground",
	"general": "General",
	"hide_attachments_in_convo": "Hide attachments in conversations",
	"hide_attachments_in_tl": "Hide attachments in timeline",
	"max_thumbnails": "Maximum amount of thumbnails per post",
	"hide_isp": "Hide instance-specific panel",
	"preload_images": "Preload images",
	"use_one_click_nsfw": "Open NSFW attachments with just one click",
	"hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
	"hide_user_stats": "Hide user statistics (e.g. the number of followers)",
	"hide_filtered_statuses": "Hide filtered statuses",
	"import_followers_from_a_csv_file": "Import follows from a csv file",
	"import_theme": "Load preset",
	"inputRadius": "Input fields",
	"checkboxRadius": "Checkboxes",
	"instance_default": "(default: {value})",
	"instance_default_simple": "(default)",
	"interface": "Interface",
	"interfaceLanguage": "Interface language",
	"invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
	"limited_availability": "Unavailable in your browser",
	"links": "Links",
	"lock_account_description": "Restrict your account to approved followers only",
	"loop_video": "Loop videos",
	"loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
	"mutes_tab": "Mutes",
	"play_videos_in_modal": "Play videos directly in the media viewer",
	"use_contain_fit": "Don't crop the attachment in thumbnails",
	"name": "Name",
	"name_bio": "Name & Bio",
	"new_password": "New password",
	"notification_visibility": "Types of notifications to show",
	"notification_visibility_follows": "Follows",
	"notification_visibility_likes": "Likes",
	"notification_visibility_mentions": "Mentions",
	"notification_visibility_repeats": "Repeats",
	"no_rich_text_description": "Strip rich text formatting from all posts",
	"no_blocks": "No blocks",
	"no_mutes": "No mutes",
	"hide_follows_description": "Don't show who I'm following",
	"hide_followers_description": "Don't show who's following me",
	"show_admin_badge": "Show Admin badge in my profile",
	"show_moderator_badge": "Show Moderator badge in my profile",
	"nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
	"oauth_tokens": "OAuth tokens",
	"token": "Token",
	"refresh_token": "Refresh Token",
	"valid_until": "Valid Until",
	"revoke_token": "Revoke",
	"panelRadius": "Panels",
	"pause_on_unfocused": "Pause streaming when tab is not focused",
	"presets": "Presets",
	"profile_background": "Profile Background",
	"profile_banner": "Profile Banner",
	"profile_tab": "Profile",
	"radii_help": "Set up interface edge rounding (in pixels)",
	"replies_in_timeline": "Replies in timeline",
	"reply_link_preview": "Enable reply-link preview on mouse hover",
	"reply_visibility_all": "Show all replies",
	"reply_visibility_following": "Only show replies directed at me or users I'm following",
	"reply_visibility_self": "Only show replies directed at me",
	"saving_err": "Error saving settings",
	"saving_ok": "Settings saved",
	"security_tab": "Security",
	"scope_copy": "Copy scope when replying (DMs are always copied)",
	"set_new_avatar": "Set new avatar",
	"set_new_profile_background": "Set new profile background",
	"set_new_profile_banner": "Set new profile banner",
	"settings": "Settings",
	"subject_input_always_show": "Always show subject field",
	"subject_line_behavior": "Copy subject when replying",
	"subject_line_email": "Like email: \"re: subject\"",
	"subject_line_mastodon": "Like mastodon: copy as is",
	"subject_line_noop": "Do not copy",
	"post_status_content_type": "Post status content type",
	"stop_gifs": "Play-on-hover GIFs",
	"streaming": "Enable automatic streaming of new posts when scrolled to the top",
	"text": "Text",
	"theme": "Theme",
	"theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
	"theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
	"theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
	"tooltipRadius": "Tooltips/alerts",
	"upload_a_photo": "Upload a photo",
	"user_settings": "User Settings",
	"values": {
	"false": "no",
	"true": "yes"
	},
	"notifications": "Notifications",
	"enable_web_push_notifications": "Enable web push notifications",
	"style": {
	"switcher": {
	"keep_color": "Keep colors",
	"keep_shadows": "Keep shadows",
	"keep_opacity": "Keep opacity",
	"keep_roundness": "Keep roundness",
	"keep_fonts": "Keep fonts",
	"save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
	"reset": "Reset",
	"clear_all": "Clear all",
	"clear_opacity": "Clear opacity"
	},
	"common": {
	"color": "Color",
	"opacity": "Opacity",
	"contrast": {
	"hint": "Contrast ratio is {ratio}, it {level} {context}",
	"level": {
	"aa": "meets Level AA guideline (minimal)",
	"aaa": "meets Level AAA guideline (recommended)",
	"bad": "doesn't meet any accessibility guidelines"
	},
	"context": {
	"18pt": "for large (18pt+) text",
	"text": "for text"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Common",
	"main": "Common colors",
	"foreground_hint": "See \"Advanced\" tab for more detailed control",
	"rgbo": "Icons, accents, badges"
	},
	"advanced_colors": {
	"_tab_label": "Advanced",
	"alert": "Alert background",
	"alert_error": "Error",
	"badge": "Badge background",
	"badge_notification": "Notification",
	"panel_header": "Panel header",
	"top_bar": "Top bar",
	"borders": "Borders",
	"buttons": "Buttons",
	"inputs": "Input fields",
	"faint_text": "Faded text"
	},
	"radii": {
	"_tab_label": "Roundness"
	},
	"shadows": {
	"_tab_label": "Shadow and lighting",
	"component": "Component",
	"override": "Override",
	"shadow_id": "Shadow #{value}",
	"blur": "Blur",
	"spread": "Spread",
	"inset": "Inset",
	"hint": "For shadows you can also use --variable as a color value to use CSS3 variables. Please note that setting opacity won't work in this case.",
	"filter_hint": {
	"always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
	"drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
	"avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
	"spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
	"inset_classic": "Inset shadows will be using {0}"
	},
	"components": {
	"panel": "Panel",
	"panelHeader": "Panel header",
	"topBar": "Top bar",
	"avatar": "User avatar (in profile view)",
	"avatarStatus": "User avatar (in post display)",
	"popup": "Popups and tooltips",
	"button": "Button",
	"buttonHover": "Button (hover)",
	"buttonPressed": "Button (pressed)",
	"buttonPressedHover": "Button (pressed+hover)",
	"input": "Input field"
	}
	},
	"fonts": {
	"_tab_label": "Fonts",
	"help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
	"components": {
	"interface": "Interface",
	"input": "Input fields",
	"post": "Post text",
	"postCode": "Monospaced text in a post (rich text)"
	},
	"family": "Font name",
	"size": "Size (in px)",
	"weight": "Weight (boldness)",
	"custom": "Custom"
	},
	"preview": {
	"header": "Preview",
	"content": "Content",
	"error": "Example error",
	"button": "Button",
	"text": "A bunch of more {0} and {1}",
	"mono": "content",
	"input": "Just landed in L.A.",
	"faint_link": "helpful manual",
	"fine_print": "Read our {0} to learn nothing useful!",
	"header_faint": "This is fine",
	"checkbox": "I have skimmed over terms and conditions",
	"link": "a nice lil' link"
	}
	+ },
	+ "version": {
	+ "title": "Version",
	+ "backend_version": "Backend Version",
	+ "frontend_version": "Frontend Version"
	}
	},
	"timeline": {
	"collapse": "Collapse",
	"conversation": "Conversation",
	"error_fetching": "Error fetching updates",
	"load_older": "Load older statuses",
	"no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
	"repeated": "repeated",
	"show_new": "Show new",
	"up_to_date": "Up-to-date",
	"no_more_statuses": "No more statuses",
	"no_statuses": "No statuses"
	},
	"status": {
	"reply_to": "Reply to",
	"replies_list": "Replies:"
	},
	"user_card": {
	"approve": "Approve",
	"block": "Block",
	"blocked": "Blocked!",
	"deny": "Deny",
	"favorites": "Favorites",
	"follow": "Follow",
	"follow_sent": "Request sent!",
	"follow_progress": "Requesting…",
	"follow_again": "Send request again?",
	"follow_unfollow": "Unfollow",
	"followees": "Following",
	"followers": "Followers",
	"following": "Following!",
	"follows_you": "Follows you!",
	"its_you": "It's you!",
	"media": "Media",
	"mute": "Mute",
	"muted": "Muted",
	"per_day": "per day",
	"remote_follow": "Remote follow",
	"statuses": "Statuses",
	"unblock": "Unblock",
	"unblock_progress": "Unblocking...",
	"block_progress": "Blocking...",
	"unmute": "Unmute",
	"unmute_progress": "Unmuting...",
	"mute_progress": "Muting..."
	},
	"user_profile": {
	"timeline_title": "User Timeline",
	"profile_does_not_exist": "Sorry, this profile does not exist.",
	"profile_loading_error": "Sorry, there was an error loading this profile."
	},
	"who_to_follow": {
	"more": "More",
	"who_to_follow": "Who to follow"
	},
	"tool_tip": {
	"media_upload": "Upload Media",
	"repeat": "Repeat",
	"reply": "Reply",
	"favorite": "Favorite",
	"user_settings": "User Settings"
	},
	"upload":{
	"error": {
	"base": "Upload failed.",
	"file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Try again later"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/eo.json b/src/i18n/eo.json
	index 34851a4406..6c5b3a745e 100644
	--- a/src/i18n/eo.json
	+++ b/src/i18n/eo.json
	@@ -1,421 +1,421 @@
	{
	"chat": {
	"title": "Babilejo"
	},
	"features_panel": {
	"chat": "Babilejo",
	"gopher": "Gopher",
	"media_proxy": "Aŭdvidaĵa prokurilo",
	"scope_options": "Agordoj de amplekso",
	"text_limit": "Teksta limo",
	"title": "Funkcioj",
	"who_to_follow": "Kiun aboni"
	},
	"finder": {
	"error_fetching_user": "Eraro alportante uzanton",
	"find_user": "Trovi uzanton"
	},
	"general": {
	"apply": "Apliki",
	"submit": "Sendi",
	"more": "Pli",
	"generic_error": "Eraro okazis",
	"optional": "Malnepra"
	},
	"image_cropper": {
	"crop_picture": "Tondi bildon",
	"save": "Konservi",
	"cancel": "Nuligi"
	},
	"login": {
	"login": "Saluti",
	"description": "Saluti per OAuth",
	"logout": "Adiaŭi",
	"password": "Pasvorto",
	"placeholder": "ekz. lain",
	"register": "Registriĝi",
	"username": "Salutnomo",
	"hint": "Salutu por partopreni la diskutadon"
	},
	"media_modal": {
	"previous": "Antaŭa",
	"next": "Sekva"
	},
	"nav": {
	"about": "Pri",
	"back": "Reen",
	"chat": "Loka babilejo",
	"friend_requests": "Abonaj petoj",
	"mentions": "Mencioj",
	"dms": "Rektaj mesaĝoj",
	"public_tl": "Publika tempolinio",
	"timeline": "Tempolinio",
	"twkn": "La tuta konata reto",
	"user_search": "Serĉi uzantojn",
	"who_to_follow": "Kiun aboni",
	"preferences": "Agordoj"
	},
	"notifications": {
	"broken_favorite": "Nekonata stato, serĉante ĝin…",
	"favorited_you": "ŝatis vian staton",
	"followed_you": "ekabonis vin",
	"load_older": "Enlegi pli malnovajn sciigojn",
	"notifications": "Sciigoj",
	"read": "Legite!",
	"repeated_you": "ripetis vian staton",
	"no_more_notifications": "Neniuj pliaj sciigoj"
	},
	"post_status": {
	"new_status": "Afiŝi novan staton",
	"account_not_locked_warning": "Via konto ne estas {0}. Iu ajn povas vin aboni por vidi viajn afiŝoj nur por abonantoj.",
	"account_not_locked_warning_link": "ŝlosita",
	"attachments_sensitive": "Marki kunsendaĵojn kiel konsternajn",
	"content_type": {
	- "plain_text": "Plata teksto"
	+ "text/plain": "Plata teksto"
	},
	"content_warning": "Temo (malnepra)",
	"default": "Ĵus alvenis al la Universala Kongreso!",
	"direct_warning": "Ĉi tiu afiŝo estos videbla nur por ĉiuj menciitaj uzantoj.",
	"posting": "Afiŝante",
	"scope": {
	"direct": "Rekta – Afiŝi nur al menciitaj uzantoj",
	"private": "Nur abonantoj – Afiŝi nur al abonantoj",
	"public": "Publika – Afiŝi al publikaj tempolinioj",
	"unlisted": "Nelistigita – Ne afiŝi al publikaj tempolinioj"
	}
	},
	"registration": {
	"bio": "Priskribo",
	"email": "Retpoŝtadreso",
	"fullname": "Vidiga nomo",
	"password_confirm": "Konfirmo de pasvorto",
	"registration": "Registriĝo",
	"token": "Invita ĵetono",
	"captcha": "TESTO DE HOMECO",
	"new_captcha": "Alklaku la bildon por akiri novan teston",
	"username_placeholder": "ekz. lain",
	"fullname_placeholder": "ekz. Lain Iwakura",
	"bio_placeholder": "ekz.\nSaluton, mi estas Lain\nMi estas animea knabino vivante en Japanujo. Eble vi konas min de la retejo « Wired ».",
	"validations": {
	"username_required": "ne povas resti malplena",
	"fullname_required": "ne povas resti malplena",
	"email_required": "ne povas resti malplena",
	"password_required": "ne povas resti malplena",
	"password_confirmation_required": "ne povas resti malplena",
	"password_confirmation_match": "samu la pasvorton"
	}
	},
	"settings": {
	"app_name": "Nomo de aplikaĵo",
	"attachmentRadius": "Kunsendaĵoj",
	"attachments": "Kunsendaĵoj",
	"autoload": "Ŝalti memfaran enlegadon ĉe subo de paĝo",
	"avatar": "Profilbildo",
	"avatarAltRadius": "Profilbildoj (sciigoj)",
	"avatarRadius": "Profilbildoj",
	"background": "Fono",
	"bio": "Priskribo",
	"blocks_tab": "Baroj",
	"btnRadius": "Butonoj",
	"cBlue": "Blua (Respondo, abono)",
	"cGreen": "Verda (Kunhavigo)",
	"cOrange": "Oranĝa (Ŝato)",
	"cRed": "Ruĝa (Nuligo)",
	"change_password": "Ŝanĝi pasvorton",
	"change_password_error": "Okazis eraro dum ŝanĝo de via pasvorto.",
	"changed_password": "Pasvorto sukcese ŝanĝiĝis!",
	"collapse_subject": "Maletendi afiŝojn kun temoj",
	"composing": "Verkante",
	"confirm_new_password": "Konfirmu novan pasvorton",
	"current_avatar": "Via nuna profilbildo",
	"current_password": "Nuna pasvorto",
	"current_profile_banner": "Via nuna profila rubando",
	"data_import_export_tab": "Enporto / Elporto de datenoj",
	"default_vis": "Implicita videbleca amplekso",
	"delete_account": "Forigi konton",
	"delete_account_description": "Por ĉiam forigi vian konton kaj ĉiujn viajn mesaĝojn",
	"delete_account_error": "Okazis eraro dum forigo de via kanto. Se tio daŭre okazados, bonvolu kontakti la administranton de via nodo.",
	"delete_account_instructions": "Entajpu sube vian pasvorton por konfirmi forigon de konto.",
	"avatar_size_instruction": "La rekomendata malpleja grando de profilbildoj estas 150×150 bilderoj.",
	"export_theme": "Konservi antaŭagordon",
	"filtering": "Filtrado",
	"filtering_explanation": "Ĉiuj statoj kun tiuj ĉi vortoj silentiĝos, po unu linio",
	"follow_export": "Abona elporto",
	"follow_export_button": "Elporti viajn abonojn al CSV-dosiero",
	"follow_export_processing": "Traktante; baldaŭ vi ricevos peton elŝuti la dosieron",
	"follow_import": "Abona enporto",
	"follow_import_error": "Eraro enportante abonojn",
	"follows_imported": "Abonoj enportiĝis! Traktado daŭros iom.",
	"foreground": "Malfono",
	"general": "Ĝenerala",
	"hide_attachments_in_convo": "Kaŝi kunsendaĵojn en interparoloj",
	"hide_attachments_in_tl": "Kaŝi kunsendaĵojn en tempolinio",
	"max_thumbnails": "Plej multa nombro da bildetoj po afiŝo",
	"hide_isp": "Kaŝi nodo-propran breton",
	"preload_images": "Antaŭ-enlegi bildojn",
	"use_one_click_nsfw": "Malfermi konsternajn kunsendaĵojn per nur unu klako",
	"hide_post_stats": "Kaŝi statistikon de afiŝoj (ekz. nombron da ŝatoj)",
	"hide_user_stats": "Kaŝi statistikon de uzantoj (ekz. nombron da abonantoj)",
	"hide_filtered_statuses": "Kaŝi filtritajn statojn",
	"import_followers_from_a_csv_file": "Enporti abonojn el CSV-dosiero",
	"import_theme": "Enlegi antaŭagordojn",
	"inputRadius": "Enigaj kampoj",
	"checkboxRadius": "Markbutonoj",
	"instance_default": "(implicita: {value})",
	"instance_default_simple": "(implicita)",
	"interface": "Fasado",
	"interfaceLanguage": "Lingvo de fasado",
	"invalid_theme_imported": "La elektita dosiero ne estas subtenata haŭto de Pleromo. Neniuj ŝanĝoj al via haŭto okazis.",
	"limited_availability": "Nehavebla en via foliumilo",
	"links": "Ligiloj",
	"lock_account_description": "Limigi vian konton al nur abonantoj aprobitaj",
	"loop_video": "Ripetadi filmojn",
	"loop_video_silent_only": "Ripetadi nur filmojn sen sono (ekz. la \"GIF-ojn\" de Mastodon)",
	"mutes_tab": "Silentigoj",
	"play_videos_in_modal": "Ludi filmojn rekte en la aŭdvidaĵa spektilo",
	"use_contain_fit": "Ne tondi la kunsendaĵon en bildetoj",
	"name": "Nomo",
	"name_bio": "Nomo kaj priskribo",
	"new_password": "Nova pasvorto",
	"notification_visibility": "Montrotaj specoj de sciigoj",
	"notification_visibility_follows": "Abonoj",
	"notification_visibility_likes": "Ŝatoj",
	"notification_visibility_mentions": "Mencioj",
	"notification_visibility_repeats": "Ripetoj",
	"no_rich_text_description": "Forigi riĉtekstajn formojn de ĉiuj afiŝoj",
	"no_blocks": "Neniuj baroj",
	"no_mutes": "Neniuj silentigoj",
	"hide_follows_description": "Ne montri kiun mi sekvas",
	"hide_followers_description": "Ne montri kiu min sekvas",
	"show_admin_badge": "Montri la insignon de administranto en mia profilo",
	"show_moderator_badge": "Montri la insignon de kontrolanto en mia profilo",
	"nsfw_clickthrough": "Ŝalti traklakan kaŝon de konsternaj kunsendaĵoj",
	"oauth_tokens": "Ĵetonoj de OAuth",
	"token": "Ĵetono",
	"refresh_token": "Ĵetono de novigo",
	"valid_until": "Valida ĝis",
	"revoke_token": "Senvalidigi",
	"panelRadius": "Bretoj",
	"pause_on_unfocused": "Paŭzigi elsendfluon kiam langeto ne estas fokusata",
	"presets": "Antaŭagordoj",
	"profile_background": "Profila fono",
	"profile_banner": "Profila rubando",
	"profile_tab": "Profilo",
	"radii_help": "Agordi fasadan rondigon de randoj (bildere)",
	"replies_in_timeline": "Respondoj en tempolinio",
	"reply_link_preview": "Ŝalti respond-ligilan antaŭvidon dum musa ŝvebo",
	"reply_visibility_all": "Montri ĉiujn respondojn",
	"reply_visibility_following": "Montri nur respondojn por mi aŭ miaj abonatoj",
	"reply_visibility_self": "Montri nur respondojn por mi",
	"saving_err": "Eraro dum konservo de agordoj",
	"saving_ok": "Agordoj konserviĝis",
	"security_tab": "Sekureco",
	"scope_copy": "Kopii amplekson por respondo (rektaj mesaĝoj ĉiam kopiiĝas)",
	"set_new_avatar": "Agordi novan profilbildon",
	"set_new_profile_background": "Agordi novan profilan fonon",
	"set_new_profile_banner": "Agordi novan profilan rubandon",
	"settings": "Agordoj",
	"subject_input_always_show": "Ĉiam montri teman kampon",
	"subject_line_behavior": "Kopii temon por respondo",
	"subject_line_email": "Kiel retpoŝto: \"re: temo\"",
	"subject_line_mastodon": "Kiel Mastodon: kopii senŝanĝe",
	"subject_line_noop": "Ne kopii",
	"post_status_content_type": "Afiŝi specon de la enhavo de la stato",
	"stop_gifs": "Movi GIF-bildojn dum musa ŝvebo",
	"streaming": "Ŝalti memfaran fluigon de novaj afiŝoj ĉe la supro de la paĝo",
	"text": "Teksto",
	"theme": "Haŭto",
	"theme_help": "Uzu deksesumajn kolorkodojn (#rrvvbb) por adapti vian koloran haŭton.",
	"theme_help_v2_1": "Vi ankaŭ povas superagordi la kolorojn kaj travideblecon de kelkaj eroj per marko de la markbutono; uzu la butonon \"Vakigi ĉion\" por forigi ĉîujn superagordojn.",
	"theme_help_v2_2": "Bildsimboloj sub kelkaj eroj estas indikiloj de kontrasto inter fono kaj teksto; muse ŝvebu por detalaj informoj. Bonvolu memori, ke la indikilo montras la plej malbonan okazeblon dum sia uzo.",
	"tooltipRadius": "Ŝpruchelpiloj/avertoj",
	"upload_a_photo": "Alŝuti foton",
	"user_settings": "Agordoj de uzanto",
	"values": {
	"false": "ne",
	"true": "jes"
	},
	"notifications": "Sciigoj",
	"enable_web_push_notifications": "Ŝalti retajn puŝajn sciigojn",
	"style": {
	"switcher": {
	"keep_color": "Konservi kolorojn",
	"keep_shadows": "Konservi ombrojn",
	"keep_opacity": "Konservi maltravideblecon",
	"keep_roundness": "Konservi rondecon",
	"keep_fonts": "Konservi tiparojn",
	"save_load_hint": "Elektebloj de \"konservi\" konservas la nuntempajn agordojn dum elektado aŭ enlegado de haŭtoj. Ĝi ankaŭ konservas tiujn agordojn dum elportado de haŭto. Kun ĉiuj markbutonoj nemarkitaj, elporto de la haŭto ĉion konservos.",
	"reset": "Restarigi",
	"clear_all": "Vakigi ĉion",
	"clear_opacity": "Vakigi maltravideblecon"
	},
	"common": {
	"color": "Koloro",
	"opacity": "Maltravidebleco",
	"contrast": {
	"hint": "Proporcio de kontrasto estas {ratio}, ĝi {level} {context}",
	"level": {
	"aa": "plenumas la gvidilon je nivelo AA (malpleja)",
	"aaa": "plenumas la gvidilon je nivela AAA (rekomendita)",
	"bad": "plenumas neniujn faciluzajn gvidilojn"
	},
	"context": {
	"18pt": "por granda (18pt+) teksto",
	"text": "por teksto"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Komunaj",
	"main": "Komunaj koloroj",
	"foreground_hint": "Vidu langeton \"Specialaj\" por pli detalaj agordoj",
	"rgbo": "Bildsimboloj, emfazoj, insignoj"
	},
	"advanced_colors": {
	"_tab_label": "Specialaj",
	"alert": "Averta fono",
	"alert_error": "Eraro",
	"badge": "Insigna fono",
	"badge_notification": "Sciigo",
	"panel_header": "Kapo de breto",
	"top_bar": "Supra breto",
	"borders": "Limoj",
	"buttons": "Butonoj",
	"inputs": "Enigaj kampoj",
	"faint_text": "Malvigla teksto"
	},
	"radii": {
	"_tab_label": "Rondeco"
	},
	"shadows": {
	"_tab_label": "Ombro kaj lumo",
	"component": "Ero",
	"override": "Transpasi",
	"shadow_id": "Ombro #{value}",
	"blur": "Malklarigo",
	"spread": "Vastigo",
	"inset": "Internigo",
	"hint": "Por ombroj vi ankaŭ povas uzi --variable kiel koloran valoron, por uzi variantojn de CSS3. Bonvolu rimarki, ke tiuokaze agordoj de maltravidebleco ne funkcios.",
	"filter_hint": {
	"always_drop_shadow": "Averto: ĉi tiu ombro ĉiam uzas {0} kiam la foliumilo ĝin subtenas.",
	"drop_shadow_syntax": "{0} ne subtenas parametron {1} kaj ŝlosilvorton {2}.",
	"avatar_inset": "Bonvolu rimarki, ke agordi ambaŭ internajn kaj eksterajn ombrojn por profilbildoj povas redoni neatenditajn rezultojn ĉe profilbildoj travideblaj.",
	"spread_zero": "Ombroj kun vastigo > 0 aperos kvazaŭ ĝi estus fakte nulo",
	"inset_classic": "Internaj ombroj uzos {0}"
	},
	"components": {
	"panel": "Breto",
	"panelHeader": "Kapo de breto",
	"topBar": "Supra breto",
	"avatar": "Profilbildo de uzanto (en profila vido)",
	"avatarStatus": "Profilbildo de uzanto (en afiŝa vido)",
	"popup": "Ŝprucaĵoj",
	"button": "Butono",
	"buttonHover": "Butono (je ŝvebo)",
	"buttonPressed": "Butono (premita)",
	"buttonPressedHover": "Butono (premita je ŝvebo)",
	"input": "Eniga kampo"
	}
	},
	"fonts": {
	"_tab_label": "Tiparoj",
	"help": "Elektu tiparon uzotan por eroj de la fasado. Por \"propra\" vi devas enigi la precizan nomon de tiparo tiel, kiel ĝi aperas en la sistemo",
	"components": {
	"interface": "Fasado",
	"input": "Enigaj kampoj",
	"post": "Teksto de afiŝo",
	"postCode": "Egallarĝa teksto en afiŝo (riĉteksto)"
	},
	"family": "Nomo de tiparo",
	"size": "Grando (en bilderoj)",
	"weight": "Pezo (graseco)",
	"custom": "Propra"
	},
	"preview": {
	"header": "Antaŭrigardo",
	"content": "Enhavo",
	"error": "Ekzempla eraro",
	"button": "Butono",
	"text": "Kelko da pliaj {0} kaj {1}",
	"mono": "enhavo",
	"input": "Ĵus alvenis al la Universala Kongreso!",
	"faint_link": "helpan manlibron",
	"fine_print": "Legu nian {0} por nenion utilan ekscii!",
	"header_faint": "Tio estas en ordo",
	"checkbox": "Mi legetis la kondiĉojn de uzado",
	"link": "bela eta ligil’"
	}
	}
	},
	"timeline": {
	"collapse": "Maletendi",
	"conversation": "Interparolo",
	"error_fetching": "Eraro dum ĝisdatigo",
	"load_older": "Montri pli malnovajn statojn",
	"no_retweet_hint": "Afiŝo estas markita kiel rekta aŭ nur por abonantoj, kaj ne eblas ĝin ripeti",
	"repeated": "ripetita",
	"show_new": "Montri novajn",
	"up_to_date": "Ĝisdata",
	"no_more_statuses": "Neniuj pliaj statoj",
	"no_statuses": "Neniuj statoj"
	},
	"user_card": {
	"approve": "Aprobi",
	"block": "Bari",
	"blocked": "Barita!",
	"deny": "Rifuzi",
	"favorites": "Ŝatataj",
	"follow": "Aboni",
	"follow_sent": "Peto sendiĝis!",
	"follow_progress": "Petanta…",
	"follow_again": "Ĉu sendi peton denove?",
	"follow_unfollow": "Malaboni",
	"followees": "Abonatoj",
	"followers": "Abonantoj",
	"following": "Abonanta!",
	"follows_you": "Abonas vin!",
	"its_you": "Tio estas vi!",
	"media": "Aŭdvidaĵoj",
	"mute": "Silentigi",
	"muted": "Silentigitaj",
	"per_day": "tage",
	"remote_follow": "Fore aboni",
	"statuses": "Statoj",
	"unblock": "Malbari",
	"unblock_progress": "Malbaranta…",
	"block_progress": "Baranta…",
	"unmute": "Malsilentigi",
	"unmute_progress": "Malsilentiganta…",
	"mute_progress": "Silentiganta…"
	},
	"user_profile": {
	"timeline_title": "Uzanta tempolinio",
	"profile_does_not_exist": "Pardonu, ĉi tiu profilo ne ekzistas.",
	"profile_loading_error": "Pardonu, eraro okazis dum enlegado de ĉi tiu profilo."
	},
	"who_to_follow": {
	"more": "Pli",
	"who_to_follow": "Kiun aboni"
	},
	"tool_tip": {
	"media_upload": "Alŝuti aŭdvidaĵon",
	"repeat": "Ripeti",
	"reply": "Respondi",
	"favorite": "Ŝati",
	"user_settings": "Agordoj de uzanto"
	},
	"upload":{
	"error": {
	"base": "Alŝuto malsukcesis.",
	"file_too_big": "Dosiero estas tro granda [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Reprovu pli poste"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/es.json b/src/i18n/es.json
	index fe96dd083a..a692eef9cd 100644
	--- a/src/i18n/es.json
	+++ b/src/i18n/es.json
	@@ -1,392 +1,392 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media proxy",
	"scope_options": "Opciones del alcance de la visibilidad",
	"text_limit": "Límite de carácteres",
	"title": "Características",
	"who_to_follow": "A quién seguir"
	},
	"finder": {
	"error_fetching_user": "Error al buscar usuario",
	"find_user": "Encontrar usuario"
	},
	"general": {
	"apply": "Aplicar",
	"submit": "Enviar",
	"more": "Más",
	"generic_error": "Ha ocurrido un error"
	},
	"login": {
	"login": "Identificación",
	"description": "Identificación con OAuth",
	"logout": "Salir",
	"password": "Contraseña",
	"placeholder": "p.ej. lain",
	"register": "Registrar",
	"username": "Usuario",
	"hint": "Inicia sesión para unirte a la discusión"
	},
	"nav": {
	"about": "Sobre",
	"back": "Volver",
	"chat": "Chat Local",
	"friend_requests": "Solicitudes de amistad",
	"mentions": "Menciones",
	"dms": "Mensajes Directo",
	"public_tl": "Línea Temporal Pública",
	"timeline": "Línea Temporal",
	"twkn": "Toda La Red Conocida",
	"user_search": "Búsqueda de Usuarios",
	"who_to_follow": "A quién seguir",
	"preferences": "Preferencias"
	},
	"notifications": {
	"broken_favorite": "Estado desconocido, buscándolo...",
	"favorited_you": "le gusta tu estado",
	"followed_you": "empezó a seguirte",
	"load_older": "Cargar notificaciones antiguas",
	"notifications": "Notificaciones",
	"read": "¡Leído!",
	"repeated_you": "repite tu estado",
	"no_more_notifications": "No hay más notificaciones"
	},
	"post_status": {
	"new_status": "Publicar un nuevo estado",
	"account_not_locked_warning": "Tu cuenta no está {0}. Cualquiera puede seguirte y leer las entradas para Solo-Seguidores.",
	"account_not_locked_warning_link": "bloqueada",
	"attachments_sensitive": "Contenido sensible",
	"content_type": {
	- "plain_text": "Texto Plano"
	+ "text/plain": "Texto Plano"
	},
	"content_warning": "Tema (opcional)",
	"default": "Acabo de aterrizar en L.A.",
	"direct_warning": "Esta entrada solo será visible para los usuarios mencionados.",
	"posting": "Publicando",
	"scope": {
	"direct": "Directo - Solo para los usuarios mencionados.",
	"private": "Solo-Seguidores - Solo tus seguidores leeran la entrada",
	"public": "Público - Entradas visibles en las Líneas Temporales Públicas",
	"unlisted": "Sin Listar - Entradas no visibles en las Líneas Temporales Públicas"
	}
	},
	"registration": {
	"bio": "Biografía",
	"email": "Correo electrónico",
	"fullname": "Nombre a mostrar",
	"password_confirm": "Confirmación de contraseña",
	"registration": "Registro",
	"token": "Token de invitación",
	"captcha": "CAPTCHA",
	"new_captcha": "Click en la imagen para obtener un nuevo captca",
	"validations": {
	"username_required": "no puede estar vacío",
	"fullname_required": "no puede estar vacío",
	"email_required": "no puede estar vacío",
	"password_required": "no puede estar vacío",
	"password_confirmation_required": "no puede estar vacío",
	"password_confirmation_match": "la contraseña no coincide"
	}
	},
	"settings": {
	"attachmentRadius": "Adjuntos",
	"attachments": "Adjuntos",
	"autoload": "Activar carga automática al llegar al final de la página",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatares (Notificaciones)",
	"avatarRadius": "Avatares",
	"background": "Fondo",
	"bio": "Biografía",
	"btnRadius": "Botones",
	"cBlue": "Azul (Responder, seguir)",
	"cGreen": "Verde (Retweet)",
	"cOrange": "Naranja (Favorito)",
	"cRed": "Rojo (Cancelar)",
	"change_password": "Cambiar contraseña",
	"change_password_error": "Hubo un problema cambiando la contraseña.",
	"changed_password": "Contraseña cambiada correctamente!",
	"collapse_subject": "Colapsar entradas con tema",
	"composing": "Redactando",
	"confirm_new_password": "Confirmar la nueva contraseña",
	"current_avatar": "Tu avatar actual",
	"current_password": "Contraseña actual",
	"current_profile_banner": "Tu cabecera actual",
	"data_import_export_tab": "Importar / Exportar Datos",
	"default_vis": "Alcance de visibilidad por defecto",
	"delete_account": "Eliminar la cuenta",
	"delete_account_description": "Eliminar para siempre la cuenta y todos los mensajes.",
	"delete_account_error": "Hubo un error al eliminar tu cuenta. Si el fallo persiste, ponte en contacto con el administrador de tu instancia.",
	"delete_account_instructions": "Escribe tu contraseña para confirmar la eliminación de tu cuenta.",
	"avatar_size_instruction": "El tamaño mínimo recomendado para el avatar es de 150X150 píxeles.",
	"export_theme": "Exportar tema",
	"filtering": "Filtros",
	"filtering_explanation": "Todos los estados que contengan estas palabras serán silenciados, una por línea",
	"follow_export": "Exportar personas que tú sigues",
	"follow_export_button": "Exporta tus seguidores a un archivo csv",
	"follow_export_processing": "Procesando, en breve se te preguntará para guardar el archivo",
	"follow_import": "Importar personas que tú sigues",
	"follow_import_error": "Error al importal el archivo",
	"follows_imported": "¡Importado! Procesarlos llevará tiempo.",
	"foreground": "Primer plano",
	"general": "General",
	"hide_attachments_in_convo": "Ocultar adjuntos en las conversaciones",
	"hide_attachments_in_tl": "Ocultar adjuntos en la línea temporal",
	"hide_isp": "Ocultar el panel específico de la instancia",
	"preload_images": "Precargar las imágenes",
	"use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click.",
	"hide_post_stats": "Ocultar las estadísticas de las entradas (p.ej. el número de favoritos)",
	"hide_user_stats": "Ocultar las estadísticas del usuario (p.ej. el número de seguidores)",
	"hide_filtered_statuses": "Ocultar estados filtrados",
	"import_followers_from_a_csv_file": "Importar personas que tú sigues a partir de un archivo csv",
	"import_theme": "Importar tema",
	"inputRadius": "Campos de entrada",
	"checkboxRadius": "Casillas de verificación",
	"instance_default": "(por defecto: {value})",
	"instance_default_simple": "(por defecto)",
	"interface": "Interfaz",
	"interfaceLanguage": "Idioma",
	"invalid_theme_imported": "El archivo importado no es un tema válido de Pleroma. No se han realizado cambios.",
	"limited_availability": "No disponible en tu navegador",
	"links": "Enlaces",
	"lock_account_description": "Restringir el acceso a tu cuenta solo a seguidores admitidos",
	"loop_video": "Vídeos en bucle",
	"loop_video_silent_only": "Bucle solo en vídeos sin sonido (p.ej. \"gifs\" de Mastodon)",
	"play_videos_in_modal": "Reproducir los vídeos directamente en el visor de medios",
	"use_contain_fit": "No recortar los adjuntos en miniaturas",
	"name": "Nombre",
	"name_bio": "Nombre y Biografía",
	"new_password": "Nueva contraseña",
	"notification_visibility": "Tipos de notificaciones a mostrar",
	"notification_visibility_follows": "Nuevos seguidores",
	"notification_visibility_likes": "Me gustan (Likes)",
	"notification_visibility_mentions": "Menciones",
	"notification_visibility_repeats": "Repeticiones (Repeats)",
	"no_rich_text_description": "Eliminar el formato de texto enriquecido de todas las entradas",
	"hide_follows_description": "No mostrar a quién sigo",
	"hide_followers_description": "No mostrar quién me sigue",
	"show_admin_badge": "Mostrar la placa de administrador en mi perfil",
	"show_moderator_badge": "Mostrar la placa de moderador en mi perfil",
	"nsfw_clickthrough": "Activar el clic para ocultar los adjuntos NSFW",
	"oauth_tokens": "Tokens de OAuth",
	"token": "Token",
	"refresh_token": "Actualizar el token",
	"valid_until": "Válido hasta",
	"revoke_token": "Revocar",
	"panelRadius": "Paneles",
	"pause_on_unfocused": "Parar la transmisión cuando no estés en foco.",
	"presets": "Por defecto",
	"profile_background": "Fondo del Perfil",
	"profile_banner": "Cabecera del Perfil",
	"profile_tab": "Perfil",
	"radii_help": "Estable el redondeo de las esquinas del interfaz (en píxeles)",
	"replies_in_timeline": "Réplicas en la línea temporal",
	"reply_link_preview": "Activar la previsualización del enlace de responder al pasar el ratón por encim",
	"reply_visibility_all": "Mostrar todas las réplicas",
	"reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
	"reply_visibility_self": "Solo mostrar réplicas para mí",
	"saving_err": "Error al guardar los ajustes",
	"saving_ok": "Ajustes guardados",
	"security_tab": "Seguridad",
	"scope_copy": "Copiar la visibilidad cuando contestamos (En los mensajes directos (MDs) siempre se copia)",
	"set_new_avatar": "Cambiar avatar",
	"set_new_profile_background": "Cambiar fondo del perfil",
	"set_new_profile_banner": "Cambiar cabecera del perfil",
	"settings": "Ajustes",
	"subject_input_always_show": "Mostrar siempre el campo del tema",
	"subject_line_behavior": "Copiar el tema en las contestaciones",
	"subject_line_email": "Tipo email: \"re: tema\"",
	"subject_line_mastodon": "Tipo mastodon: copiar como es",
	"subject_line_noop": "No copiar",
	"post_status_content_type": "Formato de publicación",
	"stop_gifs": "Iniciar GIFs al pasar el ratón",
	"streaming": "Habilite la transmisión automática de nuevas publicaciones cuando se desplaza hacia la parte superior",
	"text": "Texto",
	"theme": "Tema",
	"theme_help": "Use códigos de color hexadecimales (#rrggbb) para personalizar su tema de colores.",
	"theme_help_v2_1": "También puede invalidar los colores y la opacidad de ciertos componentes si activa la casilla de verificación, use el botón \"Borrar todo\" para deshacer los cambios.",
	"theme_help_v2_2": "Los iconos debajo de algunas entradas son indicadores de contraste de fondo/texto, desplace el ratón para obtener información detallada. Tenga en cuenta que cuando se utilizan indicadores de contraste de transparencia se muestra el peor caso posible.",
	"tooltipRadius": "Información/alertas",
	"user_settings": "Ajustes de Usuario",
	"values": {
	"false": "no",
	"true": "sí"
	},
	"notifications": "Notificaciones",
	"enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
	"style": {
	"switcher": {
	"keep_color": "Mantener colores",
	"keep_shadows": "Mantener sombras",
	"keep_opacity": "Mantener opacidad",
	"keep_roundness": "Mantener redondeces",
	"keep_fonts": "Mantener fuentes",
	"save_load_hint": "Las opciones \"Mantener\" conservan las opciones configuradas actualmente al seleccionar o cargar temas, también almacena dichas opciones al exportar un tema. Cuando se desactiven todas las casillas de verificación, el tema de exportación lo guardará todo.",
	"reset": "Reiniciar",
	"clear_all": "Limpiar todo",
	"clear_opacity": "Limpiar opacidad"
	},
	"common": {
	"color": "Color",
	"opacity": "Opacidad",
	"contrast": {
	"hint": "El ratio de contraste es {ratio}. {level} {context}",
	"level": {
	"aa": "Cumple con la pauta de nivel AA (mínimo)",
	"aaa": "Cumple con la pauta de nivel AAA (recomendado)",
	"bad": "No cumple con las pautas de accesibilidad"
	},
	"context": {
	"18pt": "para textos grandes (+18pt)",
	"text": "para textos"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Común",
	"main": "Colores comunes",
	"foreground_hint": "Vea la pestaña \"Avanzado\" para un control más detallado",
	"rgbo": "Iconos, acentos, insignias"
	},
	"advanced_colors": {
	"_tab_label": "Avanzado",
	"alert": "Fondo de Alertas",
	"alert_error": "Error",
	"badge": "Fondo de Insignias",
	"badge_notification": "Notificaciones",
	"panel_header": "Cabecera del panel",
	"top_bar": "Barra superior",
	"borders": "Bordes",
	"buttons": "Botones",
	"inputs": "Campos de entrada",
	"faint_text": "Texto desvanecido"
	},
	"radii": {
	"_tab_label": "Redondez"
	},
	"shadows": {
	"_tab_label": "Sombra e iluminación",
	"component": "Componente",
	"override": "Sobreescribir",
	"shadow_id": "Sombra #{value}",
	"blur": "Difuminar",
	"spread": "Cantidad",
	"inset": "Insertada",
	"hint": "Para las sombras, también puede usar --variable como un valor de color para usar las variables CSS3. Tenga en cuenta que establecer la opacidad no funcionará en este caso.",
	"filter_hint": {
	"always_drop_shadow": "Advertencia, esta sombra siempre usa {0} cuando el navegador lo soporta.",
	"drop_shadow_syntax": "{0} no soporta el parámetro {1} y la palabra clave {2}.",
	"avatar_inset": "Tenga en cuenta que la combinación de sombras insertadas como no-insertadas en los avatares, puede dar resultados inesperados con los avatares transparentes.",
	"spread_zero": "Sombras con una cantidad > 0 aparecerá como si estuviera puesto a cero",
	"inset_classic": "Las sombras insertadas estarán usando {0}"
	},
	"components": {
	"panel": "Panel",
	"panelHeader": "Cabecera del panel",
	"topBar": "Barra superior",
	"avatar": "Avatar del usuario (en la vista del perfil)",
	"avatarStatus": "Avatar del usuario (en la vista de la entrada)",
	"popup": "Ventanas y textos emergentes (popups & tooltips)",
	"button": "Botones",
	"buttonHover": "Botón (encima)",
	"buttonPressed": "Botón (presionado)",
	"buttonPressedHover": "Botón (presionado+encima)",
	"input": "Campo de entrada"
	}
	},
	"fonts": {
	"_tab_label": "Fuentes",
	"help": "Seleccione la fuente para utilizar para los elementos de la interfaz de usuario. Para \"personalizado\", debe ingresar el nombre exacto de la fuente tal como aparece en el sistema.",
	"components": {
	"interface": "Interfaz",
	"input": "Campos de entrada",
	"post": "Texto de publicaciones",
	"postCode": "Texto monoespaciado en publicación (texto enriquecido)"
	},
	"family": "Nombre de la fuente",
	"size": "Tamaño (en px)",
	"weight": "Peso (negrita)",
	"custom": "Personalizado"
	},
	"preview": {
	"header": "Vista previa",
	"content": "Contenido",
	"error": "Ejemplo de error",
	"button": "Botón",
	"text": "Un montón de {0} y {1}",
	"mono": "contenido",
	"input": "Acaba de aterrizar en L.A.",
	"faint_link": "manual útil",
	"fine_print": "¡Lea nuestro {0} para aprender nada útil!",
	"header_faint": "Esto está bien",
	"checkbox": "He revisado los términos y condiciones",
	"link": "un bonito enlace"
	}
	}
	},
	"timeline": {
	"collapse": "Colapsar",
	"conversation": "Conversación",
	"error_fetching": "Error al cargar las actualizaciones",
	"load_older": "Cargar actualizaciones anteriores",
	"no_retweet_hint": "La publicación está marcada como solo para seguidores o directa y no se puede repetir",
	"repeated": "repetida",
	"show_new": "Mostrar lo nuevo",
	"up_to_date": "Actualizado",
	"no_more_statuses": "No hay más estados"
	},
	"user_card": {
	"approve": "Aprovar",
	"block": "Bloquear",
	"blocked": "¡Bloqueado!",
	"deny": "Denegar",
	"favorites": "Favoritos",
	"follow": "Seguir",
	"follow_sent": "¡Solicitud enviada!",
	"follow_progress": "Solicitando…",
	"follow_again": "¿Enviar solicitud de nuevo?",
	"follow_unfollow": "Dejar de seguir",
	"followees": "Siguiendo",
	"followers": "Seguidores",
	"following": "¡Siguiendo!",
	"follows_you": "¡Te sigue!",
	"its_you": "¡Eres tú!",
	"media": "Media",
	"mute": "Silenciar",
	"muted": "Silenciado",
	"per_day": "por día",
	"remote_follow": "Seguir",
	"statuses": "Estados"
	},
	"user_profile": {
	"timeline_title": "Linea temporal del usuario"
	},
	"who_to_follow": {
	"more": "Más",
	"who_to_follow": "A quién seguir"
	},
	"tool_tip": {
	"media_upload": "Subir Medios",
	"repeat": "Repetir",
	"reply": "Contestar",
	"favorite": "Favorito",
	"user_settings": "Ajustes de usuario"
	},
	"upload":{
	"error": {
	"base": "Subida fallida.",
	"file_too_big": "Archivo demasiado grande [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Inténtalo más tarde"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/fi.json b/src/i18n/fi.json
	index 4f0ffb4b4d..fbe676cf6a 100644
	--- a/src/i18n/fi.json
	+++ b/src/i18n/fi.json
	@@ -1,277 +1,277 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media-välityspalvelin",
	"scope_options": "Näkyvyyden rajaus",
	"text_limit": "Tekstin pituusraja",
	"title": "Ominaisuudet",
	"who_to_follow": "Seurausehdotukset"
	},
	"finder": {
	"error_fetching_user": "Virhe hakiessa käyttäjää",
	"find_user": "Hae käyttäjä"
	},
	"general": {
	"apply": "Aseta",
	"submit": "Lähetä",
	"more": "Lisää",
	"generic_error": "Virhe tapahtui"
	},
	"login": {
	"login": "Kirjaudu sisään",
	"description": "Kirjaudu sisään OAuthilla",
	"logout": "Kirjaudu ulos",
	"password": "Salasana",
	"placeholder": "esim. Seppo",
	"register": "Rekisteröidy",
	"username": "Käyttäjänimi"
	},
	"nav": {
	"about": "Tietoja",
	"back": "Takaisin",
	"chat": "Paikallinen Chat",
	"friend_requests": "Seurauspyynnöt",
	"mentions": "Maininnat",
	"dms": "Yksityisviestit",
	"public_tl": "Julkinen Aikajana",
	"timeline": "Aikajana",
	"twkn": "Koko Tunnettu Verkosto",
	"user_search": "Käyttäjähaku",
	"who_to_follow": "Seurausehdotukset",
	"preferences": "Asetukset"
	},
	"notifications": {
	"broken_favorite": "Viestiä ei löydetty...",
	"favorited_you": "tykkäsi viestistäsi",
	"followed_you": "seuraa sinua",
	"load_older": "Lataa vanhempia ilmoituksia",
	"notifications": "Ilmoitukset",
	"read": "Lue!",
	"repeated_you": "toisti viestisi",
	"no_more_notifications": "Ei enempää ilmoituksia"
	},
	"post_status": {
	"new_status": "Uusi viesti",
	"account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi",
	"account_not_locked_warning_link": "lukittu",
	"attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
	"content_type": {
	- "plain_text": "Tavallinen teksti"
	+ "text/plain": "Tavallinen teksti"
	},
	"content_warning": "Aihe (valinnainen)",
	"default": "Tulin juuri saunasta.",
	"direct_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
	"posting": "Lähetetään",
	"scope": {
	"direct": "Yksityisviesti - Näkyy vain mainituille käyttäjille",
	"private": "Vain-seuraajille - Näkyy vain seuraajillesi",
	"public": "Julkinen - Näkyy julkisilla aikajanoilla",
	"unlisted": "Listaamaton - Ei näy julkisilla aikajanoilla"
	}
	},
	"registration": {
	"bio": "Kuvaus",
	"email": "Sähköposti",
	"fullname": "Koko nimi",
	"password_confirm": "Salasanan vahvistaminen",
	"registration": "Rekisteröityminen",
	"token": "Kutsuvaltuus",
	"captcha": "Varmenne",
	"new_captcha": "Paina kuvaa saadaksesi uuden varmenteen",
	"validations": {
	"username_required": "ei voi olla tyhjä",
	"fullname_required": "ei voi olla tyhjä",
	"email_required": "ei voi olla tyhjä",
	"password_required": "ei voi olla tyhjä",
	"password_confirmation_required": "ei voi olla tyhjä",
	"password_confirmation_match": "pitää vastata salasanaa"
	}
	},
	"settings": {
	"attachmentRadius": "Liitteet",
	"attachments": "Liitteet",
	"autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla",
	"avatar": "Profiilikuva",
	"avatarAltRadius": "Profiilikuvat (ilmoitukset)",
	"avatarRadius": "Profiilikuvat",
	"background": "Tausta",
	"bio": "Kuvaus",
	"btnRadius": "Napit",
	"cBlue": "Sininen (Vastaukset, seuraukset)",
	"cGreen": "Vihreä (Toistot)",
	"cOrange": "Oranssi (Tykkäykset)",
	"cRed": "Punainen (Peruminen)",
	"change_password": "Vaihda salasana",
	"change_password_error": "Virhe vaihtaessa salasanaa.",
	"changed_password": "Salasana vaihdettu!",
	"collapse_subject": "Minimoi viestit, joille on asetettu aihe",
	"composing": "Viestien laatiminen",
	"confirm_new_password": "Vahvista uusi salasana",
	"current_avatar": "Nykyinen profiilikuvasi",
	"current_password": "Nykyinen salasana",
	"current_profile_banner": "Nykyinen julisteesi",
	"data_import_export_tab": "Tietojen tuonti / vienti",
	"default_vis": "Oletusnäkyvyysrajaus",
	"delete_account": "Poista tili",
	"delete_account_description": "Poista tilisi ja viestisi pysyvästi.",
	"delete_account_error": "Virhe poistaessa tiliäsi. Jos virhe jatkuu, ota yhteyttä palvelimesi ylläpitoon.",
	"delete_account_instructions": "Syötä salasanasi vahvistaaksesi tilin poiston.",
	"export_theme": "Tallenna teema",
	"filtering": "Suodatus",
	"filtering_explanation": "Kaikki viestit, jotka sisältävät näitä sanoja, suodatetaan. Yksi sana per rivi.",
	"follow_export": "Seurausten vienti",
	"follow_export_button": "Vie seurauksesi CSV-tiedostoon",
	"follow_export_processing": "Käsitellään, sinua pyydetään lataamaan tiedosto hetken päästä",
	"follow_import": "Seurausten tuonti",
	"follow_import_error": "Virhe tuodessa seuraksia",
	"follows_imported": "Seuraukset tuotu! Niiden käsittely vie hetken.",
	"foreground": "Korostus",
	"general": "Yleinen",
	"hide_attachments_in_convo": "Piilota liitteet keskusteluissa",
	"hide_attachments_in_tl": "Piilota liitteet aikajanalla",
	"max_thumbnails": "Suurin sallittu määrä liitteitä esikatselussa",
	"hide_isp": "Piilota palvelimenkohtainen ruutu",
	"preload_images": "Esilataa kuvat",
	"use_one_click_nsfw": "Avaa NSFW-liitteet yhdellä painalluksella",
	"hide_post_stats": "Piilota viestien statistiikka (esim. tykkäysten määrä)",
	"hide_user_stats": "Piilota käyttäjien statistiikka (esim. seuraajien määrä)",
	"import_followers_from_a_csv_file": "Tuo seuraukset CSV-tiedostosta",
	"import_theme": "Tuo tallennettu teema",
	"inputRadius": "Syöttökentät",
	"checkboxRadius": "Valintalaatikot",
	"instance_default": "(oletus: {value})",
	"instance_default_simple": "(oletus)",
	"interface": "Käyttöliittymä",
	"interfaceLanguage": "Käyttöliittymän kieli",
	"invalid_theme_imported": "Tuotu tallennettu teema on epäkelpo, muutoksia ei tehty nykyiseen teemaasi.",
	"limited_availability": "Ei saatavilla selaimessasi",
	"links": "Linkit",
	"lock_account_description": "Vain erikseen hyväksytyt käyttäjät voivat seurata tiliäsi",
	"loop_video": "Uudelleentoista videot",
	"loop_video_silent_only": "Uudelleentoista ainoastaan äänettömät videot (Video-\"giffit\")",
	"play_videos_in_modal": "Toista videot modaalissa",
	"use_contain_fit": "Älä rajaa liitteitä esikatselussa",
	"name": "Nimi",
	"name_bio": "Nimi ja kuvaus",
	"new_password": "Uusi salasana",
	"notification_visibility": "Ilmoitusten näkyvyys",
	"notification_visibility_follows": "Seuraukset",
	"notification_visibility_likes": "Tykkäykset",
	"notification_visibility_mentions": "Maininnat",
	"notification_visibility_repeats": "Toistot",
	"no_rich_text_description": "Älä näytä tekstin muotoilua.",
	"hide_network_description": "Älä näytä seurauksiani tai seuraajiani",
	"nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse",
	"oauth_tokens": "OAuth-merkit",
	"token": "Token",
	"refresh_token": "Päivitä token",
	"valid_until": "Voimassa asti",
	"revoke_token": "Peruuttaa",
	"panelRadius": "Ruudut",
	"pause_on_unfocused": "Pysäytä automaattinen viestien näyttö välilehden ollessa pois fokuksesta",
	"presets": "Valmiit teemat",
	"profile_background": "Taustakuva",
	"profile_banner": "Juliste",
	"profile_tab": "Profiili",
	"radii_help": "Aseta reunojen pyöristys (pikseleinä)",
	"replies_in_timeline": "Keskustelut aikajanalla",
	"reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
	"reply_visibility_all": "Näytä kaikki vastaukset",
	"reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
	"reply_visibility_self": "Näytä vain vastaukset minulle",
	"saving_err": "Virhe tallentaessa asetuksia",
	"saving_ok": "Asetukset tallennettu",
	"security_tab": "Tietoturva",
	"scope_copy": "Kopioi näkyvyysrajaus vastatessa (Yksityisviestit aina kopioivat)",
	"set_new_avatar": "Aseta uusi profiilikuva",
	"set_new_profile_background": "Aseta uusi taustakuva",
	"set_new_profile_banner": "Aseta uusi juliste",
	"settings": "Asetukset",
	"subject_input_always_show": "Näytä aihe-kenttä",
	"subject_line_behavior": "Aihe-kentän kopiointi",
	"subject_line_email": "Kuten sähköposti: \"re: aihe\"",
	"subject_line_mastodon": "Kopioi sellaisenaan",
	"subject_line_noop": "Älä kopioi",
	"stop_gifs": "Toista giffit vain kohdistaessa",
	"streaming": "Näytä uudet viestit automaattisesti ollessasi ruudun huipulla",
	"text": "Teksti",
	"theme": "Teema",
	"theme_help": "Käytä heksadesimaalivärejä muokataksesi väriteemaasi.",
	"theme_help_v2_1": "Voit asettaa tiettyjen osien värin tai läpinäkyvyyden täyttämällä valintalaatikon, käytä \"Tyhjennä kaikki\"-nappia tyhjentääksesi kaiken.",
	"theme_help_v2_2": "Ikonit kenttien alla ovat kontrasti-indikaattoreita, lisätietoa kohdistamalla. Käyttäessä läpinäkyvyyttä ne näyttävät pahimman skenaarion.",
	"tooltipRadius": "Ohje- tai huomioviestit",
	"user_settings": "Käyttäjän asetukset",
	"values": {
	"false": "pois päältä",
	"true": "päällä"
	}
	},
	"timeline": {
	"collapse": "Sulje",
	"conversation": "Keskustelu",
	"error_fetching": "Virhe ladatessa viestejä",
	"load_older": "Lataa vanhempia viestejä",
	"no_retweet_hint": "Viesti ei ole julkinen, eikä sitä voi toistaa",
	"repeated": "toisti",
	"show_new": "Näytä uudet",
	"up_to_date": "Ajantasalla",
	"no_more_statuses": "Ei enempää viestejä"
	},
	"status": {
	"reply_to": "Vastaus",
	"replies_list": "Vastaukset:"
	},
	"user_card": {
	"approve": "Hyväksy",
	"block": "Estä",
	"blocked": "Estetty!",
	"deny": "Älä hyväksy",
	"follow": "Seuraa",
	"follow_sent": "Pyyntö lähetetty!",
	"follow_progress": "Pyydetään...",
	"follow_again": "Lähetä pyyntö uudestaan",
	"follow_unfollow": "Älä seuraa",
	"followees": "Seuraa",
	"followers": "Seuraajat",
	"following": "Seuraat!",
	"follows_you": "Seuraa sinua!",
	"its_you": "Sinun tili!",
	"mute": "Hiljennä",
	"muted": "Hiljennetty",
	"per_day": "päivässä",
	"remote_follow": "Seuraa muualta",
	"statuses": "Viestit"
	},
	"user_profile": {
	"timeline_title": "Käyttäjän aikajana"
	},
	"who_to_follow": {
	"more": "Lisää",
	"who_to_follow": "Seurausehdotukset"
	},
	"tool_tip": {
	"media_upload": "Lataa tiedosto",
	"repeat": "Toista",
	"reply": "Vastaa",
	"favorite": "Tykkää",
	"user_settings": "Käyttäjäasetukset"
	},
	"upload":{
	"error": {
	"base": "Lataus epäonnistui.",
	"file_too_big": "Tiedosto liian suuri [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Yritä uudestaan myöhemmin"
	},
	"file_size_units": {
	"B": "tavua",
	"KiB": "kt",
	"MiB": "Mt",
	"GiB": "Gt",
	"TiB": "Tt"
	}
	}
	}
	diff --git a/src/i18n/fr.json b/src/i18n/fr.json
	index 1209556a17..8f9f243efc 100644
	--- a/src/i18n/fr.json
	+++ b/src/i18n/fr.json
	@@ -1,209 +1,209 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Proxy média",
	"scope_options": "Options de visibilité",
	"text_limit": "Limite du texte",
	"title": "Caractéristiques",
	"who_to_follow": "Qui s'abonner"
	},
	"finder": {
	"error_fetching_user": "Erreur lors de la recherche de l'utilisateur",
	"find_user": "Chercher un utilisateur"
	},
	"general": {
	"apply": "Appliquer",
	"submit": "Envoyer"
	},
	"login": {
	"login": "Connexion",
	"description": "Connexion avec OAuth",
	"logout": "Déconnexion",
	"password": "Mot de passe",
	"placeholder": "p.e. lain",
	"register": "S'inscrire",
	"username": "Identifiant"
	},
	"nav": {
	"chat": "Chat local",
	"friend_requests": "Demandes d'ami",
	"dms": "Messages adressés",
	"mentions": "Notifications",
	"public_tl": "Statuts locaux",
	"timeline": "Journal",
	"twkn": "Le réseau connu"
	},
	"notifications": {
	"broken_favorite": "Chargement d'un message inconnu ...",
	"favorited_you": "a aimé votre statut",
	"followed_you": "a commencé à vous suivre",
	"load_older": "Charger les notifications précédentes",
	"notifications": "Notifications",
	"read": "Lu !",
	"repeated_you": "a partagé votre statut"
	},
	"post_status": {
	"account_not_locked_warning": "Votre compte n'est pas {0}. N'importe qui peut vous suivre pour voir vos billets en Abonné·e·s uniquement.",
	"account_not_locked_warning_link": "verrouillé",
	"attachments_sensitive": "Marquer le média comme sensible",
	"content_type": {
	- "plain_text": "Texte brut"
	+ "text/plain": "Texte brut"
	},
	"content_warning": "Sujet (optionnel)",
	"default": "Écrivez ici votre prochain statut.",
	"direct_warning": "Ce message sera visible à toutes les personnes mentionnées.",
	"posting": "Envoi en cours",
	"scope": {
	"direct": "Direct - N'envoyer qu'aux personnes mentionnées",
	"private": "Abonné·e·s uniquement - Seul·e·s vos abonné·e·s verront vos billets",
	"public": "Publique - Afficher dans les fils publics",
	"unlisted": "Non-Listé - Ne pas afficher dans les fils publics"
	}
	},
	"registration": {
	"bio": "Biographie",
	"email": "Adresse email",
	"fullname": "Pseudonyme",
	"password_confirm": "Confirmation du mot de passe",
	"registration": "Inscription",
	"token": "Jeton d'invitation"
	},
	"settings": {
	"attachmentRadius": "Pièces jointes",
	"attachments": "Pièces jointes",
	"autoload": "Charger la suite automatiquement une fois le bas de la page atteint",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars (Notifications)",
	"avatarRadius": "Avatars",
	"background": "Arrière-plan",
	"bio": "Biographie",
	"btnRadius": "Boutons",
	"cBlue": "Bleu (Répondre, suivre)",
	"cGreen": "Vert (Partager)",
	"cOrange": "Orange (Aimer)",
	"cRed": "Rouge (Annuler)",
	"change_password": "Changez votre mot de passe",
	"change_password_error": "Il y a eu un problème pour changer votre mot de passe.",
	"changed_password": "Mot de passe modifié avec succès !",
	"collapse_subject": "Réduire les messages avec des sujets",
	"confirm_new_password": "Confirmation du nouveau mot de passe",
	"current_avatar": "Avatar actuel",
	"current_password": "Mot de passe actuel",
	"current_profile_banner": "Bannière de profil actuelle",
	"data_import_export_tab": "Import / Export des Données",
	"default_vis": "Portée de visibilité par défaut",
	"delete_account": "Supprimer le compte",
	"delete_account_description": "Supprimer définitivement votre compte et tous vos statuts.",
	"delete_account_error": "Il y a eu un problème lors de la tentative de suppression de votre compte. Si le problème persiste, contactez l'administrateur de cette instance.",
	"delete_account_instructions": "Indiquez votre mot de passe ci-dessous pour confirmer la suppression de votre compte.",
	"export_theme": "Enregistrer le thème",
	"filtering": "Filtre",
	"filtering_explanation": "Tous les statuts contenant ces mots seront masqués. Un mot par ligne",
	"follow_export": "Exporter les abonnements",
	"follow_export_button": "Exporter les abonnements en csv",
	"follow_export_processing": "Exportation en cours…",
	"follow_import": "Importer des abonnements",
	"follow_import_error": "Erreur lors de l'importation des abonnements",
	"follows_imported": "Abonnements importés ! Le traitement peut prendre un moment.",
	"foreground": "Premier plan",
	"general": "Général",
	"hide_attachments_in_convo": "Masquer les pièces jointes dans les conversations",
	"hide_attachments_in_tl": "Masquer les pièces jointes dans le journal",
	"hide_post_stats": "Masquer les statistiques de publication (le nombre de favoris)",
	"hide_user_stats": "Masquer les statistiques de profil (le nombre d'amis)",
	"import_followers_from_a_csv_file": "Importer des abonnements depuis un fichier csv",
	"import_theme": "Charger le thème",
	"inputRadius": "Champs de texte",
	"instance_default": "(default: {value})",
	"instance_default_simple" : "(default)",
	"interfaceLanguage": "Langue de l'interface",
	"invalid_theme_imported": "Le fichier sélectionné n'est pas un thème Pleroma pris en charge. Aucun changement n'a été apporté à votre thème.",
	"limited_availability": "Non disponible dans votre navigateur",
	"links": "Liens",
	"lock_account_description": "Limitez votre compte aux abonnés acceptés uniquement",
	"loop_video": "Vidéos en boucle",
	"loop_video_silent_only": "Boucle uniquement les vidéos sans le son (les «gifs» de Mastodon)",
	"name": "Nom",
	"name_bio": "Nom & Bio",
	"new_password": "Nouveau mot de passe",
	"no_rich_text_description": "Ne formatez pas le texte",
	"notification_visibility": "Types de notifications à afficher",
	"notification_visibility_follows": "Abonnements",
	"notification_visibility_likes": "J’aime",
	"notification_visibility_mentions": "Mentionnés",
	"notification_visibility_repeats": "Partages",
	"nsfw_clickthrough": "Masquer les images marquées comme contenu adulte ou sensible",
	"oauth_tokens": "Jetons OAuth",
	"token": "Jeton",
	"refresh_token": "Refresh Token",
	"valid_until": "Valable jusque",
	"revoke_token": "Révoquer",
	"panelRadius": "Fenêtres",
	"pause_on_unfocused": "Suspendre le streaming lorsque l'onglet n'est pas centré",
	"presets": "Thèmes prédéfinis",
	"profile_background": "Image de fond",
	"profile_banner": "Bannière de profil",
	"profile_tab": "Profil",
	"radii_help": "Vous pouvez ici choisir le niveau d'arrondi des angles de l'interface (en pixels)",
	"replies_in_timeline": "Réponses au journal",
	"reply_link_preview": "Afficher un aperçu lors du survol de liens vers une réponse",
	"reply_visibility_all": "Montrer toutes les réponses",
	"reply_visibility_following": "Afficher uniquement les réponses adressées à moi ou aux utilisateurs que je suis",
	"reply_visibility_self": "Afficher uniquement les réponses adressées à moi",
	"saving_err": "Erreur lors de l'enregistrement des paramètres",
	"saving_ok": "Paramètres enregistrés",
	"security_tab": "Sécurité",
	"set_new_avatar": "Changer d'avatar",
	"set_new_profile_background": "Changer d'image de fond",
	"set_new_profile_banner": "Changer de bannière",
	"settings": "Paramètres",
	"stop_gifs": "N'animer les GIFS que lors du survol du curseur de la souris",
	"streaming": "Charger automatiquement les nouveaux statuts lorsque vous êtes au haut de la page",
	"text": "Texte",
	"theme": "Thème",
	"theme_help": "Spécifiez des codes couleur hexadécimaux (#rrvvbb) pour personnaliser les couleurs du thème.",
	"tooltipRadius": "Info-bulles/alertes",
	"user_settings": "Paramètres utilisateur",
	"values": {
	"false": "non",
	"true": "oui"
	}
	},
	"timeline": {
	"collapse": "Fermer",
	"conversation": "Conversation",
	"error_fetching": "Erreur en cherchant les mises à jour",
	"load_older": "Afficher plus",
	"no_retweet_hint": "Le message est marqué en abonnés-seulement ou direct et ne peut pas être répété",
	"repeated": "a partagé",
	"show_new": "Afficher plus",
	"up_to_date": "À jour"
	},
	"user_card": {
	"approve": "Accepter",
	"block": "Bloquer",
	"blocked": "Bloqué !",
	"deny": "Rejeter",
	"follow": "Suivre",
	"followees": "Suivis",
	"followers": "Vous suivent",
	"following": "Suivi !",
	"follows_you": "Vous suit !",
	"mute": "Masquer",
	"muted": "Masqué",
	"per_day": "par jour",
	"remote_follow": "Suivre d'une autre instance",
	"statuses": "Statuts"
	},
	"user_profile": {
	"timeline_title": "Journal de l'utilisateur"
	},
	"who_to_follow": {
	"more": "Plus",
	"who_to_follow": "Qui s'abonner"
	}
	}
	diff --git a/src/i18n/ga.json b/src/i18n/ga.json
	index 5be9297a4c..31250876b1 100644
	--- a/src/i18n/ga.json
	+++ b/src/i18n/ga.json
	@@ -1,206 +1,206 @@
	{
	"chat": {
	"title": "Comhrá"
	},
	"features_panel": {
	"chat": "Comhrá",
	"gopher": "Gófar",
	"media_proxy": "Seachfhreastalaí meáin",
	"scope_options": "Rogha scóip",
	"text_limit": "Teorainn Téacs",
	"title": "Gnéithe",
	"who_to_follow": "Daoine le leanúint"
	},
	"finder": {
	"error_fetching_user": "Earráid a aimsiú d'úsáideoir",
	"find_user": "Aimsigh úsáideoir"
	},
	"general": {
	"apply": "Feidhmigh",
	"submit": "Deimhnigh"
	},
	"login": {
	"login": "Logáil isteach",
	"logout": "Logáil amach",
	"password": "Pasfhocal",
	"placeholder": "m.sh. Daire",
	"register": "Clárú",
	"username": "Ainm Úsáideora"
	},
	"nav": {
	"chat": "Comhrá Áitiúil",
	"friend_requests": "Iarratas ar Cairdeas",
	"mentions": "Tagairt",
	"public_tl": "Amlíne Poiblí",
	"timeline": "Amlíne",
	"twkn": "An Líonra Iomlán"
	},
	"notifications": {
	"broken_favorite": "Post anaithnid. Cuardach dó...",
	"favorited_you": "toghadh le do phost",
	"followed_you": "lean tú",
	"load_older": "Luchtaigh fógraí aosta",
	"notifications": "Fógraí",
	"read": "Léigh!",
	"repeated_you": "athphostáil tú"
	},
	"post_status": {
	"account_not_locked_warning": "Níl do chuntas {0}. Is féidir le duine ar bith a leanúint leat chun do phoist leantacha amháin a fheiceáil.",
	"account_not_locked_warning_link": "faoi glas",
	"attachments_sensitive": "Marcáil ceangaltán mar íogair",
	"content_type": {
	- "plain_text": "Gnáth-théacs"
	+ "text/plain": "Gnáth-théacs"
	},
	"content_warning": "Teideal (roghnach)",
	"default": "Lá iontach anseo i nGaillimh",
	"direct_warning": "Ní bheidh an post seo le feiceáil ach amháin do na húsáideoirí atá luaite.",
	"posting": "Post nua",
	"scope": {
	"direct": "Díreach - Post chuig úsáideoirí luaite amháin",
	"private": "Leanúna amháin - Post chuig lucht leanúna amháin",
	"public": "Poiblí - Post chuig amlínte poiblí",
	"unlisted": "Neamhliostaithe - Ná cuir post chuig amlínte poiblí"
	}
	},
	"registration": {
	"bio": "Scéal saoil",
	"email": "Ríomhphost",
	"fullname": "Ainm taispeána'",
	"password_confirm": "Deimhnigh do pasfhocal",
	"registration": "Clárú",
	"token": "Cód cuireadh"
	},
	"settings": {
	"attachmentRadius": "Ceangaltáin",
	"attachments": "Ceangaltáin",
	"autoload": "Cumasaigh luchtú uathoibríoch nuair a scrollaítear go bun",
	"avatar": "Phictúir phrófíle",
	"avatarAltRadius": "Phictúirí phrófíle (Fograí)",
	"avatarRadius": "Phictúirí phrófíle",
	"background": "Cúlra",
	"bio": "Scéal saoil",
	"btnRadius": "Cnaipí",
	"cBlue": "Gorm (Freagra, lean)",
	"cGreen": "Glas (Athphóstail)",
	"cOrange": "Oráiste (Cosúil)",
	"cRed": "Dearg (Cealaigh)",
	"change_password": "Athraigh do pasfhocal",
	"change_password_error": "Bhí fadhb ann ag athrú do pasfhocail",
	"changed_password": "Athraigh an pasfhocal go rathúil!",
	"collapse_subject": "Poist a chosc le teidil",
	"confirm_new_password": "Deimhnigh do pasfhocal nua",
	"current_avatar": "Phictúir phrófíle",
	"current_password": "Pasfhocal reatha",
	"current_profile_banner": "Phictúir ceanntáisc",
	"data_import_export_tab": "Iompórtáil / Easpórtáil Sonraí",
	"default_vis": "Scóip infheicthe réamhshocraithe",
	"delete_account": "Scrios cuntas",
	"delete_account_description": "Do chuntas agus do chuid teachtaireachtaí go léir a scriosadh go buan.",
	"delete_account_error": "Bhí fadhb ann a scriosadh do chuntas. Má leanann sé seo, téigh i dteagmháil le do riarthóir.",
	"delete_account_instructions": "Scríobh do phasfhocal san ionchur thíos chun deimhniú a scriosadh.",
	"export_theme": "Sábháil Téama",
	"filtering": "Scagadh",
	"filtering_explanation": "Beidh gach post ina bhfuil na focail seo i bhfolach, ceann in aghaidh an líne",
	"follow_export": "Easpórtáil do leanann",
	"follow_export_button": "Easpórtáil do leanann chuig comhad csv",
	"follow_export_processing": "Próiseáil. Iarrtar ort go luath an comhad a íoslódáil.",
	"follow_import": "Iompórtáil do leanann",
	"follow_import_error": "Earráid agus do leanann a iompórtáil",
	"follows_imported": "Do leanann iompórtáil! Tógfaidh an próiseas iad le tamall.",
	"foreground": "Tulra",
	"general": "Ginearálta",
	"hide_attachments_in_convo": "Folaigh ceangaltáin i comhráite",
	"hide_attachments_in_tl": "Folaigh ceangaltáin sa amlíne",
	"hide_post_stats": "Folaigh staitisticí na bpost (m.sh. líon na n-athrá)",
	"hide_user_stats": "Folaigh na staitisticí úsáideora (m.sh. líon na leantóiri)",
	"import_followers_from_a_csv_file": "Iompórtáil leanann ó chomhad csv",
	"import_theme": "Luchtaigh Téama",
	"inputRadius": "Limistéar iontrála",
	"instance_default": "(Réamhshocrú: {value})",
	"interfaceLanguage": "Teanga comhéadain",
	"invalid_theme_imported": "Ní téama bailí é an comhad dícheangailte. Níor rinneadh aon athruithe.",
	"limited_availability": "Níl sé ar fáil i do bhrabhsálaí",
	"links": "Naisc",
	"lock_account_description": "Srian a chur ar do chuntas le lucht leanúna ceadaithe amháin",
	"loop_video": "Lúb físeáin",
	"loop_video_silent_only": "Lúb físeáin amháin gan fuaim (i.e. Mastodon's \"gifs\")",
	"name": "Ainm",
	"name_bio": "Ainm ⁊ Scéal",
	"new_password": "Pasfhocal nua'",
	"notification_visibility": "Cineálacha fógraí a thaispeáint",
	"notification_visibility_follows": "Leana",
	"notification_visibility_likes": "Thaithin",
	"notification_visibility_mentions": "Tagairt",
	"notification_visibility_repeats": "Atphostáil",
	"no_rich_text_description": "Bain formáidiú téacs saibhir ó gach post",
	"nsfw_clickthrough": "Cumasaigh an ceangaltán NSFW cliceáil ar an gcnaipe",
	"oauth_tokens": "Tocanna OAuth",
	"token": "Token",
	"refresh_token": "Athnuachan Comórtas",
	"valid_until": "Bailí Go dtí",
	"revoke_token": "Athghairm",
	"panelRadius": "Painéil",
	"pause_on_unfocused": "Sruthú ar sos nuair a bhíonn an fócas caillte",
	"presets": "Réamhshocruithe",
	"profile_background": "Cúlra Próifíl",
	"profile_banner": "Phictúir Ceanntáisc",
	"profile_tab": "Próifíl",
	"radii_help": "Cruinniú imeall comhéadan a chumrú (i bpicteilíní)",
	"replies_in_timeline": "Freagraí sa amlíne",
	"reply_link_preview": "Cumasaigh réamhamharc nasc freagartha ar chlár na luiche",
	"reply_visibility_all": "Taispeáin gach freagra",
	"reply_visibility_following": "Taispeáin freagraí amháin atá dírithe ar mise nó ar úsáideoirí atá mé ag leanúint",
	"reply_visibility_self": "Taispeáin freagraí amháin atá dírithe ar mise",
	"saving_err": "Earráid socruithe a shábháil",
	"saving_ok": "Socruithe sábháilte",
	"security_tab": "Slándáil",
	"set_new_avatar": "Athraigh do phictúir phrófíle",
	"set_new_profile_background": "Athraigh do cúlra próifíl",
	"set_new_profile_banner": "Athraigh do phictúir ceanntáisc",
	"settings": "Socruithe",
	"stop_gifs": "Seinn GIFs ar an scáileán",
	"streaming": "Cumasaigh post nua a shruthú uathoibríoch nuair a scrollaítear go barr an leathanaigh",
	"text": "Téacs",
	"theme": "Téama",
	"theme_help": "Úsáid cód daith hex (#rrggbb) chun do schéim a saincheapadh",
	"tooltipRadius": "Bileoga eolais",
	"user_settings": "Socruithe úsáideora",
	"values": {
	"false": "níl",
	"true": "tá"
	}
	},
	"timeline": {
	"collapse": "Folaigh",
	"conversation": "Cómhra",
	"error_fetching": "Earráid a thabhairt cothrom le dáta",
	"load_older": "Luchtaigh níos mó",
	"no_retweet_hint": "Tá an post seo marcáilte mar lucht leanúna amháin nó díreach agus ní féidir é a athphostáil",
	"repeated": "athphostáil",
	"show_new": "Taispeáin nua",
	"up_to_date": "Nuashonraithe"
	},
	"user_card": {
	"approve": "Údaraigh",
	"block": "Cosc",
	"blocked": "Cuireadh coisc!",
	"deny": "Diúltaigh",
	"follow": "Lean",
	"followees": "Leantóirí",
	"followers": "Á Leanúint",
	"following": "Á Leanúint",
	"follows_you": "Leanann tú",
	"mute": "Cuir i mód ciúin",
	"muted": "Mód ciúin",
	"per_day": "laethúil",
	"remote_follow": "Leaníunt iargúlta",
	"statuses": "Poist"
	},
	"user_profile": {
	"timeline_title": "Amlíne úsáideora"
	},
	"who_to_follow": {
	"more": "Feach uile",
	"who_to_follow": "Daoine le leanúint"
	}
	}
	diff --git a/src/i18n/he.json b/src/i18n/he.json
	index 213e61706b..ea581e05be 100644
	--- a/src/i18n/he.json
	+++ b/src/i18n/he.json
	@@ -1,195 +1,195 @@
	{
	"chat": {
	"title": "צ'אט"
	},
	"features_panel": {
	"chat": "צ'אט",
	"gopher": "גופר",
	"media_proxy": "מדיה פרוקסי",
	"scope_options": "אפשרויות טווח",
	"text_limit": "מגבלת טקסט",
	"title": "מאפיינים",
	"who_to_follow": "אחרי מי לעקוב"
	},
	"finder": {
	"error_fetching_user": "שגיאה במציאת משתמש",
	"find_user": "מציאת משתמש"
	},
	"general": {
	"apply": "החל",
	"submit": "שלח"
	},
	"login": {
	"login": "התחבר",
	"logout": "התנתק",
	"password": "סיסמה",
	"placeholder": "למשל lain",
	"register": "הירשם",
	"username": "שם המשתמש"
	},
	"nav": {
	"chat": "צ'אט מקומי",
	"friend_requests": "בקשות עקיבה",
	"mentions": "אזכורים",
	"public_tl": "ציר הזמן הציבורי",
	"timeline": "ציר הזמן",
	"twkn": "כל הרשת הידועה"
	},
	"notifications": {
	"broken_favorite": "סטאטוס לא ידוע, מחפש...",
	"favorited_you": "אהב את הסטטוס שלך",
	"followed_you": "עקב אחריך!",
	"load_older": "טען התראות ישנות",
	"notifications": "התראות",
	"read": "קרא!",
	"repeated_you": "חזר על הסטטוס שלך"
	},
	"post_status": {
	"account_not_locked_warning": "המשתמש שלך אינו {0}. כל אחד יכול לעקוב אחריך ולראות את ההודעות לעוקבים-בלבד שלך.",
	"account_not_locked_warning_link": "נעול",
	"attachments_sensitive": "סמן מסמכים מצורפים כלא בטוחים לצפייה",
	"content_type": {
	- "plain_text": "טקסט פשוט"
	+ "text/plain": "טקסט פשוט"
	},
	"content_warning": "נושא (נתון לבחירה)",
	"default": "הרגע נחת ב-ל.א.",
	"direct_warning": "הודעה זו תהיה זמינה רק לאנשים המוזכרים.",
	"posting": "מפרסם",
	"scope": {
	"direct": "ישיר - שלח לאנשים המוזכרים בלבד",
	"private": "עוקבים-בלבד - שלח לעוקבים בלבד",
	"public": "ציבורי - שלח לציר הזמן הציבורי",
	"unlisted": "מחוץ לרשימה - אל תשלח לציר הזמן הציבורי"
	}
	},
	"registration": {
	"bio": "אודות",
	"email": "אימייל",
	"fullname": "שם תצוגה",
	"password_confirm": "אישור סיסמה",
	"registration": "הרשמה",
	"token": "טוקן הזמנה"
	},
	"settings": {
	"attachmentRadius": "צירופים",
	"attachments": "צירופים",
	"autoload": "החל טעינה אוטומטית בגלילה לתחתית הדף",
	"avatar": "תמונת פרופיל",
	"avatarAltRadius": "תמונות פרופיל (התראות)",
	"avatarRadius": "תמונות פרופיל",
	"background": "רקע",
	"bio": "אודות",
	"btnRadius": "כפתורים",
	"cBlue": "כחול (תגובה, עקיבה)",
	"cGreen": "ירוק (חזרה)",
	"cOrange": "כתום (לייק)",
	"cRed": "אדום (ביטול)",
	"change_password": "שנה סיסמה",
	"change_password_error": "הייתה בעיה בשינוי סיסמתך.",
	"changed_password": "סיסמה שונתה בהצלחה!",
	"collapse_subject": "מזער הודעות עם נושאים",
	"confirm_new_password": "אשר סיסמה",
	"current_avatar": "תמונת הפרופיל הנוכחית שלך",
	"current_password": "סיסמה נוכחית",
	"current_profile_banner": "כרזת הפרופיל הנוכחית שלך",
	"data_import_export_tab": "ייבוא או ייצוא מידע",
	"default_vis": "ברירת מחדל לטווח הנראות",
	"delete_account": "מחק משתמש",
	"delete_account_description": "מחק לצמיתות את המשתמש שלך ואת כל הודעותיך.",
	"delete_account_error": "הייתה בעיה במחיקת המשתמש. אם זה ממשיך, אנא עדכן את מנהל השרת שלך.",
	"delete_account_instructions": "הכנס את סיסמתך בקלט למטה על מנת לאשר מחיקת משתמש.",
	"export_theme": "שמור ערכים",
	"filtering": "סינון",
	"filtering_explanation": "כל הסטטוסים הכוללים את המילים הללו יושתקו, אחד לשורה",
	"follow_export": "יצוא עקיבות",
	"follow_export_button": "ייצא את הנעקבים שלך לקובץ csv",
	"follow_export_processing": "טוען. בקרוב תתבקש להוריד את הקובץ את הקובץ שלך",
	"follow_import": "יבוא עקיבות",
	"follow_import_error": "שגיאה בייבוא נעקבים.",
	"follows_imported": "נעקבים יובאו! ייקח זמן מה לעבד אותם.",
	"foreground": "חזית",
	"hide_attachments_in_convo": "החבא צירופים בשיחות",
	"hide_attachments_in_tl": "החבא צירופים בציר הזמן",
	"import_followers_from_a_csv_file": "ייבא את הנעקבים שלך מקובץ csv",
	"import_theme": "טען ערכים",
	"inputRadius": "שדות קלט",
	"interfaceLanguage": "שפת הממשק",
	"invalid_theme_imported": "הקובץ הנבחר אינו תמה הנתמכת ע\"י פלרומה. שום שינויים לא נעשו לתמה שלך.",
	"limited_availability": "לא זמין בדפדפן שלך",
	"links": "לינקים",
	"lock_account_description": "הגבל את המשתמש לעוקבים מאושרים בלבד",
	"loop_video": "נגן סרטונים ללא הפסקה",
	"loop_video_silent_only": "נגן רק סרטונים חסרי קול ללא הפסקה",
	"name": "שם",
	"name_bio": "שם ואודות",
	"new_password": "סיסמה חדשה",
	"notification_visibility": "סוג ההתראות שתרצו לראות",
	"notification_visibility_follows": "עקיבות",
	"notification_visibility_likes": "לייקים",
	"notification_visibility_mentions": "אזכורים",
	"notification_visibility_repeats": "חזרות",
	"nsfw_clickthrough": "החל החבאת צירופים לא בטוחים לצפיה בעת עבודה בעזרת לחיצת עכבר",
	"oauth_tokens": "אסימוני OAuth",
	"token": "אסימון",
	"refresh_token": "רענון האסימון",
	"valid_until": "בתוקף עד",
	"revoke_token": "בטל",
	"panelRadius": "פאנלים",
	"pause_on_unfocused": "השהה זרימת הודעות כשהחלון לא בפוקוס",
	"presets": "ערכים קבועים מראש",
	"profile_background": "רקע הפרופיל",
	"profile_banner": "כרזת הפרופיל",
	"profile_tab": "פרופיל",
	"radii_help": "קבע מראש עיגול פינות לממשק (בפיקסלים)",
	"replies_in_timeline": "תגובות בציר הזמן",
	"reply_link_preview": "החל תצוגה מקדימה של לינק-תגובה בעת ריחוף עם העכבר",
	"reply_visibility_all": "הראה את כל התגובות",
	"reply_visibility_following": "הראה תגובות שמופנות אליי או לעקובים שלי בלבד",
	"reply_visibility_self": "הראה תגובות שמופנות אליי בלבד",
	"security_tab": "ביטחון",
	"set_new_avatar": "קבע תמונת פרופיל חדשה",
	"set_new_profile_background": "קבע רקע פרופיל חדש",
	"set_new_profile_banner": "קבע כרזת פרופיל חדשה",
	"settings": "הגדרות",
	"stop_gifs": "נגן-בעת-ריחוף GIFs",
	"streaming": "החל זרימת הודעות אוטומטית בעת גלילה למעלה הדף",
	"text": "טקסט",
	"theme": "תמה",
	"theme_help": "השתמש בקודי צבע הקס (#אדום-אדום-ירוק-ירוק-כחול-כחול) על מנת להתאים אישית את תמת הצבע שלך.",
	"tooltipRadius": "טולטיפ \\ התראות",
	"user_settings": "הגדרות משתמש"
	},
	"timeline": {
	"collapse": "מוטט",
	"conversation": "שיחה",
	"error_fetching": "שגיאה בהבאת הודעות",
	"load_older": "טען סטטוסים חדשים",
	"no_retweet_hint": "ההודעה מסומנת כ\"לעוקבים-בלבד\" ולא ניתן לחזור עליה",
	"repeated": "חזר",
	"show_new": "הראה חדש",
	"up_to_date": "עדכני"
	},
	"user_card": {
	"approve": "אשר",
	"block": "חסימה",
	"blocked": "חסום!",
	"deny": "דחה",
	"follow": "עקוב",
	"followees": "נעקבים",
	"followers": "עוקבים",
	"following": "עוקב!",
	"follows_you": "עוקב אחריך!",
	"mute": "השתק",
	"muted": "מושתק",
	"per_day": "ליום",
	"remote_follow": "עקיבה מרחוק",
	"statuses": "סטטוסים"
	},
	"user_profile": {
	"timeline_title": "ציר זמן המשתמש"
	},
	"who_to_follow": {
	"more": "עוד",
	"who_to_follow": "אחרי מי לעקוב"
	}
	}
	diff --git a/src/i18n/it.json b/src/i18n/it.json
	index 385d21aa91..f441292eac 100644
	--- a/src/i18n/it.json
	+++ b/src/i18n/it.json
	@@ -1,206 +1,206 @@
	{
	"general": {
	"submit": "Invia",
	"apply": "Applica"
	},
	"nav": {
	"mentions": "Menzioni",
	"public_tl": "Sequenza temporale pubblica",
	"timeline": "Sequenza temporale",
	"twkn": "L'intera rete conosciuta",
	"chat": "Chat Locale",
	"friend_requests": "Richieste di Seguirti"
	},
	"notifications": {
	"followed_you": "ti segue",
	"notifications": "Notifiche",
	"read": "Leggi!",
	"broken_favorite": "Stato sconosciuto, lo sto cercando...",
	"favorited_you": "ha messo mi piace al tuo stato",
	"load_older": "Carica notifiche più vecchie",
	"repeated_you": "ha condiviso il tuo stato"
	},
	"settings": {
	"attachments": "Allegati",
	"autoload": "Abilita caricamento automatico quando si raggiunge fondo pagina",
	"avatar": "Avatar",
	"bio": "Introduzione",
	"current_avatar": "Il tuo avatar attuale",
	"current_profile_banner": "Il tuo banner attuale",
	"filtering": "Filtri",
	"filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, uno per linea",
	"hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
	"hide_attachments_in_tl": "Nascondi gli allegati presenti nella sequenza temporale",
	"name": "Nome",
	"name_bio": "Nome & Introduzione",
	"nsfw_clickthrough": "Abilita il click per visualizzare gli allegati segnati come NSFW",
	"profile_background": "Sfondo della tua pagina",
	"profile_banner": "Banner del tuo profilo",
	"reply_link_preview": "Abilita il link per la risposta al passaggio del mouse",
	"set_new_avatar": "Scegli un nuovo avatar",
	"set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
	"set_new_profile_banner": "Scegli un nuovo banner per il tuo profilo",
	"settings": "Impostazioni",
	"theme": "Tema",
	"user_settings": "Impostazioni Utente",
	"attachmentRadius": "Allegati",
	"avatarAltRadius": "Avatar (Notifiche)",
	"avatarRadius": "Avatar",
	"background": "Sfondo",
	"btnRadius": "Pulsanti",
	"cBlue": "Blu (Rispondere, seguire)",
	"cGreen": "Verde (Condividi)",
	"cOrange": "Arancio (Mi piace)",
	"cRed": "Rosso (Annulla)",
	"change_password": "Cambia Password",
	"change_password_error": "C'è stato un problema durante il cambiamento della password.",
	"changed_password": "Password cambiata correttamente!",
	"collapse_subject": "Riduci post che hanno un oggetto",
	"confirm_new_password": "Conferma la nuova password",
	"current_password": "Password attuale",
	"data_import_export_tab": "Importa / Esporta Dati",
	"default_vis": "Visibilità predefinita dei post",
	"delete_account": "Elimina Account",
	"delete_account_description": "Elimina definitivamente il tuo account e tutti i tuoi messaggi.",
	"delete_account_error": "C'è stato un problema durante l'eliminazione del tuo account. Se il problema persiste contatta l'amministratore della tua istanza.",
	"delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione dell'account.",
	"export_theme": "Salva settaggi",
	"follow_export": "Esporta la lista di chi segui",
	"follow_export_button": "Esporta la lista di chi segui in un file csv",
	"follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file",
	"follow_import": "Importa la lista di chi segui",
	"follow_import_error": "Errore nell'importazione della lista di chi segui",
	"follows_imported": "Importazione riuscita! L'elaborazione richiederà un po' di tempo.",
	"foreground": "In primo piano",
	"general": "Generale",
	"hide_post_stats": "Nascondi statistiche dei post (es. il numero di mi piace)",
	"hide_user_stats": "Nascondi statistiche dell'utente (es. il numero di chi ti segue)",
	"import_followers_from_a_csv_file": "Importa una lista di chi segui da un file csv",
	"import_theme": "Carica settaggi",
	"inputRadius": "Campi di testo",
	"instance_default": "(predefinito: {value})",
	"interfaceLanguage": "Linguaggio dell'interfaccia",
	"invalid_theme_imported": "Il file selezionato non è un file di tema per Pleroma supportato. Il tuo tema non è stato modificato.",
	"limited_availability": "Non disponibile nel tuo browser",
	"links": "Collegamenti",
	"lock_account_description": "Limita il tuo account solo per contatti approvati",
	"loop_video": "Riproduci video in ciclo continuo",
	"loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le gif di Mastodon)",
	"new_password": "Nuova password",
	"notification_visibility": "Tipi di notifiche da mostrare",
	"notification_visibility_follows": "Nuove persone ti seguono",
	"notification_visibility_likes": "Mi piace",
	"notification_visibility_mentions": "Menzioni",
	"notification_visibility_repeats": "Condivisioni",
	"no_rich_text_description": "Togli la formattazione del testo da tutti i post",
	"oauth_tokens": "Token OAuth",
	"token": "Token",
	"refresh_token": "Aggiorna token",
	"valid_until": "Valido fino a",
	"revoke_token": "Revocare",
	"panelRadius": "Pannelli",
	"pause_on_unfocused": "Metti in pausa l'aggiornamento continuo quando la scheda non è in primo piano",
	"presets": "Valori predefiniti",
	"profile_tab": "Profilo",
	"radii_help": "Imposta l'arrotondamento dei bordi (in pixel)",
	"replies_in_timeline": "Risposte nella sequenza temporale",
	"reply_visibility_all": "Mostra tutte le risposte",
	"reply_visibility_following": "Mostra solo le risposte dirette a me o agli utenti che seguo",
	"reply_visibility_self": "Mostra solo risposte dirette a me",
	"saving_err": "Errore nel salvataggio delle impostazioni",
	"saving_ok": "Impostazioni salvate",
	"security_tab": "Sicurezza",
	"stop_gifs": "Riproduci GIF al passaggio del cursore del mouse",
	"streaming": "Abilita aggiornamento automatico dei nuovi post quando si è in alto alla pagina",
	"text": "Testo",
	"theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
	"tooltipRadius": "Descrizioni/avvisi",
	"values": {
	"false": "no",
	"true": "si"
	}
	},
	"timeline": {
	"error_fetching": "Errore nel prelievo aggiornamenti",
	"load_older": "Carica messaggi più vecchi",
	"show_new": "Mostra nuovi",
	"up_to_date": "Aggiornato",
	"collapse": "Riduci",
	"conversation": "Conversazione",
	"no_retweet_hint": "La visibilità del post è impostata solo per chi ti segue o messaggio diretto e non può essere condiviso",
	"repeated": "condiviso"
	},
	"user_card": {
	"follow": "Segui",
	"followees": "Chi stai seguendo",
	"followers": "Chi ti segue",
	"following": "Lo stai seguendo!",
	"follows_you": "Ti segue!",
	"mute": "Silenzia",
	"muted": "Silenziato",
	"per_day": "al giorno",
	"statuses": "Messaggi",
	"approve": "Approva",
	"block": "Blocca",
	"blocked": "Bloccato!",
	"deny": "Nega",
	"remote_follow": "Segui da remoto"
	},
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media proxy",
	"scope_options": "Opzioni di visibilità",
	"text_limit": "Lunghezza limite",
	"title": "Caratteristiche",
	"who_to_follow": "Chi seguire"
	},
	"finder": {
	"error_fetching_user": "Errore nel recupero dell'utente",
	"find_user": "Trova utente"
	},
	"login": {
	"login": "Accedi",
	"logout": "Disconnettiti",
	"password": "Password",
	"placeholder": "es. lain",
	"register": "Registrati",
	"username": "Nome utente"
	},
	"post_status": {
	"account_not_locked_warning": "Il tuo account non è {0}. Chiunque può seguirti e vedere i tuoi post riservati a chi ti segue.",
	"account_not_locked_warning_link": "bloccato",
	"attachments_sensitive": "Segna allegati come sensibili",
	"content_type": {
	- "plain_text": "Testo normale"
	+ "text/plain": "Testo normale"
	},
	"content_warning": "Oggetto (facoltativo)",
	"default": "Appena atterrato in L.A.",
	"direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
	"posting": "Pubblica",
	"scope": {
	"direct": "Diretto - Pubblicato solo per gli utenti menzionati",
	"private": "Solo per chi ti segue - Visibile solo da chi ti segue",
	"public": "Pubblico - Visibile sulla sequenza temporale pubblica",
	"unlisted": "Non elencato - Non visibile sulla sequenza temporale pubblica"
	}
	},
	"registration": {
	"bio": "Introduzione",
	"email": "Email",
	"fullname": "Nome visualizzato",
	"password_confirm": "Conferma password",
	"registration": "Registrazione",
	"token": "Codice d'invito"
	},
	"user_profile": {
	"timeline_title": "Sequenza Temporale dell'Utente"
	},
	"who_to_follow": {
	"more": "Più",
	"who_to_follow": "Chi seguire"
	}
	}
	diff --git a/src/i18n/ja.json b/src/i18n/ja.json
	index f39a5a7c93..b77f553127 100644
	--- a/src/i18n/ja.json
	+++ b/src/i18n/ja.json
	@@ -1,392 +1,392 @@
	{
	"chat": {
	"title": "チャット"
	},
	"features_panel": {
	"chat": "チャット",
	"gopher": "Gopher",
	"media_proxy": "メディアプロクシ",
	"scope_options": "こうかいはんいせんたく",
	"text_limit": "もじのかず",
	"title": "ゆうこうなきのう",
	"who_to_follow": "おすすめユーザー"
	},
	"finder": {
	"error_fetching_user": "ユーザーけんさくがエラーになりました。",
	"find_user": "ユーザーをさがす"
	},
	"general": {
	"apply": "てきよう",
	"submit": "そうしん",
	"more": "つづき",
	"generic_error": "エラーになりました"
	},
	"login": {
	"login": "ログイン",
	"description": "OAuthでログイン",
	"logout": "ログアウト",
	"password": "パスワード",
	"placeholder": "れい: lain",
	"register": "はじめる",
	"username": "ユーザーめい",
	"hint": "はなしあいにくわわるには、ログインしてください"
	},
	"nav": {
	"about": "これはなに？",
	"back": "もどる",
	"chat": "ローカルチャット",
	"friend_requests": "フォローリクエスト",
	"mentions": "メンション",
	"dms": "ダイレクトメッセージ",
	"public_tl": "パブリックタイムライン",
	"timeline": "タイムライン",
	"twkn": "つながっているすべてのネットワーク",
	"user_search": "ユーザーをさがす",
	"who_to_follow": "おすすめユーザー",
	"preferences": "せってい"
	},
	"notifications": {
	"broken_favorite": "ステータスがみつかりません。さがしています...",
	"favorited_you": "あなたのステータスがおきにいりされました",
	"followed_you": "フォローされました",
	"load_older": "ふるいつうちをみる",
	"notifications": "つうち",
	"read": "よんだ！",
	"repeated_you": "あなたのステータスがリピートされました",
	"no_more_notifications": "つうちはありません"
	},
	"post_status": {
	"new_status": "とうこうする",
	"account_not_locked_warning": "あなたのアカウントは {0} ではありません。あなたをフォローすれば、だれでも、フォロワーげんていのステータスをよむことができます。",
	"account_not_locked_warning_link": "ロックされたアカウント",
	"attachments_sensitive": "ファイルをNSFWにする",
	"content_type": {
	- "plain_text": "プレーンテキスト"
	+ "text/plain": "プレーンテキスト"
	},
	"content_warning": "せつめい (かかなくてもよい)",
	"default": "はねだくうこうに、つきました。",
	"direct_warning": "このステータスは、メンションされたユーザーだけが、よむことができます。",
	"posting": "とうこう",
	"scope": {
	"direct": "ダイレクト: メンションされたユーザーのみにとどきます。",
	"private": "フォロワーげんてい: フォロワーのみにとどきます。",
	"public": "パブリック: パブリックタイムラインにとどきます。",
	"unlisted": "アンリステッド: パブリックタイムラインにとどきません。"
	}
	},
	"registration": {
	"bio": "プロフィール",
	"email": "Eメール",
	"fullname": "スクリーンネーム",
	"password_confirm": "パスワードのかくにん",
	"registration": "はじめる",
	"token": "しょうたいトークン",
	"captcha": "CAPTCHA",
	"new_captcha": "もじがよめないときは、がぞうをクリックすると、あたらしいがぞうになります",
	"validations": {
	"username_required": "なにかかいてください",
	"fullname_required": "なにかかいてください",
	"email_required": "なにかかいてください",
	"password_required": "なにかかいてください",
	"password_confirmation_required": "なにかかいてください",
	"password_confirmation_match": "パスワードがちがいます"
	}
	},
	"settings": {
	"attachmentRadius": "ファイル",
	"attachments": "ファイル",
	"autoload": "したにスクロールしたとき、じどうてきによみこむ。",
	"avatar": "アバター",
	"avatarAltRadius": "つうちのアバター",
	"avatarRadius": "アバター",
	"background": "バックグラウンド",
	"bio": "プロフィール",
	"btnRadius": "ボタン",
	"cBlue": "リプライとフォロー",
	"cGreen": "リピート",
	"cOrange": "おきにいり",
	"cRed": "キャンセル",
	"change_password": "パスワードをかえる",
	"change_password_error": "パスワードをかえることが、できなかったかもしれません。",
	"changed_password": "パスワードが、かわりました！",
	"collapse_subject": "せつめいのあるとうこうをたたむ",
	"composing": "とうこう",
	"confirm_new_password": "あたらしいパスワードのかくにん",
	"current_avatar": "いまのアバター",
	"current_password": "いまのパスワード",
	"current_profile_banner": "いまのプロフィールバナー",
	"data_import_export_tab": "インポートとエクスポート",
	"default_vis": "デフォルトのこうかいはんい",
	"delete_account": "アカウントをけす",
	"delete_account_description": "あなたのアカウントとメッセージが、きえます。",
	"delete_account_error": "アカウントをけすことが、できなかったかもしれません。インスタンスのかんりしゃに、れんらくしてください。",
	"delete_account_instructions": "ほんとうにアカウントをけしてもいいなら、パスワードをかいてください。",
	"avatar_size_instruction": "アバターのおおきさは、150×150ピクセルか、それよりもおおきくするといいです。",
	"export_theme": "セーブ",
	"filtering": "フィルタリング",
	"filtering_explanation": "これらのことばをふくむすべてのものがミュートされます。1ぎょうに1つのことばをかいてください。",
	"follow_export": "フォローのエクスポート",
	"follow_export_button": "エクスポート",
	"follow_export_processing": "おまちください。まもなくファイルをダウンロードできます。",
	"follow_import": "フォローインポート",
	"follow_import_error": "フォローのインポートがエラーになりました。",
	"follows_imported": "フォローがインポートされました！すこしじかんがかかるかもしれません。",
	"foreground": "フォアグラウンド",
	"general": "ぜんぱん",
	"hide_attachments_in_convo": "スレッドのファイルをかくす",
	"hide_attachments_in_tl": "タイムラインのファイルをかくす",
	"hide_isp": "インスタンススペシフィックパネルをかくす",
	"preload_images": "がぞうをさきよみする",
	"use_one_click_nsfw": "NSFWなファイルを1クリックでひらく",
	"hide_post_stats": "とうこうのとうけいをかくす (れい: おきにいりのかず)",
	"hide_user_stats": "ユーザーのとうけいをかくす (れい: フォロワーのかず)",
	"hide_filtered_statuses": "フィルターされたとうこうをかくす",
	"import_followers_from_a_csv_file": "CSVファイルからフォローをインポートする",
	"import_theme": "ロード",
	"inputRadius": "インプットフィールド",
	"checkboxRadius": "チェックボックス",
	"instance_default": "(デフォルト: {value})",
	"instance_default_simple": "(デフォルト)",
	"interface": "インターフェース",
	"interfaceLanguage": "インターフェースのことば",
	"invalid_theme_imported": "このファイルはPleromaのテーマではありません。テーマはへんこうされませんでした。",
	"limited_availability": "あなたのブラウザではできません",
	"links": "リンク",
	"lock_account_description": "あなたがみとめたひとだけ、あなたのアカウントをフォローできる",
	"loop_video": "ビデオをくりかえす",
	"loop_video_silent_only": "おとのないビデオだけくりかえす",
	"play_videos_in_modal": "ビデオをメディアビューアーでみる",
	"use_contain_fit": "がぞうのサムネイルを、きりぬかない",
	"name": "なまえ",
	"name_bio": "なまえとプロフィール",
	"new_password": "あたらしいパスワード",
	"notification_visibility": "ひょうじするつうち",
	"notification_visibility_follows": "フォロー",
	"notification_visibility_likes": "おきにいり",
	"notification_visibility_mentions": "メンション",
	"notification_visibility_repeats": "リピート",
	"no_rich_text_description": "リッチテキストをつかわない",
	"hide_follows_description": "フォローしているひとをみせない",
	"hide_followers_description": "フォロワーをみせない",
	"show_admin_badge": "アドミンのしるしをみる",
	"show_moderator_badge": "モデレーターのしるしをみる",
	"nsfw_clickthrough": "NSFWなファイルをかくす",
	"oauth_tokens": "OAuthトークン",
	"token": "トークン",
	"refresh_token": "トークンを更新",
	"valid_until": "まで有効",
	"revoke_token": "取り消す",
	"panelRadius": "パネル",
	"pause_on_unfocused": "タブにフォーカスがないときストリーミングをとめる",
	"presets": "プリセット",
	"profile_background": "プロフィールのバックグラウンド",
	"profile_banner": "プロフィールバナー",
	"profile_tab": "プロフィール",
	"radii_help": "インターフェースのまるさをせっていする。",
	"replies_in_timeline": "タイムラインのリプライ",
	"reply_link_preview": "カーソルをかさねたとき、リプライのプレビューをみる",
	"reply_visibility_all": "すべてのリプライをみる",
	"reply_visibility_following": "わたしにあてられたリプライと、フォローしているひとからのリプライをみる",
	"reply_visibility_self": "わたしにあてられたリプライをみる",
	"saving_err": "せっていをセーブできませんでした",
	"saving_ok": "せっていをセーブしました",
	"security_tab": "セキュリティ",
	"scope_copy": "リプライするとき、こうかいはんいをコピーする (DMのこうかいはんいは、つねにコピーされます)",
	"set_new_avatar": "あたらしいアバターをせっていする",
	"set_new_profile_background": "あたらしいプロフィールのバックグラウンドをせっていする",
	"set_new_profile_banner": "あたらしいプロフィールバナーを設定する",
	"settings": "せってい",
	"subject_input_always_show": "サブジェクトフィールドをいつでもひょうじする",
	"subject_line_behavior": "リプライするときサブジェクトをコピーする",
	"subject_line_email": "メールふう: \"re: サブジェクト\"",
	"subject_line_mastodon": "マストドンふう: そのままコピー",
	"subject_line_noop": "コピーしない",
	"post_status_content_type": "とうこうのコンテントタイプ",
	"stop_gifs": "カーソルをかさねたとき、GIFをうごかす",
	"streaming": "うえまでスクロールしたとき、じどうてきにストリーミングする",
	"text": "もじ",
	"theme": "テーマ",
	"theme_help": "カラーテーマをカスタマイズできます",
	"theme_help_v2_1": "チェックボックスをONにすると、コンポーネントごとに、いろと、とうめいどを、オーバーライドできます。「すべてクリア」ボタンをおすと、すべてのオーバーライドを、やめます。",
	"theme_help_v2_2": "バックグラウンドとテキストのコントラストをあらわすアイコンがあります。マウスをホバーすると、くわしいせつめいがでます。とうめいないろをつかっているときは、もっともわるいばあいのコントラストがしめされます。",
	"tooltipRadius": "ツールチップとアラート",
	"user_settings": "ユーザーせってい",
	"values": {
	"false": "いいえ",
	"true": "はい"
	},
	"notifications": "つうち",
	"enable_web_push_notifications": "ウェブプッシュつうちをゆるす",
	"style": {
	"switcher": {
	"keep_color": "いろをのこす",
	"keep_shadows": "かげをのこす",
	"keep_opacity": "とうめいどをのこす",
	"keep_roundness": "まるさをのこす",
	"keep_fonts": "フォントをのこす",
	"save_load_hint": "「のこす」オプションをONにすると、テーマをえらんだときとロードしたとき、いまのせっていをのこします。また、テーマをエクスポートするとき、これらのオプションをストアします。すべてのチェックボックスをOFFにすると、テーマをエクスポートしたとき、すべてのせっていをセーブします。",
	"reset": "リセット",
	"clear_all": "すべてクリア",
	"clear_opacity": "とうめいどをクリア"
	},
	"common": {
	"color": "いろ",
	"opacity": "とうめいど",
	"contrast": {
	"hint": "コントラストは {ratio} です。{level}。({context})",
	"level": {
	"aa": "AAレベルガイドライン (ミニマル) をみたします",
	"aaa": "AAAレベルガイドライン (レコメンデッド) をみたします。",
	"bad": "ガイドラインをみたしません。"
	},
	"context": {
	"18pt": "おおきい (18ポイントいじょう) テキスト",
	"text": "テキスト"
	}
	}
	},
	"common_colors": {
	"_tab_label": "きょうつう",
	"main": "きょうつうのいろ",
	"foreground_hint": "「くわしく」タブで、もっとこまかくせっていできます",
	"rgbo": "アイコンとアクセントとバッジ"
	},
	"advanced_colors": {
	"_tab_label": "くわしく",
	"alert": "アラートのバックグラウンド",
	"alert_error": "エラー",
	"badge": "バッジのバックグラウンド",
	"badge_notification": "つうち",
	"panel_header": "パネルヘッダー",
	"top_bar": "トップバー",
	"borders": "さかいめ",
	"buttons": "ボタン",
	"inputs": "インプットフィールド",
	"faint_text": "うすいテキスト"
	},
	"radii": {
	"_tab_label": "まるさ"
	},
	"shadows": {
	"_tab_label": "ひかりとかげ",
	"component": "コンポーネント",
	"override": "オーバーライド",
	"shadow_id": "かげ #{value}",
	"blur": "ぼかし",
	"spread": "ひろがり",
	"inset": "うちがわ",
	"hint": "かげのせっていでは、いろのあたいとして --variable をつかうことができます。これはCSS3へんすうです。ただし、とうめいどのせっていは、きかなくなります。",
	"filter_hint": {
	"always_drop_shadow": "ブラウザーがサポートしていれば、つねに {0} がつかわれます。",
	"drop_shadow_syntax": "{0} は、{1} パラメーターと {2} キーワードをサポートしていません。",
	"avatar_inset": "うちがわのかげと、そとがわのかげを、いっしょにつかうと、とうめいなアバターが、へんなみためになります。",
	"spread_zero": "ひろがりが 0 よりもおおきなかげは、0 とおなじです。",
	"inset_classic": "うちがわのかげは {0} をつかいます。"
	},
	"components": {
	"panel": "パネル",
	"panelHeader": "パネルヘッダー",
	"topBar": "トップバー",
	"avatar": "ユーザーアバター (プロフィール)",
	"avatarStatus": "ユーザーアバター (とうこう)",
	"popup": "ポップアップとツールチップ",
	"button": "ボタン",
	"buttonHover": "ボタン (ホバー)",
	"buttonPressed": "ボタン (おされているとき)",
	"buttonPressedHover": "ボタン (ホバー、かつ、おされているとき)",
	"input": "インプットフィールド"
	}
	},
	"fonts": {
	"_tab_label": "フォント",
	"help": "「カスタム」をえらんだときは、システムにあるフォントのなまえを、ただしくにゅうりょくしてください。",
	"components": {
	"interface": "インターフェース",
	"input": "インプットフィールド",
	"post": "とうこう",
	"postCode": "モノスペース (とうこうがリッチテキストであるとき)"
	},
	"family": "フォントめい",
	"size": "おおきさ (px)",
	"weight": "ふとさ",
	"custom": "カスタム"
	},
	"preview": {
	"header": "プレビュー",
	"content": "ほんぶん",
	"error": "エラーのれい",
	"button": "ボタン",
	"text": "これは{0}と{1}のれいです。",
	"mono": "monospace",
	"input": "はねだくうこうに、つきました。",
	"faint_link": "とてもたすけになるマニュアル",
	"fine_print": "わたしたちの{0}を、よまないでください！",
	"header_faint": "エラーではありません",
	"checkbox": "りようきやくを、よみました",
	"link": "ハイパーリンク"
	}
	}
	},
	"timeline": {
	"collapse": "たたむ",
	"conversation": "スレッド",
	"error_fetching": "よみこみがエラーになりました",
	"load_older": "ふるいステータス",
	"no_retweet_hint": "とうこうを「フォロワーのみ」または「ダイレクト」にすると、リピートできなくなります",
	"repeated": "リピート",
	"show_new": "よみこみ",
	"up_to_date": "さいしん",
	"no_more_statuses": "これでおわりです"
	},
	"user_card": {
	"approve": "うけいれ",
	"block": "ブロック",
	"blocked": "ブロックしています！",
	"deny": "おことわり",
	"favorites": "おきにいり",
	"follow": "フォロー",
	"follow_sent": "リクエストを、おくりました！",
	"follow_progress": "リクエストしています…",
	"follow_again": "ふたたびリクエストをおくりますか？",
	"follow_unfollow": "フォローをやめる",
	"followees": "フォロー",
	"followers": "フォロワー",
	"following": "フォローしています！",
	"follows_you": "フォローされました！",
	"its_you": "これはあなたです！",
	"media": "メディア",
	"mute": "ミュート",
	"muted": "ミュートしています！",
	"per_day": "/日",
	"remote_follow": "リモートフォロー",
	"statuses": "ステータス"
	},
	"user_profile": {
	"timeline_title": "ユーザータイムライン"
	},
	"who_to_follow": {
	"more": "くわしく",
	"who_to_follow": "おすすめユーザー"
	},
	"tool_tip": {
	"media_upload": "メディアをアップロード",
	"repeat": "リピート",
	"reply": "リプライ",
	"favorite": "おきにいり",
	"user_settings": "ユーザーせってい"
	},
	"upload":{
	"error": {
	"base": "アップロードにしっぱいしました。",
	"file_too_big": "ファイルがおおきすぎます [{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
	"default": "しばらくしてから、ためしてください"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/ko.json b/src/i18n/ko.json
	index 336e464f5b..402a354c9a 100644
	--- a/src/i18n/ko.json
	+++ b/src/i18n/ko.json
	@@ -1,376 +1,376 @@
	{
	"chat": {
	"title": "챗"
	},
	"features_panel": {
	"chat": "챗",
	"gopher": "고퍼",
	"media_proxy": "미디어 프록시",
	"scope_options": "범위 옵션",
	"text_limit": "텍스트 제한",
	"title": "기능",
	"who_to_follow": "팔로우 추천"
	},
	"finder": {
	"error_fetching_user": "사용자 정보 불러오기 실패",
	"find_user": "사용자 찾기"
	},
	"general": {
	"apply": "적용",
	"submit": "보내기"
	},
	"login": {
	"login": "로그인",
	"description": "OAuth로 로그인",
	"logout": "로그아웃",
	"password": "암호",
	"placeholder": "예시: lain",
	"register": "가입",
	"username": "사용자 이름"
	},
	"nav": {
	"about": "About",
	"back": "뒤로",
	"chat": "로컬 챗",
	"friend_requests": "팔로우 요청",
	"mentions": "멘션",
	"dms": "다이렉트 메시지",
	"public_tl": "공개 타임라인",
	"timeline": "타임라인",
	"twkn": "모든 알려진 네트워크",
	"user_search": "사용자 검색",
	"preferences": "환경설정"
	},
	"notifications": {
	"broken_favorite": "알 수 없는 게시물입니다, 검색 합니다...",
	"favorited_you": "당신의 게시물을 즐겨찾기",
	"followed_you": "당신을 팔로우",
	"load_older": "오래 된 알림 불러오기",
	"notifications": "알림",
	"read": "읽음!",
	"repeated_you": "당신의 게시물을 리핏"
	},
	"post_status": {
	"new_status": "새 게시물 게시",
	"account_not_locked_warning": "당신의 계정은 {0} 상태가 아닙니다. 누구나 당신을 팔로우 하고 팔로워 전용 게시물을 볼 수 있습니다.",
	"account_not_locked_warning_link": "잠김",
	"attachments_sensitive": "첨부물을 민감함으로 설정",
	"content_type": {
	- "plain_text": "평문"
	+ "text/plain": "평문"
	},
	"content_warning": "주제 (필수 아님)",
	"default": "LA에 도착!",
	"direct_warning": "이 게시물을 멘션 된 사용자들에게만 보여집니다",
	"posting": "게시",
	"scope": {
	"direct": "다이렉트 - 멘션 된 사용자들에게만",
	"private": "팔로워 전용 - 팔로워들에게만",
	"public": "공개 - 공개 타임라인으로",
	"unlisted": "비공개 - 공개 타임라인에 게시 안 함"
	}
	},
	"registration": {
	"bio": "소개",
	"email": "이메일",
	"fullname": "표시 되는 이름",
	"password_confirm": "암호 확인",
	"registration": "가입하기",
	"token": "초대 토큰",
	"captcha": "캡차",
	"new_captcha": "이미지를 클릭해서 새로운 캡차",
	"validations": {
	"username_required": "공백으로 둘 수 없습니다",
	"fullname_required": "공백으로 둘 수 없습니다",
	"email_required": "공백으로 둘 수 없습니다",
	"password_required": "공백으로 둘 수 없습니다",
	"password_confirmation_required": "공백으로 둘 수 없습니다",
	"password_confirmation_match": "패스워드와 일치해야 합니다"
	}
	},
	"settings": {
	"attachmentRadius": "첨부물",
	"attachments": "첨부물",
	"autoload": "최하단에 도착하면 자동으로 로드 활성화",
	"avatar": "아바타",
	"avatarAltRadius": "아바타 (알림)",
	"avatarRadius": "아바타",
	"background": "배경",
	"bio": "소개",
	"btnRadius": "버튼",
	"cBlue": "파랑 (답글, 팔로우)",
	"cGreen": "초록 (리트윗)",
	"cOrange": "주황 (즐겨찾기)",
	"cRed": "빨강 (취소)",
	"change_password": "암호 바꾸기",
	"change_password_error": "암호를 바꾸는 데 몇 가지 문제가 있습니다.",
	"changed_password": "암호를 바꾸었습니다!",
	"collapse_subject": "주제를 가진 게시물 접기",
	"composing": "작성",
	"confirm_new_password": "새 패스워드 확인",
	"current_avatar": "현재 아바타",
	"current_password": "현재 패스워드",
	"current_profile_banner": "현재 프로필 배너",
	"data_import_export_tab": "데이터 불러오기 / 내보내기",
	"default_vis": "기본 공개 범위",
	"delete_account": "계정 삭제",
	"delete_account_description": "계정과 메시지를 영구히 삭제.",
	"delete_account_error": "계정을 삭제하는데 문제가 있습니다. 계속 발생한다면 인스턴스 관리자에게 문의하세요.",
	"delete_account_instructions": "계정 삭제를 확인하기 위해 아래에 패스워드 입력.",
	"export_theme": "프리셋 저장",
	"filtering": "필터링",
	"filtering_explanation": "아래의 단어를 가진 게시물들은 뮤트 됩니다, 한 줄에 하나씩 적으세요",
	"follow_export": "팔로우 내보내기",
	"follow_export_button": "팔로우 목록을 csv로 내보내기",
	"follow_export_processing": "진행 중입니다, 곧 다운로드 가능해 질 것입니다",
	"follow_import": "팔로우 불러오기",
	"follow_import_error": "팔로우 불러오기 실패",
	"follows_imported": "팔로우 목록을 불러왔습니다! 처리에는 시간이 걸립니다.",
	"foreground": "전경",
	"general": "일반",
	"hide_attachments_in_convo": "대화의 첨부물 숨기기",
	"hide_attachments_in_tl": "타임라인의 첨부물 숨기기",
	"hide_isp": "인스턴스 전용 패널 숨기기",
	"preload_images": "이미지 미리 불러오기",
	"hide_post_stats": "게시물 통계 숨기기 (즐겨찾기 수 등)",
	"hide_user_stats": "사용자 통계 숨기기 (팔로워 수 등)",
	"import_followers_from_a_csv_file": "csv 파일에서 팔로우 목록 불러오기",
	"import_theme": "프리셋 불러오기",
	"inputRadius": "입력 칸",
	"checkboxRadius": "체크박스",
	"instance_default": "(기본: {value})",
	"instance_default_simple": "(기본)",
	"interface": "인터페이스",
	"interfaceLanguage": "인터페이스 언어",
	"invalid_theme_imported": "선택한 파일은 지원하는 플레로마 테마가 아닙니다. 아무런 변경도 일어나지 않았습니다.",
	"limited_availability": "이 브라우저에서 사용 불가",
	"links": "링크",
	"lock_account_description": "계정을 승인 된 팔로워들로 제한",
	"loop_video": "비디오 반복재생",
	"loop_video_silent_only": "소리가 없는 비디오만 반복 재생 (마스토돈의 \"gifs\" 같은 것들)",
	"name": "이름",
	"name_bio": "이름 & 소개",
	"new_password": "새 암호",
	"notification_visibility": "보여 줄 알림 종류",
	"notification_visibility_follows": "팔로우",
	"notification_visibility_likes": "좋아함",
	"notification_visibility_mentions": "멘션",
	"notification_visibility_repeats": "반복",
	"no_rich_text_description": "모든 게시물의 서식을 지우기",
	"hide_follows_description": "내가 팔로우하는 사람을 표시하지 않음",
	"hide_followers_description": "나를 따르는 사람을 보여주지 마라.",
	"nsfw_clickthrough": "NSFW 이미지 \"클릭해서 보이기\"를 활성화",
	"oauth_tokens": "OAuth 토큰",
	"token": "토큰",
	"refresh_token": "토큰 새로 고침",
	"valid_until": "까지 유효하다",
	"revoke_token": "취소",
	"panelRadius": "패널",
	"pause_on_unfocused": "탭이 활성 상태가 아닐 때 스트리밍 멈추기",
	"presets": "프리셋",
	"profile_background": "프로필 배경",
	"profile_banner": "프로필 배너",
	"profile_tab": "프로필",
	"radii_help": "인터페이스 모서리 둥글기 (픽셀 단위)",
	"replies_in_timeline": "답글을 타임라인에",
	"reply_link_preview": "마우스를 올려서 답글 링크 미리보기 활성화",
	"reply_visibility_all": "모든 답글 보기",
	"reply_visibility_following": "나에게 직접 오는 답글이나 내가 팔로우 중인 사람에게서 오는 답글만 표시",
	"reply_visibility_self": "나에게 직접 전송 된 답글만 보이기",
	"saving_err": "설정 저장 실패",
	"saving_ok": "설정 저장 됨",
	"security_tab": "보안",
	"scope_copy": "답글을 달 때 공개 범위 따라가리 (다이렉트 메시지는 언제나 따라감)",
	"set_new_avatar": "새 아바타 설정",
	"set_new_profile_background": "새 프로필 배경 설정",
	"set_new_profile_banner": "새 프로필 배너 설정",
	"settings": "설정",
	"subject_input_always_show": "항상 주제 칸 보이기",
	"subject_line_behavior": "답글을 달 때 주제 복사하기",
	"subject_line_email": "이메일처럼: \"re: 주제\"",
	"subject_line_mastodon": "마스토돈처럼: 그대로 복사",
	"subject_line_noop": "복사 안 함",
	"stop_gifs": "GIF파일에 마우스를 올려서 재생",
	"streaming": "최상단에 도달하면 자동으로 새 게시물 스트리밍",
	"text": "텍스트",
	"theme": "테마",
	"theme_help": "16진수 색상코드(#rrggbb)를 사용해 색상 테마를 커스터마이즈.",
	"theme_help_v2_1": "체크박스를 통해 몇몇 컴포넌트의 색상과 불투명도를 조절 가능, \"모두 지우기\" 버튼으로 덮어 씌운 것을 모두 취소.",
	"theme_help_v2_2": "몇몇 입력칸 밑의 아이콘은 전경/배경 대비 관련 표시등입니다, 마우스를 올려 자세한 정보를 볼 수 있습니다. 투명도 대비 표시등이 가장 최악의 경우를 나타낸다는 것을 유의하세요.",
	"tooltipRadius": "툴팁/경고",
	"user_settings": "사용자 설정",
	"values": {
	"false": "아니오",
	"true": "네"
	},
	"notifications": "알림",
	"enable_web_push_notifications": "웹 푸시 알림 활성화",
	"style": {
	"switcher": {
	"keep_color": "색상 유지",
	"keep_shadows": "그림자 유지",
	"keep_opacity": "불투명도 유지",
	"keep_roundness": "둥글기 유지",
	"keep_fonts": "글자체 유지",
	"save_load_hint": "\"유지\" 옵션들은 다른 테마를 고르거나 불러 올 때 현재 설정 된 옵션들을 건드리지 않게 합니다, 테마를 내보내기 할 때도 이 옵션에 따라 저장합니다. 아무 것도 체크 되지 않았다면 모든 설정을 내보냅니다.",
	"reset": "초기화",
	"clear_all": "모두 지우기",
	"clear_opacity": "불투명도 지우기"
	},
	"common": {
	"color": "색상",
	"opacity": "불투명도",
	"contrast": {
	"hint": "대비율이 {ratio}입니다, 이것은 {context} {level}",
	"level": {
	"aa": "AA등급 가이드라인에 부합합니다 (최소한도)",
	"aaa": "AAA등급 가이드라인에 부합합니다 (권장)",
	"bad": "아무런 가이드라인 등급에도 미치지 못합니다"
	},
	"context": {
	"18pt": "큰 (18pt 이상) 텍스트에 대해",
	"text": "텍스트에 대해"
	}
	}
	},
	"common_colors": {
	"_tab_label": "일반",
	"main": "일반 색상",
	"foreground_hint": "\"고급\" 탭에서 더 자세한 설정이 가능합니다",
	"rgbo": "아이콘, 강조, 배지"
	},
	"advanced_colors": {
	"_tab_label": "고급",
	"alert": "주의 배경",
	"alert_error": "에러",
	"badge": "배지 배경",
	"badge_notification": "알림",
	"panel_header": "패널 헤더",
	"top_bar": "상단 바",
	"borders": "테두리",
	"buttons": "버튼",
	"inputs": "입력칸",
	"faint_text": "흐려진 텍스트"
	},
	"radii": {
	"_tab_label": "둥글기"
	},
	"shadows": {
	"_tab_label": "그림자와 빛",
	"component": "컴포넌트",
	"override": "덮어쓰기",
	"shadow_id": "그림자 #{value}",
	"blur": "흐리기",
	"spread": "퍼지기",
	"inset": "안쪽으로",
	"hint": "그림자에는 CSS3 변수를 --variable을 통해 색상 값으로 사용할 수 있습니다. 불투명도에는 적용 되지 않습니다.",
	"filter_hint": {
	"always_drop_shadow": "경고, 이 그림자는 브라우저가 지원하는 경우 항상 {0}을 사용합니다.",
	"drop_shadow_syntax": "{0}는 {1} 파라미터와 {2} 키워드를 지원하지 않습니다.",
	"avatar_inset": "안쪽과 안쪽이 아닌 그림자를 모두 설정하는 경우 투명 아바타에서 예상치 못 한 결과가 나올 수 있다는 것에 주의해 주세요.",
	"spread_zero": "퍼지기가 0보다 큰 그림자는 0으로 설정한 것과 동일하게 보여집니다",
	"inset_classic": "안쪽 그림자는 {0}를 사용합니다"
	},
	"components": {
	"panel": "패널",
	"panelHeader": "패널 헤더",
	"topBar": "상단 바",
	"avatar": "사용자 아바타 (프로필 뷰에서)",
	"avatarStatus": "사용자 아바타 (게시물에서)",
	"popup": "팝업과 툴팁",
	"button": "버튼",
	"buttonHover": "버튼 (마우스 올렸을 때)",
	"buttonPressed": "버튼 (눌렸을 때)",
	"buttonPressedHover": "Button (마우스 올림 + 눌림)",
	"input": "입력칸"
	}
	},
	"fonts": {
	"_tab_label": "글자체",
	"help": "인터페이스의 요소에 사용 될 글자체를 고르세요. \"커스텀\"은 시스템에 있는 폰트 이름을 정확히 입력해야 합니다.",
	"components": {
	"interface": "인터페이스",
	"input": "입력칸",
	"post": "게시물 텍스트",
	"postCode": "게시물의 고정폭 텍스트 (서식 있는 텍스트)"
	},
	"family": "글자체 이름",
	"size": "크기 (px 단위)",
	"weight": "굵기",
	"custom": "커스텀"
	},
	"preview": {
	"header": "미리보기",
	"content": "내용",
	"error": "에러 예시",
	"button": "버튼",
	"text": "더 많은 {0} 그리고 {1}",
	"mono": "내용",
	"input": "LA에 막 도착!",
	"faint_link": "도움 되는 설명서",
	"fine_print": "우리의 {0} 를 읽고 도움 되지 않는 것들을 배우자!",
	"header_faint": "이건 괜찮아",
	"checkbox": "나는 약관을 대충 훑어보았습니다",
	"link": "작고 귀여운 링크"
	}
	}
	},
	"timeline": {
	"collapse": "접기",
	"conversation": "대화",
	"error_fetching": "업데이트 불러오기 실패",
	"load_older": "더 오래 된 게시물 불러오기",
	"no_retweet_hint": "팔로워 전용, 다이렉트 메시지는 반복할 수 없습니다",
	"repeated": "반복 됨",
	"show_new": "새로운 것 보기",
	"up_to_date": "최신 상태"
	},
	"user_card": {
	"approve": "승인",
	"block": "차단",
	"blocked": "차단 됨!",
	"deny": "거부",
	"follow": "팔로우",
	"follow_sent": "요청 보내짐!",
	"follow_progress": "요청 중…",
	"follow_again": "요청을 다시 보낼까요?",
	"follow_unfollow": "팔로우 중지",
	"followees": "팔로우 중",
	"followers": "팔로워",
	"following": "팔로우 중!",
	"follows_you": "당신을 팔로우 합니다!",
	"its_you": "당신입니다!",
	"mute": "침묵",
	"muted": "침묵 됨",
	"per_day": " / 하루",
	"remote_follow": "원격 팔로우",
	"statuses": "게시물"
	},
	"user_profile": {
	"timeline_title": "사용자 타임라인"
	},
	"who_to_follow": {
	"more": "더 보기",
	"who_to_follow": "팔로우 추천"
	},
	"tool_tip": {
	"media_upload": "미디어 업로드",
	"repeat": "반복",
	"reply": "답글",
	"favorite": "즐겨찾기",
	"user_settings": "사용자 설정"
	},
	"upload":{
	"error": {
	"base": "업로드 실패.",
	"file_too_big": "파일이 너무 커요 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "잠시 후에 다시 시도해 보세요"
	},
	"file_size_units": {
	"B": "바이트",
	"KiB": "키비바이트",
	"MiB": "메비바이트",
	"GiB": "기비바이트",
	"TiB": "테비바이트"
	}
	}
	}
	diff --git a/src/i18n/nb.json b/src/i18n/nb.json
	index 39e054f798..298dc0b967 100644
	--- a/src/i18n/nb.json
	+++ b/src/i18n/nb.json
	@@ -1,204 +1,204 @@
	{
	"chat": {
	"title": "Nettprat"
	},
	"features_panel": {
	"chat": "Nettprat",
	"gopher": "Gopher",
	"media_proxy": "Media proxy",
	"scope_options": "Velg mottakere",
	"text_limit": "Tekst-grense",
	"title": "Egenskaper",
	"who_to_follow": "Hvem å følge"
	},
	"finder": {
	"error_fetching_user": "Feil ved henting av bruker",
	"find_user": "Finn bruker"
	},
	"general": {
	"apply": "Bruk",
	"submit": "Send"
	},
	"login": {
	"login": "Logg inn",
	"logout": "Logg ut",
	"password": "Passord",
	"placeholder": "f. eks lain",
	"register": "Registrer",
	"username": "Brukernavn"
	},
	"nav": {
	"chat": "Lokal nettprat",
	"friend_requests": "Følgeforespørsler",
	"mentions": "Nevnt",
	"public_tl": "Offentlig Tidslinje",
	"timeline": "Tidslinje",
	"twkn": "Det hele kjente nettverket"
	},
	"notifications": {
	"broken_favorite": "Ukjent status, leter etter den...",
	"favorited_you": "likte din status",
	"followed_you": "fulgte deg",
	"load_older": "Last eldre varsler",
	"notifications": "Varslinger",
	"read": "Les!",
	"repeated_you": "Gjentok din status"
	},
	"post_status": {
	"account_not_locked_warning": "Kontoen din er ikke {0}. Hvem som helst kan følge deg for å se dine statuser til følgere",
	"account_not_locked_warning_link": "låst",
	"attachments_sensitive": "Merk vedlegg som sensitive",
	"content_type": {
	- "plain_text": "Klar tekst"
	+ "text/plain": "Klar tekst"
	},
	"content_warning": "Tema (valgfritt)",
	"default": "Landet akkurat i L.A.",
	"direct_warning": "Denne statusen vil kun bli sett av nevnte brukere",
	"posting": "Publiserer",
	"scope": {
	"direct": "Direkte, publiser bare til nevnte brukere",
	"private": "Bare følgere, publiser bare til brukere som følger deg",
	"public": "Offentlig, publiser til offentlige tidslinjer",
	"unlisted": "Uoppført, ikke publiser til offentlige tidslinjer"
	}
	},
	"registration": {
	"bio": "Biografi",
	"email": "Epost-adresse",
	"fullname": "Visningsnavn",
	"password_confirm": "Bekreft passord",
	"registration": "Registrering",
	"token": "Invitasjons-bevis"
	},
	"settings": {
	"attachmentRadius": "Vedlegg",
	"attachments": "Vedlegg",
	"autoload": "Automatisk lasting når du blar ned til bunnen",
	"avatar": "Profilbilde",
	"avatarAltRadius": "Profilbilde (Varslinger)",
	"avatarRadius": "Profilbilde",
	"background": "Bakgrunn",
	"bio": "Biografi",
	"btnRadius": "Knapper",
	"cBlue": "Blå (Svar, følg)",
	"cGreen": "Grønn (Gjenta)",
	"cOrange": "Oransje (Lik)",
	"cRed": "Rød (Avbryt)",
	"change_password": "Endre passord",
	"change_password_error": "Feil ved endring av passord",
	"changed_password": "Passord endret",
	"collapse_subject": "Sammenfold statuser med tema",
	"confirm_new_password": "Bekreft nytt passord",
	"current_avatar": "Ditt nåværende profilbilde",
	"current_password": "Nåværende passord",
	"current_profile_banner": "Din nåværende profil-banner",
	"data_import_export_tab": "Data import / eksport",
	"default_vis": "Standard visnings-omfang",
	"delete_account": "Slett konto",
	"delete_account_description": "Slett din konto og alle dine statuser",
	"delete_account_error": "Det oppsto et problem ved sletting av kontoen din, hvis dette problemet forblir kontakt din administrator",
	"delete_account_instructions": "Skriv inn ditt passord i feltet nedenfor for å bekrefte sletting av konto",
	"export_theme": "Lagre tema",
	"filtering": "Filtrering",
	"filtering_explanation": "Alle statuser som inneholder disse ordene vil bli dempet, en kombinasjon av tegn per linje",
	"follow_export": "Eksporter følginger",
	"follow_export_button": "Eksporter følgingene dine til en .csv fil",
	"follow_export_processing": "Jobber, du vil snart bli spurt om å laste ned filen din.",
	"follow_import": "Importer følginger",
	"follow_import_error": "Feil ved importering av følginger.",
	"follows_imported": "Følginger importert! Behandling vil ta litt tid.",
	"foreground": "Forgrunn",
	"general": "Generell",
	"hide_attachments_in_convo": "Gjem vedlegg i samtaler",
	"hide_attachments_in_tl": "Gjem vedlegg på tidslinje",
	"import_followers_from_a_csv_file": "Importer følginger fra en csv fil",
	"import_theme": "Last tema",
	"inputRadius": "Input felt",
	"instance_default": "(standard: {value})",
	"interfaceLanguage": "Grensesnitt-språk",
	"invalid_theme_imported": "Den valgte filen er ikke ett støttet Pleroma-tema, ingen endringer til ditt tema ble gjort",
	"limited_availability": "Ikke tilgjengelig i din nettleser",
	"links": "Linker",
	"lock_account_description": "Begrens din konto til bare godkjente følgere",
	"loop_video": "Gjenta videoer",
	"loop_video_silent_only": "Gjenta bare videoer uten lyd, (for eksempel Mastodon sine \"gifs\")",
	"name": "Navn",
	"name_bio": "Navn & Biografi",
	"new_password": "Nytt passord",
	"notification_visibility": "Typer varsler som skal vises",
	"notification_visibility_follows": "Følginger",
	"notification_visibility_likes": "Likes",
	"notification_visibility_mentions": "Nevnt",
	"notification_visibility_repeats": "Gjentakelser",
	"no_rich_text_description": "Fjern all formatering fra statuser",
	"nsfw_clickthrough": "Krev trykk for å vise statuser som kan være upassende",
	"oauth_tokens": "OAuth Tokens",
	"token": "Pollett",
	"refresh_token": "Refresh Token",
	"valid_until": "Gyldig til",
	"revoke_token": "Tilbakekall",
	"panelRadius": "Panel",
	"pause_on_unfocused": "Stopp henting av poster når vinduet ikke er i fokus",
	"presets": "Forhåndsdefinerte tema",
	"profile_background": "Profil-bakgrunn",
	"profile_banner": "Profil-banner",
	"profile_tab": "Profil",
	"radii_help": "Bestem hvor runde hjørnene i brukergrensesnittet skal være (i piksler)",
	"replies_in_timeline": "Svar på tidslinje",
	"reply_link_preview": "Vis en forhåndsvisning når du holder musen over svar til en status",
	"reply_visibility_all": "Vis alle svar",
	"reply_visibility_following": "Vis bare svar som er til meg eller folk jeg følger",
	"reply_visibility_self": "Vis bare svar som er til meg",
	"saving_err": "Feil ved lagring av innstillinger",
	"saving_ok": "Innstillinger lagret",
	"security_tab": "Sikkerhet",
	"set_new_avatar": "Rediger profilbilde",
	"set_new_profile_background": "Rediger profil-bakgrunn",
	"set_new_profile_banner": "Sett ny profil-banner",
	"settings": "Innstillinger",
	"stop_gifs": "Spill av GIFs når du holder over dem",
	"streaming": "Automatisk strømming av nye statuser når du har bladd til toppen",
	"text": "Tekst",
	"theme": "Tema",
	"theme_help": "Bruk heksadesimale fargekoder (#rrggbb) til å endre farge-temaet ditt.",
	"tooltipRadius": "Verktøytips/advarsler",
	"user_settings": "Brukerinstillinger",
	"values": {
	"false": "nei",
	"true": "ja"
	}
	},
	"timeline": {
	"collapse": "Sammenfold",
	"conversation": "Samtale",
	"error_fetching": "Feil ved henting av oppdateringer",
	"load_older": "Last eldre statuser",
	"no_retweet_hint": "Status er markert som bare til følgere eller direkte og kan ikke gjentas",
	"repeated": "gjentok",
	"show_new": "Vis nye",
	"up_to_date": "Oppdatert"
	},
	"user_card": {
	"approve": "Godkjenn",
	"block": "Blokker",
	"blocked": "Blokkert!",
	"deny": "Avslå",
	"follow": "Følg",
	"followees": "Følger",
	"followers": "Følgere",
	"following": "Følger!",
	"follows_you": "Følger deg!",
	"mute": "Demp",
	"muted": "Dempet",
	"per_day": "per dag",
	"remote_follow": "Følg eksternt",
	"statuses": "Statuser"
	},
	"user_profile": {
	"timeline_title": "Bruker-tidslinje"
	},
	"who_to_follow": {
	"more": "Mer",
	"who_to_follow": "Hvem å følge"
	}
	}
	diff --git a/src/i18n/nl.json b/src/i18n/nl.json
	index 799e22b917..7e2f060446 100644
	--- a/src/i18n/nl.json
	+++ b/src/i18n/nl.json
	@@ -1,377 +1,377 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media proxy",
	"scope_options": "Zichtbaarheidsopties",
	"text_limit": "Tekst limiet",
	"title": "Features",
	"who_to_follow": "Wie te volgen"
	},
	"finder": {
	"error_fetching_user": "Fout tijdens ophalen gebruiker",
	"find_user": "Gebruiker zoeken"
	},
	"general": {
	"apply": "toepassen",
	"submit": "Verzend"
	},
	"login": {
	"login": "Log in",
	"description": "Log in met OAuth",
	"logout": "Log uit",
	"password": "Wachtwoord",
	"placeholder": "bv. lain",
	"register": "Registreer",
	"username": "Gebruikersnaam"
	},
	"nav": {
	"about": "Over",
	"back": "Terug",
	"chat": "Locale Chat",
	"friend_requests": "Volgverzoek",
	"mentions": "Vermeldingen",
	"dms": "Directe Berichten",
	"public_tl": "Publieke Tijdlijn",
	"timeline": "Tijdlijn",
	"twkn": "Het Geheel Gekende Netwerk",
	"user_search": "Zoek Gebruiker",
	"who_to_follow": "Wie te volgen",
	"preferences": "Voorkeuren"
	},
	"notifications": {
	"broken_favorite": "Onbekende status, aan het zoeken...",
	"favorited_you": "vond je status leuk",
	"followed_you": "volgt jou",
	"load_older": "Laad oudere meldingen",
	"notifications": "Meldingen",
	"read": "Gelezen!",
	"repeated_you": "Herhaalde je status"
	},
	"post_status": {
	"new_status": "Post nieuwe status",
	"account_not_locked_warning": "Je account is niet {0}. Iedereen die je volgt kan enkel-volgers posts lezen.",
	"account_not_locked_warning_link": "gesloten",
	"attachments_sensitive": "Markeer bijlage als gevoelig",
	"content_type": {
	- "plain_text": "Gewone tekst"
	+ "text/plain": "Gewone tekst"
	},
	"content_warning": "Onderwerp (optioneel)",
	"default": "Tijd voor een pauze!",
	"direct_warning": "Deze post zal enkel zichtbaar zijn voor de personen die genoemd zijn.",
	"posting": "Plaatsen",
	"scope": {
	"direct": "Direct - Post enkel naar genoemde gebruikers",
	"private": "Enkel volgers - Post enkel naar volgers",
	"public": "Publiek - Post op publieke tijdlijnen",
	"unlisted": "Unlisted - Toon niet op publieke tijdlijnen"
	}
	},
	"registration": {
	"bio": "Bio",
	"email": "Email",
	"fullname": "Weergave naam",
	"password_confirm": "Wachtwoord bevestiging",
	"registration": "Registratie",
	"token": "Uitnodigingstoken",
	"captcha": "CAPTCHA",
	"new_captcha": "Klik op de afbeelding voor een nieuwe captcha",
	"validations": {
	"username_required": "moet ingevuld zijn",
	"fullname_required": "moet ingevuld zijn",
	"email_required": "moet ingevuld zijn",
	"password_required": "moet ingevuld zijn",
	"password_confirmation_required": "moet ingevuld zijn",
	"password_confirmation_match": "komt niet overeen met het wachtwoord"
	}
	},
	"settings": {
	"attachmentRadius": "Bijlages",
	"attachments": "Bijlages",
	"autoload": "Automatisch laden wanneer tot de bodem gescrold inschakelen",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars (Meldingen)",
	"avatarRadius": "Avatars",
	"background": "Achtergrond",
	"bio": "Bio",
	"btnRadius": "Knoppen",
	"cBlue": "Blauw (Antwoord, volgen)",
	"cGreen": "Groen (Herhaal)",
	"cOrange": "Oranje (Vind ik leuk)",
	"cRed": "Rood (Annuleer)",
	"change_password": "Verander Wachtwoord",
	"change_password_error": "Er was een probleem bij het aanpassen van je wachtwoord.",
	"changed_password": "Wachtwoord succesvol aangepast!",
	"collapse_subject": "Klap posts met onderwerp in",
	"composing": "Samenstellen",
	"confirm_new_password": "Bevestig nieuw wachtwoord",
	"current_avatar": "Je huidige avatar",
	"current_password": "Huidig wachtwoord",
	"current_profile_banner": "Je huidige profiel banner",
	"data_import_export_tab": "Data Import / Export",
	"default_vis": "Standaard zichtbaarheidsscope",
	"delete_account": "Verwijder Account",
	"delete_account_description": "Verwijder je account en berichten permanent.",
	"delete_account_error": "Er was een probleem bij het verwijderen van je account. Indien dit probleem blijft, gelieve de administratie van deze instantie te verwittigen.",
	"delete_account_instructions": "Typ je wachtwoord in de input hieronder om het verwijderen van je account te bevestigen.",
	"export_theme": "Sla preset op",
	"filtering": "Filtering",
	"filtering_explanation": "Alle statussen die deze woorden bevatten worden genegeerd, één filter per lijn.",
	"follow_export": "Volgers export",
	"follow_export_button": "Exporteer je volgers naar een csv file",
	"follow_export_processing": "Aan het verwerken, binnen enkele ogenblikken wordt je gevraagd je bestand te downloaden",
	"follow_import": "Volgers import",
	"follow_import_error": "Fout bij importeren volgers",
	"follows_imported": "Volgers geïmporteerd! Het kan even duren om ze allemaal te verwerken.",
	"foreground": "Voorgrond",
	"general": "Algemeen",
	"hide_attachments_in_convo": "Verberg bijlages in conversaties",
	"hide_attachments_in_tl": "Verberg bijlages in de tijdlijn",
	"hide_isp": "Verberg instantie-specifiek paneel",
	"preload_images": "Afbeeldingen voorladen",
	"hide_post_stats": "Verberg post statistieken (bv. het aantal vind-ik-leuks)",
	"hide_user_stats": "Verberg post statistieken (bv. het aantal volgers)",
	"import_followers_from_a_csv_file": "Importeer volgers uit een csv file",
	"import_theme": "Laad preset",
	"inputRadius": "Invoer velden",
	"checkboxRadius": "Checkboxen",
	"instance_default": "(standaard: {value})",
	"instance_default_simple": "(standaard)",
	"interface": "Interface",
	"interfaceLanguage": "Interface taal",
	"invalid_theme_imported": "Het geselecteerde thema is geen door Pleroma ondersteund thema. Er zijn geen aanpassingen gedaan.",
	"limited_availability": "Onbeschikbaar in je browser",
	"links": "Links",
	"lock_account_description": "Laat volgers enkel toe na expliciete toestemming",
	"loop_video": "Speel videos af in een lus",
	"loop_video_silent_only": "Speel enkel videos zonder geluid af in een lus (bv. Mastodon's \"gifs\")",
	"name": "Naam",
	"name_bio": "Naam & Bio",
	"new_password": "Nieuw wachtwoord",
	"notification_visibility": "Type meldingen die getoond worden",
	"notification_visibility_follows": "Volgers",
	"notification_visibility_likes": "Vind-ik-leuks",
	"notification_visibility_mentions": "Vermeldingen",
	"notification_visibility_repeats": "Herhalingen",
	"no_rich_text_description": "Strip rich text formattering van alle posts",
	"hide_network_description": "Toon niet wie mij volgt en wie ik volg.",
	"nsfw_clickthrough": "Schakel doorklikbaar verbergen van NSFW bijlages in",
	"oauth_tokens": "OAuth-tokens",
	"token": "Token",
	"refresh_token": "Token vernieuwen",
	"valid_until": "Geldig tot",
	"revoke_token": "Intrekken",
	"panelRadius": "Panelen",
	"pause_on_unfocused": "Pauzeer streamen wanneer de tab niet gefocused is",
	"presets": "Presets",
	"profile_background": "Profiel Achtergrond",
	"profile_banner": "Profiel Banner",
	"profile_tab": "Profiel",
	"radii_help": "Stel afronding van hoeken in de interface in (in pixels)",
	"replies_in_timeline": "Antwoorden in tijdlijn",
	"reply_link_preview": "Schakel antwoordlink preview in bij over zweven met muisaanwijzer",
	"reply_visibility_all": "Toon alle antwoorden",
	"reply_visibility_following": "Toon enkel antwoorden naar mij of andere gebruikers gericht",
	"reply_visibility_self": "Toon enkel antwoorden naar mij gericht",
	"saving_err": "Fout tijdens opslaan van instellingen",
	"saving_ok": "Instellingen opgeslagen",
	"security_tab": "Veiligheid",
	"scope_copy": "Neem scope over bij antwoorden (Directe Berichten blijven altijd Direct)",
	"set_new_avatar": "Zet nieuwe avatar",
	"set_new_profile_background": "Zet nieuwe profiel achtergrond",
	"set_new_profile_banner": "Zet nieuwe profiel banner",
	"settings": "Instellingen",
	"subject_input_always_show": "Maak onderwerpveld altijd zichtbaar",
	"subject_line_behavior": "Kopieer onderwerp bij antwoorden",
	"subject_line_email": "Zoals email: \"re: onderwerp\"",
	"subject_line_mastodon": "Zoals Mastodon: kopieer zoals het is",
	"subject_line_noop": "Kopieer niet",
	"stop_gifs": "Speel GIFs af bij zweven",
	"streaming": "Schakel automatisch streamen van posts in wanneer tot boven gescrold.",
	"text": "Tekst",
	"theme": "Thema",
	"theme_help": "Gebruik hex color codes (#rrggbb) om je kleurschema te wijzigen.",
	"theme_help_v2_1": "Je kan ook de kleur en transparantie van bepaalde componenten overschrijven door de checkbox aan te vinken, gebruik de \"Wis alles\" knop om alle overschrijvingen te annuleren.",
	"theme_help_v2_2": "Iconen onder sommige items zijn achtergrond/tekst contrast indicators, zweef er over voor gedetailleerde info. Hou er rekening mee dat bij doorzichtigheid de ergst mogelijke situatie wordt weer gegeven.",
	"tooltipRadius": "Gereedschapstips/alarmen",
	"user_settings": "Gebruikers Instellingen",
	"values": {
	"false": "nee",
	"true": "ja"
	},
	"notifications": "Meldingen",
	"enable_web_push_notifications": "Schakel web push meldingen in",
	"style": {
	"switcher": {
	"keep_color": "Behoud kleuren",
	"keep_shadows": "Behoud schaduwen",
	"keep_opacity": "Behoud transparantie",
	"keep_roundness": "Behoud afrondingen",
	"keep_fonts": "Behoud lettertypes",
	"save_load_hint": "\"Behoud\" opties behouden de momenteel ingestelde opties bij het selecteren of laden van thema's, maar slaan ook de genoemde opties op bij het exporteren van een thema. Wanneer alle selectievakjes zijn uitgeschakeld, zal het exporteren van thema's alles opslaan.",
	"reset": "Reset",
	"clear_all": "Wis alles",
	"clear_opacity": "Wis transparantie"
	},
	"common": {
	"color": "Kleur",
	"opacity": "Transparantie",
	"contrast": {
	"hint": "Contrast ratio is {ratio}, {level} {context}",
	"level": {
	"aa": "voldoet aan de richtlijn van niveau AA (minimum)",
	"aaa": "voldoet aan de richtlijn van niveau AAA (aangeraden)",
	"bad": "voldoet aan geen enkele toegankelijkheidsrichtlijn"
	},
	"context": {
	"18pt": "voor grote (18pt+) tekst",
	"text": "voor tekst"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Gemeenschappelijk",
	"main": "Gemeenschappelijke kleuren",
	"foreground_hint": "Zie \"Geavanceerd\" tab voor meer gedetailleerde controle",
	"rgbo": "Iconen, accenten, badges"
	},
	"advanced_colors": {
	"_tab_label": "Geavanceerd",
	"alert": "Alarm achtergrond",
	"alert_error": "Fout",
	"badge": "Badge achtergrond",
	"badge_notification": "Meldingen",
	"panel_header": "Paneel hoofding",
	"top_bar": "Top bar",
	"borders": "Randen",
	"buttons": "Knoppen",
	"inputs": "Invoervelden",
	"faint_text": "Vervaagde tekst"
	},
	"radii": {
	"_tab_label": "Rondheid"
	},
	"shadows": {
	"_tab_label": "Schaduw en belichting",
	"component": "Component",
	"override": "Overschrijven",
	"shadow_id": "Schaduw #{value}",
	"blur": "Vervagen",
	"spread": "Spreid",
	"inset": "Inzet",
	"hint": "Voor schaduw kan je ook --variable gebruiken als een kleur waarde om CSS3 variabelen te gebruiken. Houd er rekening mee dat het instellen van opaciteit in dit geval niet werkt.",
	"filter_hint": {
	"always_drop_shadow": "Waarschuwing, deze schaduw gebruikt altijd {0} als de browser dit ondersteund.",
	"drop_shadow_syntax": "{0} ondersteund niet de {1} parameter en {2} sleutelwoord.",
	"avatar_inset": "Houd er rekening mee dat het combineren van zowel inzet and niet-inzet schaduwen op transparante avatars onverwachte resultaten kan opleveren.",
	"spread_zero": "Schaduw met spreiding > 0 worden weergegeven alsof ze op nul staan",
	"inset_classic": "Inzet schaduw zal {0} gebruiken"
	},
	"components": {
	"panel": "Paneel",
	"panelHeader": "Paneel hoofding",
	"topBar": "Top bar",
	"avatar": "Gebruiker avatar (in profiel weergave)",
	"avatarStatus": "Gebruiker avatar (in post weergave)",
	"popup": "Popups en gereedschapstips",
	"button": "Knop",
	"buttonHover": "Knop (zweven)",
	"buttonPressed": "Knop (ingedrukt)",
	"buttonPressedHover": "Knop (ingedrukt+zweven)",
	"input": "Invoerveld"
	}
	},
	"fonts": {
	"_tab_label": "Lettertypes",
	"help": "Selecteer het lettertype om te gebruiken voor elementen van de UI.Voor \"aangepast\" moet je de exacte naam van het lettertype invoeren zoals die in het systeem wordt weergegeven.",
	"components": {
	"interface": "Interface",
	"input": "Invoervelden",
	"post": "Post tekst",
	"postCode": "Monospaced tekst in een post (rich text)"
	},
	"family": "Naam lettertype",
	"size": "Grootte (in px)",
	"weight": "Gewicht (vetheid)",
	"custom": "Aangepast"
	},
	"preview": {
	"header": "Voorvertoning",
	"content": "Inhoud",
	"error": "Voorbeeld fout",
	"button": "Knop",
	"text": "Nog een boel andere {0} en {1}",
	"mono": "inhoud",
	"input": "Tijd voor een pauze!",
	"faint_link": "handige gebruikershandleiding",
	"fine_print": "Lees onze {0} om niets nuttig te leren!",
	"header_faint": "Alles komt goed",
	"checkbox": "Ik heb de gebruikersvoorwaarden eens van ver bekeken",
	"link": "een link"
	}
	}
	},
	"timeline": {
	"collapse": "Inklappen",
	"conversation": "Conversatie",
	"error_fetching": "Fout bij ophalen van updates",
	"load_older": "Laad oudere Statussen",
	"no_retweet_hint": "Post is gemarkeerd als enkel volgers of direct en kan niet worden herhaald",
	"repeated": "herhaalde",
	"show_new": "Toon nieuwe",
	"up_to_date": "Up-to-date"
	},
	"user_card": {
	"approve": "Goedkeuren",
	"block": "Blokkeren",
	"blocked": "Geblokkeerd!",
	"deny": "Ontzeggen",
	"favorites": "Vind-ik-leuks",
	"follow": "Volgen",
	"follow_sent": "Aanvraag verzonden!",
	"follow_progress": "Aanvragen…",
	"follow_again": "Aanvraag opnieuw zenden?",
	"follow_unfollow": "Stop volgen",
	"followees": "Aan het volgen",
	"followers": "Volgers",
	"following": "Aan het volgen!",
	"follows_you": "Volgt jou!",
	"its_you": "'t is jij!",
	"mute": "Dempen",
	"muted": "Gedempt",
	"per_day": "per dag",
	"remote_follow": "Volg vanop afstand",
	"statuses": "Statussen"
	},
	"user_profile": {
	"timeline_title": "Gebruikers Tijdlijn"
	},
	"who_to_follow": {
	"more": "Meer",
	"who_to_follow": "Wie te volgen"
	},
	"tool_tip": {
	"media_upload": "Upload Media",
	"repeat": "Herhaal",
	"reply": "Antwoord",
	"favorite": "Vind-ik-leuk",
	"user_settings": "Gebruikers Instellingen"
	},
	"upload":{
	"error": {
	"base": "Upload gefaald.",
	"file_too_big": "Bestand is te groot [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Probeer later opnieuw"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/oc.json b/src/i18n/oc.json
	index fd5ccc97ef..ecc4df61dd 100644
	--- a/src/i18n/oc.json
	+++ b/src/i18n/oc.json
	@@ -1,312 +1,427 @@
	{
	"chat": {
	"title": "Messatjariá"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Servidor mandatari mèdia",
	"scope_options": "Nivèls de confidencialitat",
	"text_limit": "Limita de tèxte",
	"title": "Foncionalitats",
	"who_to_follow": "Qual seguir"
	},
	"finder": {
	"error_fetching_user": "Error pendent la cèrca d’un utilizaire",
	"find_user": "Cercar un utilizaire"
	},
	"general": {
	"apply": "Aplicar",
	"submit": "Mandar",
	"more": "Mai",
	"generic_error": "Una error s’es producha",
	"optional": "opcional"
	},
	"image_cropper": {
	"crop_picture": "Talhar l’imatge",
	"save": "Salvar",
	"cancel": "Anullar"
	},
	"login": {
	"login": "Connexion",
	"description": "Connexion via OAuth",
	"logout": "Desconnexion",
	"password": "Senhal",
	"placeholder": "e.g. lain",
	"register": "Se marcar",
	"username": "Nom d’utilizaire",
	"hint": "Connectatz-vos per participar a la discutida"
	},
	"media_modal": {
	"previous": "Precedent",
	"next": "Seguent"
	},
	"nav": {
	"about": "A prepaus",
	"back": "Tornar",
	"chat": "Chat local",
	"friend_requests": "Demandas de seguiment",
	"mentions": "Notificacions",
	"dms": "Messatges privats",
	"public_tl": "Estatuts locals",
	"timeline": "Flux d’actualitat",
	"twkn": "Lo malhum conegut",
	"user_search": "Cèrca d’utilizaires",
	"who_to_follow": "Qual seguir",
	"preferences": "Preferéncias"
	},
	"notifications": {
	"broken_favorite": "Estatut desconegut, sèm a lo cercar...",
	"favorited_you": "a aimat vòstre estatut",
	"followed_you": "vos a seguit",
	- "load_older": "Cargar las notificaciones mai ancianas",
	+ "load_older": "Cargar las notificacions mai ancianas",
	"notifications": "Notficacions",
	- "read": "Legit !",
	+ "read": "Legit !",
	"repeated_you": "a repetit vòstre estatut",
	"no_more_notifications": "Pas mai de notificacions"
	},
	"post_status": {
	"new_status": "Publicar d’estatuts novèls",
	- "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.",
	+ "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu’a vòstres seguidors.",
	"account_not_locked_warning_link": "clavat",
	"attachments_sensitive": "Marcar las pèças juntas coma sensiblas",
	"content_type": {
	- "plain_text": "Tèxte brut"
	+ "text/plain": "Tèxte brut",
	+ "text/html": "HTML",
	+ "text/markdown": "Markdown"
	},
	"content_warning": "Avís de contengut (opcional)",
	"default": "Escrivètz aquí vòstre estatut.",
	"direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.",
	"posting": "Mandadís",
	"scope": {
	"direct": "Dirècte - Publicar pels utilizaires mencionats solament",
	"private": "Seguidors solament - Publicar pels sols seguidors",
	"public": "Public - Publicar pel flux d’actualitat public",
	"unlisted": "Pas listat - Publicar pas pel flux public"
	}
	},
	"registration": {
	"bio": "Biografia",
	"email": "Adreça de corrièl",
	"fullname": "Nom complèt",
	"password_confirm": "Confirmar lo senhal",
	"registration": "Inscripcion",
	"token": "Geton de convidat",
	"captcha": "CAPTCHA",
	"new_captcha": "Clicatz l’imatge per obténer una nòva captcha",
	"username_placeholder": "e.g. lain",
	"fullname_placeholder": "e.g. Lain Iwakura",
	"bio_placeholder": "e.g.\nHi, Soi lo Lain\nSoi afocada d’animes e vivi al Japan. Benlèu que me coneissètz de the Wired.",
	"validations": {
	"username_required": "pòt pas èsser void",
	"fullname_required": "pòt pas èsser void",
	"email_required": "pòt pas èsser void",
	"password_required": "pòt pas èsser void",
	"password_confirmation_required": "pòt pas èsser void",
	"password_confirmation_match": "deu èsser lo meteis senhal"
	}
	},
	"settings": {
	"app_name": "Nom de l’aplicacion",
	"attachmentRadius": "Pèças juntas",
	"attachments": "Pèças juntas",
	"autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars (Notificacions)",
	"avatarRadius": "Avatars",
	"background": "Rèire plan",
	"bio": "Biografia",
	"blocks_tab": "Blocatges",
	"btnRadius": "Botons",
	"cBlue": "Blau (Respondre, seguir)",
	- "cGreen": "Verd (Repartajar)",
	+ "cGreen": "Verd (Repertir)",
	"cOrange": "Irange (Aimar)",
	"cRed": "Roge (Anullar)",
	"change_password": "Cambiar lo senhal",
	"change_password_error": "Una error s’es producha en cambiant lo senhal.",
	- "changed_password": "Senhal corrèctament cambiat !",
	+ "changed_password": "Senhal corrèctament cambiat !",
	"collapse_subject": "Replegar las publicacions amb de subjèctes",
	"composing": "Escritura",
	"confirm_new_password": "Confirmatz lo nòu senhal",
	"current_avatar": "Vòstre avatar actual",
	"current_password": "Senhal actual",
	"current_profile_banner": "Bandièra actuala del perfil",
	"data_import_export_tab": "Importar / Exportar las donadas",
	"default_vis": "Nivèl de visibilitat per defaut",
	"delete_account": "Suprimir lo compte",
	"delete_account_description": "Suprimir vòstre compte e los messatges per sempre.",
	- "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.",
	+ "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrator d’instància.",
	"delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.",
	"avatar_size_instruction": "La talha minimum recomandada pels imatges d’avatar es 150x150 pixèls.",
	"export_theme": "Enregistrar la preconfiguracion",
	"filtering": "Filtratge",
	"filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha",
	"follow_export": "Exportar los abonaments",
	"follow_export_button": "Exportar vòstres abonaments dins un fichièr csv",
	"follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr",
	"follow_import": "Importar los abonaments",
	"follow_import_error": "Error en important los seguidors",
	"follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.",
	"foreground": "Endavant",
	"general": "General",
	"hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions",
	"hide_attachments_in_tl": "Rescondre las pèças juntas",
	"max_thumbnails": "Nombre maximum de vinhetas per publicacion",
	"hide_isp": "Amagar lo panèl especial instància",
	"preload_images": "Precargar los imatges",
	"use_one_click_nsfw": "Dobrir las pèças juntas NSFW amb un clic",
	- "hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)",
	+ "hide_post_stats": "Amagar las estatisticas de publicacion (ex. lo nombre de favorits)",
	"hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)",
	"hide_filtered_statuses": "Amagar los estatuts filtrats",
	"import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv",
	"import_theme": "Cargar un tèma",
	"inputRadius": "Camps tèxte",
	"checkboxRadius": "Casas de marcar",
	- "instance_default": "(defaut : {value})",
	+ "instance_default": "(defaut : {value})",
	"instance_default_simple": "(defaut)",
	"interface": "Interfàcia",
	"interfaceLanguage": "Lenga de l’interfàcia",
	"invalid_theme_imported": "Lo fichièr seleccionat es pas un tèma Pleroma valid. Cap de cambiament es estat fach a vòstre tèma.",
	"limited_availability": "Pas disponible per vòstre navigador",
	"links": "Ligams",
	"lock_account_description": "Limitar vòstre compte als seguidors acceptats solament",
	"loop_video": "Bocla vidèo",
	"loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)",
	"mutes_tab": "Agamats",
	- "play_videos_in_modal": "Legir las vidèoas dirèctament dins la visualizaira mèdia",
	+ "play_videos_in_modal": "Legir las vidèos dirèctament dins la visualizaira mèdia",
	"use_contain_fit": "Talhar pas las pèças juntas per las vinhetas",
	"name": "Nom",
	"name_bio": "Nom & Bio",
	"new_password": "Nòu senhal",
	"notification_visibility_follows": "Abonaments",
	"notification_visibility_likes": "Aimar",
	"notification_visibility_mentions": "Mencions",
	"notification_visibility_repeats": "Repeticions",
	"notification_visibility": "Tipes de notificacion de mostrar",
	"no_rich_text_description": "Netejar lo format tèxte de totas las publicacions",
	"no_blocks": "Cap de blocatge",
	"no_mutes": "Cap d’amagat",
	"hide_follows_description": "Mostrar pas qual seguissi",
	"hide_followers_description": "Mostrar pas qual me seguisson",
	"show_admin_badge": "Mostrar lo badge Admin badge al perfil meu",
	"show_moderator_badge": "Mostrar lo badge Moderator al perfil meu",
	"nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles",
	"oauth_tokens": "Listats OAuth",
	"token": "Geton",
	"refresh_token": "Actualizar lo geton",
	"valid_until": "Valid fins a",
	"revoke_token": "Revocar",
	"panelRadius": "Panèls",
	"pause_on_unfocused": "Pausar la difusion quand l’onglet es pas seleccionat",
	"presets": "Pre-enregistrats",
	"profile_background": "Imatge de fons",
	"profile_banner": "Bandièra del perfil",
	"profile_tab": "Perfil",
	"radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)",
	"replies_in_timeline": "Responsas del flux",
	"reply_link_preview": "Activar l’apercebut en passar la mirga",
	"reply_visibility_all": "Mostrar totas las responsas",
	"reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi",
	"reply_visibility_self": "Mostrar pas que las responsas que me son destinadas",
	"saving_err": "Error en enregistrant los paramètres",
	"saving_ok": "Paramètres enregistrats",
	"scope_copy": "Copiar lo nivèl de confidencialitat per las responsas (Totjorn aissí pels Messatges Dirèctes)",
	"security_tab": "Seguretat",
	"set_new_avatar": "Definir un nòu avatar",
	"set_new_profile_background": "Definir un nòu fons de perfil",
	"set_new_profile_banner": "Definir una nòva bandièra de perfil",
	"settings": "Paramètres",
	"subject_input_always_show": "Totjorn mostrar lo camp de subjècte",
	"subject_line_behavior": "Copiar lo subjècte per las responsas",
	"subject_line_email": "Coma los corrièls : \"re: subjècte\"",
	"subject_line_mastodon": "Coma mastodon : copiar tal coma es",
	"subject_line_noop": "Copiar pas",
	"post_status_content_type": "Publicar lo tipe de contengut dels estatuts",
	"stop_gifs": "Lançar los GIFs al subrevòl",
	"streaming": "Activar lo cargament automatic dels novèls estatus en anar amont",
	- "text": "Tèxt",
	+ "text": "Tèxte",
	"theme": "Tèma",
	"theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
	"theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
	"theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.",
	"tooltipRadius": "Astúcias/alèrtas",
	"upload_a_photo": "Enviar una fotografia",
	"user_settings": "Paramètres utilizaire",
	"values": {
	"false": "non",
	"true": "òc"
	+ },
	+ "notifications": "Notificacions",
	+ "enable_web_push_notifications": "Activar las notificacions web push",
	+ "style": {
	+ "switcher": {
	+ "keep_color": "Gardar las colors",
	+ "keep_shadows": "Gardar las ombras",
	+ "keep_opacity": "Gardar l’opacitat",
	+ "keep_roundness": "Gardar la redondetat",
	+ "keep_fonts": "Gardar las polissas",
	+ "save_load_hint": "Las opcions « Gardar » permeton de servar las opcions configuradas actualament quand seleccionatz o cargatz un tèma, permeton tanben d’enregistrar aquelas opcions quand exportatz un tèma. Quand totas las casas son pas marcadas, l’exportacion de tèma o enregistrarà tot.",
	+ "reset": "Restablir",
	+ "clear_all": "O escafar tot",
	+ "clear_opacity": "Escafar l’opacitat"
	+ },
	+ "common": {
	+ "color": "Color",
	+ "opacity": "Opacitat",
	+ "contrast": {
	+ "hint": "Lo coeficient de contraste es de {ratio}. Dòna {level} {context}",
	+ "level": {
	+ "aa": "un nivèl AA minimum recomandat",
	+ "aaa": "un nivèl AAA recomandat",
	+ "bad": "pas un nivèl d’accessibilitat recomandat"
	+ },
	+ "context": {
	+ "18pt": "pel tèxte grand (18pt+)",
	+ "text": "pel tèxte"
	+ }
	+ }
	+ },
	+ "common_colors": {
	+ "_tab_label": "Comun",
	+ "main": "Colors comunas",
	+ "foreground_hint": "Vejatz « Avançat » per mai de paramètres detalhats",
	+ "rgbo": "Icònas, accents, badges"
	+ },
	+ "advanced_colors": {
	+ "_tab_label": "Avançat",
	+ "alert": "Rèire plan d’alèrtas",
	+ "alert_error": "Error",
	+ "badge": "Rèire plan dels badges",
	+ "badge_notification": "Notificacion",
	+ "panel_header": "Bandièra del tablèu de bòrd",
	+ "top_bar": "Barra amont",
	+ "borders": "Caires",
	+ "buttons": "Botons",
	+ "inputs": "Camps tèxte",
	+ "faint_text": "Tèxte descolorit"
	+ },
	+ "radii": {
	+ "_tab_label": "Redondetat"
	+ },
	+ "shadows": {
	+ "_tab_label": "Ombra e luminositat",
	+ "component": "Compausant",
	+ "override": "Subrecargar",
	+ "shadow_id": "Ombra #{value}",
	+ "blur": "Fosc",
	+ "spread": "Espandiment",
	+ "inset": "Incrustacion",
	+ "hint": "Per las ombras podètz tanben utilizar --variable coma valor de color per emplegar una variable CSS3. Notatz que lo paramètre d’opacitat foncionarà pas dins aquel cas.",
	+ "filter_hint": {
	+ "always_drop_shadow": "Avertiment, aquel ombra utiliza totjorn {0} quand lo navigator es compatible.",
	+ "drop_shadow_syntax": "{0} es pas compatible amb lo paramètre {1} e lo mot clau {2}.",
	+ "avatar_inset": "Notatz que combinar d’ombras incrustadas e pas incrustadas pòt donar de resultats inesperats amb los avatars transparents.",
	+ "spread_zero": "L’ombra amb un espandiment de > 0 apareisserà coma reglat a zèro",
	+ "inset_classic": "L’ombra d’incrustacion utilizarà {0}"
	+ },
	+ "components": {
	+ "panel": "Tablèu",
	+ "panelHeader": "Bandièra del tablèu",
	+ "topBar": "Barra amont",
	+ "avatar": "Utilizar l’avatar (vista perfil)",
	+ "avatarStatus": "Avatar de l’utilizaire (afichatge publicacion)",
	+ "popup": "Fenèstras sorgissentas e astúcias",
	+ "button": "Boton",
	+ "buttonHover": "Boton (en passar la mirga)",
	+ "buttonPressed": "Boton (en quichar)",
	+ "buttonPressedHover": "Boton (en quichar e passar)",
	+ "input": "Camp tèxte"
	+ }
	+ },
	+ "fonts": {
	+ "_tab_label": "Polissas",
	+ "help": "Selecionatz la polissa d’utilizar pels elements de l’UI. Per « Personalizada » vos cal picar lo nom exacte tal coma apareis sul sistèma.",
	+ "components": {
	+ "interface": "Interfàcia",
	+ "input": "Camps tèxte",
	+ "post": "Tèxte de publicacion",
	+ "postCode": "Tèxte Monospaced dins las publicacion (tèxte formatat)"
	+ },
	+ "family": "Nom de la polissa",
	+ "size": "Talha (en px)",
	+ "weight": "Largor (gras)",
	+ "custom": "Personalizada"
	+ },
	+ "preview": {
	+ "header": "Apercebut",
	+ "content": "Contengut",
	+ "error": "Error d’exemple",
	+ "button": "Boton",
	+ "text": "A tròç de mai de {0} e {1}",
	+ "mono": "contengut",
	+ "input": "arribada al país.",
	+ "faint_link": "manual d’ajuda",
	+ "fine_print": "Legissètz nòstre {0} per legir pas res d’util !",
	+ "header_faint": "Va plan",
	+ "checkbox": "Ai legit los tèrmes e condicions d’utilizacion",
	+ "link": "un pichon ligam simpatic"
	+ }
	}
	},
	"timeline": {
	"collapse": "Tampar",
	"conversation": "Conversacion",
	"error_fetching": "Error en cercant de mesas a jorn",
	"load_older": "Ne veire mai",
	+ "no_retweet_hint": "Las publicacions marcadas pels seguidors solament o dirèctas se pòdon pas repetir",
	"repeated": "repetit",
	"show_new": "Ne veire mai",
	"up_to_date": "A jorn",
	- "no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida"
	+ "no_more_statuses": "Pas mai d’estatuts",
	+ "no_statuses": "Cap d’estatuts"
	},
	"status": {
	- "reply_to": "Respondre à",
	+ "reply_to": "Respond a",
	"replies_list": "Responsas :"
	},
	"user_card": {
	"approve": "Validar",
	"block": "Blocar",
	- "blocked": "Blocat !",
	+ "blocked": "Blocat !",
	"deny": "Refusar",
	"favorites": "Favorits",
	"follow": "Seguir",
	"follow_sent": "Demanda enviada !",
	"follow_progress": "Demanda…",
	"follow_again": "Tornar enviar la demanda ?",
	"follow_unfollow": "Quitar de seguir",
	"followees": "Abonaments",
	"followers": "Seguidors",
	- "following": "Seguit !",
	- "follows_you": "Vos sèc !",
	+ "following": "Seguit !",
	+ "follows_you": "Vos sèc !",
	"its_you": "Sètz vos !",
	"media": "Mèdia",
	"mute": "Amagar",
	"muted": "Amagat",
	"per_day": "per jorn",
	"remote_follow": "Seguir a distància",
	"statuses": "Estatuts",
	"unblock": "Desblocar",
	"unblock_progress": "Desblocatge...",
	"block_progress": "Blocatge...",
	"unmute": "Tornar mostrar",
	"unmute_progress": "Afichatge...",
	"mute_progress": "A amagar..."
	},
	"user_profile": {
	"timeline_title": "Flux utilizaire",
	"profile_does_not_exist": "Aqueste perfil existís pas.",
	"profile_loading_error": "Una error s’es producha en cargant aqueste perfil."
	},
	"who_to_follow": {
	"more": "Mai",
	"who_to_follow": "Qual seguir"
	},
	"tool_tip": {
	"media_upload": "Enviar un mèdia",
	"repeat": "Repetir",
	"reply": "Respondre",
	"favorite": "aimar",
	"user_settings": "Paramètres utilizaire"
	},
	"upload":{
	"error": {
	"base": "Mandadís fracassat.",
	"file_too_big": "Fichièr tròp grand [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Tornatz ensajar mai tard"
	},
	"file_size_units": {
	"B": "o",
	"KiB": "Kio",
	"MiB": "Mio",
	"GiB": "Gio",
	"TiB": "Tio"
	}
	}
	}
	\ No newline at end of file
	diff --git a/src/i18n/pt.json b/src/i18n/pt.json
	index cbc2c9a353..41a3448380 100644
	--- a/src/i18n/pt.json
	+++ b/src/i18n/pt.json
	@@ -1,425 +1,425 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Proxy de mídia",
	"scope_options": "Opções de privacidade",
	"text_limit": "Limite de caracteres",
	"title": "Funções",
	"who_to_follow": "Quem seguir"
	},
	"finder": {
	"error_fetching_user": "Erro ao procurar usuário",
	"find_user": "Buscar usuário"
	},
	"general": {
	"apply": "Aplicar",
	"submit": "Enviar",
	"more": "Mais",
	"generic_error": "Houve um erro",
	"optional": "opcional"
	},
	"image_cropper": {
	"crop_picture": "Cortar imagem",
	"save": "Salvar",
	"cancel": "Cancelar"
	},
	"login": {
	"login": "Entrar",
	"description": "Entrar com OAuth",
	"logout": "Sair",
	"password": "Senha",
	"placeholder": "p.e. lain",
	"register": "Registrar",
	"username": "Usuário",
	"hint": "Entre para participar da discussão"
	},
	"media_modal": {
	"previous": "Anterior",
	"next": "Próximo"
	},
	"nav": {
	"about": "Sobre",
	"back": "Voltar",
	"chat": "Chat local",
	"friend_requests": "Solicitações de seguidores",
	"mentions": "Menções",
	"dms": "Mensagens diretas",
	"public_tl": "Linha do tempo pública",
	"timeline": "Linha do tempo",
	"twkn": "Toda a rede conhecida",
	- "user_search": "Busca de usuário",
	+ "user_search": "Buscar usuários",
	"who_to_follow": "Quem seguir",
	"preferences": "Preferências"
	},
	"notifications": {
	"broken_favorite": "Status desconhecido, buscando...",
	"favorited_you": "favoritou sua postagem",
	"followed_you": "seguiu você",
	"load_older": "Carregar notificações antigas",
	"notifications": "Notificações",
	"read": "Lido!",
	"repeated_you": "repetiu sua postagem",
	"no_more_notifications": "Mais nenhuma notificação"
	},
	"post_status": {
	"new_status": "Postar novo status",
	- "account_not_locked_warning": "Sua conta não está {0}. Qualquer pessoa pode te seguir para ver seus posts restritos.",
	- "account_not_locked_warning_link": "fechada",
	+ "account_not_locked_warning": "Sua conta não é {0}. Qualquer pessoa pode te seguir e ver seus posts privados (só para seguidores).",
	+ "account_not_locked_warning_link": "restrita",
	"attachments_sensitive": "Marcar anexos como sensíveis",
	"content_type": {
	- "plain_text": "Texto puro"
	+ "text/plain": "Texto puro"
	},
	"content_warning": "Assunto (opcional)",
	"default": "Acabei de chegar no Rio!",
	"direct_warning": "Este post será visível apenas para os usuários mencionados.",
	"posting": "Publicando",
	"scope": {
	"direct": "Direto - Enviar somente aos usuários mencionados",
	"private": "Apenas para seguidores - Enviar apenas para seguidores",
	"public": "Público - Enviar a linhas do tempo públicas",
	"unlisted": "Não listado - Não enviar a linhas do tempo públicas"
	}
	},
	"registration": {
	"bio": "Biografia",
	"email": "Correio eletrônico",
	"fullname": "Nome para exibição",
	"password_confirm": "Confirmação de senha",
	"registration": "Registro",
	"token": "Código do convite",
	"captcha": "CAPTCHA",
	"new_captcha": "Clique na imagem para carregar um novo captcha",
	"username_placeholder": "p. ex. lain",
	"fullname_placeholder": "p. ex. Lain Iwakura",
	"bio_placeholder": "e.g.\nOi, sou Lain\nSou uma garota que vive no subúrbio do Japão. Você deve me conhecer da Rede.",
	"validations": {
	"username_required": "não pode ser deixado em branco",
	"fullname_required": "não pode ser deixado em branco",
	"email_required": "não pode ser deixado em branco",
	"password_required": "não pode ser deixado em branco",
	"password_confirmation_required": "não pode ser deixado em branco",
	"password_confirmation_match": "deve ser idêntica à senha"
	}
	},
	"settings": {
	"app_name": "Nome do aplicativo",
	"attachmentRadius": "Anexos",
	"attachments": "Anexos",
	"autoload": "Habilitar carregamento automático quando a rolagem chegar ao fim.",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatares (Notificações)",
	"avatarRadius": "Avatares",
	"background": "Pano de Fundo",
	"bio": "Biografia",
	- "blocks_tab": "Blocos",
	+ "blocks_tab": "Bloqueios",
	"btnRadius": "Botões",
	"cBlue": "Azul (Responder, seguir)",
	"cGreen": "Verde (Repetir)",
	"cOrange": "Laranja (Favoritar)",
	"cRed": "Vermelho (Cancelar)",
	"change_password": "Mudar senha",
	"change_password_error": "Houve um erro ao modificar sua senha.",
	"changed_password": "Senha modificada com sucesso!",
	"collapse_subject": "Esconder posts com assunto",
	- "composing": "Escrevendo",
	+ "composing": "Escrita",
	"confirm_new_password": "Confirmar nova senha",
	"current_avatar": "Seu avatar atual",
	"current_password": "Sua senha atual",
	"current_profile_banner": "Sua capa de perfil atual",
	"data_import_export_tab": "Importação/exportação de dados",
	"default_vis": "Opção de privacidade padrão",
	"delete_account": "Deletar conta",
	"delete_account_description": "Deletar sua conta e mensagens permanentemente.",
	"delete_account_error": "Houve um problema ao deletar sua conta. Se ele persistir, por favor entre em contato com o/a administrador/a da instância.",
	"delete_account_instructions": "Digite sua senha no campo abaixo para confirmar a exclusão da conta.",
	"avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
	"export_theme": "Salvar predefinições",
	"filtering": "Filtragem",
	- "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas, uma por linha.",
	+ "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas; uma palavra por linha.",
	"follow_export": "Exportar quem você segue",
	"follow_export_button": "Exportar quem você segue para um arquivo CSV",
	"follow_export_processing": "Processando. Em breve você receberá a solicitação de download do arquivo",
	"follow_import": "Importar quem você segue",
	"follow_import_error": "Erro ao importar seguidores",
	"follows_imported": "Seguidores importados! O processamento pode demorar um pouco.",
	"foreground": "Primeiro Plano",
	"general": "Geral",
	"hide_attachments_in_convo": "Ocultar anexos em conversas",
	"hide_attachments_in_tl": "Ocultar anexos na linha do tempo.",
	"max_thumbnails": "Número máximo de miniaturas por post",
	"hide_isp": "Esconder painel específico da instância",
	"preload_images": "Pré-carregar imagens",
	"use_one_click_nsfw": "Abrir anexos sensíveis com um clique",
	"hide_post_stats": "Esconder estatísticas de posts (p. ex. número de favoritos)",
	"hide_user_stats": "Esconder estatísticas do usuário (p. ex. número de seguidores)",
	"hide_filtered_statuses": "Esconder posts filtrados",
	"import_followers_from_a_csv_file": "Importe seguidores a partir de um arquivo CSV",
	"import_theme": "Carregar pré-definição",
	"inputRadius": "Campos de entrada",
	"checkboxRadius": "Checkboxes",
	"instance_default": "(padrão: {value})",
	"instance_default_simple": "(padrão)",
	"interface": "Interface",
	"interfaceLanguage": "Idioma da interface",
	"invalid_theme_imported": "O arquivo selecionado não é um tema compatível com o Pleroma. Nenhuma mudança no tema foi feita.",
	"limited_availability": "Indisponível para seu navegador",
	"links": "Links",
	"lock_account_description": "Restringir sua conta a seguidores aprovados",
	"loop_video": "Repetir vídeos",
	"loop_video_silent_only": "Repetir apenas vídeos sem som (como os \"gifs\" do Mastodon)",
	"mutes_tab": "Silenciados",
	"play_videos_in_modal": "Tocar vídeos diretamente no visualizador de mídia",
	"use_contain_fit": "Não cortar o anexo na miniatura",
	"name": "Nome",
	"name_bio": "Nome & Biografia",
	"new_password": "Nova senha",
	"notification_visibility": "Tipos de notificação para mostrar",
	- "notification_visibility_follows": "Seguidos",
	+ "notification_visibility_follows": "Seguidas",
	"notification_visibility_likes": "Favoritos",
	"notification_visibility_mentions": "Menções",
	"notification_visibility_repeats": "Repetições",
	"no_rich_text_description": "Remover formatação de todos os posts",
	"no_blocks": "Sem bloqueios",
	"no_mutes": "Sem silenciados",
	"hide_follows_description": "Não mostrar quem estou seguindo",
	"hide_followers_description": "Não mostrar quem me segue",
	- "show_admin_badge": "Mostrar distintivo de Administrador em meu perfil",
	+ "show_admin_badge": "Mostrar título de Administrador em meu perfil",
	"show_moderator_badge": "Mostrar título de Moderador em meu perfil",
	"nsfw_clickthrough": "Habilitar clique para ocultar anexos sensíveis",
	"oauth_tokens": "Token OAuth",
	"token": "Token",
	"refresh_token": "Atualizar Token",
	"valid_until": "Válido até",
	"revoke_token": "Revogar",
	"panelRadius": "Paineis",
	"pause_on_unfocused": "Parar transmissão quando a aba não estiver em primeiro plano",
	"presets": "Predefinições",
	"profile_background": "Pano de fundo de perfil",
	"profile_banner": "Capa de perfil",
	"profile_tab": "Perfil",
	- "radii_help": "Arredondar arestas da interface (em píxeis)",
	+ "radii_help": "Arredondar arestas da interface (em pixel)",
	"replies_in_timeline": "Respostas na linha do tempo",
	- "reply_link_preview": "Habilitar a pré-visualização de link de respostas ao passar o mouse.",
	+ "reply_link_preview": "Habilitar a pré-visualização de de respostas ao passar o mouse.",
	"reply_visibility_all": "Mostrar todas as respostas",
	"reply_visibility_following": "Só mostrar respostas direcionadas a mim ou a usuários que sigo",
	"reply_visibility_self": "Só mostrar respostas direcionadas a mim",
	"saving_err": "Erro ao salvar configurações",
	"saving_ok": "Configurações salvas",
	"security_tab": "Segurança",
	"scope_copy": "Copiar opções de privacidade ao responder (Mensagens diretas sempre copiam)",
	"set_new_avatar": "Alterar avatar",
	- "set_new_profile_background": "Alterar o plano de fundo de perfil",
	+ "set_new_profile_background": "Alterar o pano de fundo de perfil",
	"set_new_profile_banner": "Alterar capa de perfil",
	"settings": "Configurações",
	"subject_input_always_show": "Sempre mostrar campo de assunto",
	"subject_line_behavior": "Copiar assunto ao responder",
	"subject_line_email": "Como em email: \"re: assunto\"",
	"subject_line_mastodon": "Como o Mastodon: copiar como está",
	"subject_line_noop": "Não copiar",
	- "post_status_content_type": "Postar tipo de conteúdo do status",
	- "stop_gifs": "Reproduzir GIFs ao passar o cursor em cima",
	- "streaming": "Habilitar o fluxo automático de postagens quando ao topo da página",
	+ "post_status_content_type": "Tipo de conteúdo do status",
	+ "stop_gifs": "Reproduzir GIFs ao passar o cursor",
	+ "streaming": "Habilitar o fluxo automático de postagens no topo da página",
	"text": "Texto",
	"theme": "Tema",
	"theme_help": "Use cores em código hexadecimal (#rrggbb) para personalizar seu esquema de cores.",
	"theme_help_v2_1": "Você também pode sobrescrever as cores e opacidade de alguns componentes ao modificar o checkbox, use \"Limpar todos\" para limpar todas as modificações.",
	"theme_help_v2_2": "Alguns ícones sob registros são indicadores de fundo/contraste de textos, passe por cima para informações detalhadas. Tenha ciência de que os indicadores de contraste não funcionam muito bem com transparência.",
	"tooltipRadius": "Dicas/alertas",
	"upload_a_photo": "Enviar uma foto",
	"user_settings": "Configurações de Usuário",
	"values": {
	"false": "não",
	"true": "sim"
	},
	- "notifications": "Notifications",
	+ "notifications": "Notificações",
	"enable_web_push_notifications": "Habilitar notificações web push",
	"style": {
	"switcher": {
	"keep_color": "Manter cores",
	"keep_shadows": "Manter sombras",
	"keep_opacity": "Manter opacidade",
	"keep_roundness": "Manter arredondado",
	"keep_fonts": "Manter fontes",
	"save_load_hint": "Manter as opções preserva as opções atuais ao selecionar ou carregar temas; também salva as opções ao exportar um tempo. Quanto todos os campos estiverem desmarcados, tudo será salvo ao exportar o tema.",
	- "reset": "Voltar ao padrão",
	+ "reset": "Restaurar o padrão",
	"clear_all": "Limpar tudo",
	"clear_opacity": "Limpar opacidade"
	},
	"common": {
	"color": "Cor",
	"opacity": "Opacidade",
	"contrast": {
	"hint": "A taxa de contraste é {ratio}, {level} {context}",
	"level": {
	"aa": "padrão Nível AA (mínimo)",
	"aaa": "padrão Nível AAA (recomendado)",
	"bad": "nenhum padrão de acessibilidade"
	},
	"context": {
	"18pt": "para textos longos (18pt+)",
	"text": "para texto"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Comum",
	"main": "Cores Comuns",
	"foreground_hint": "Configurações mais detalhadas na aba\"Avançado\"",
	"rgbo": "Ícones, acentuação, distintivos"
	},
	"advanced_colors": {
	"_tab_label": "Avançado",
	"alert": "Fundo de alerta",
	"alert_error": "Erro",
	"badge": "Fundo do distintivo",
	"badge_notification": "Notificação",
	"panel_header": "Topo do painel",
	"top_bar": "Barra do topo",
	"borders": "Bordas",
	"buttons": "Botões",
	"inputs": "Caixas de entrada",
	"faint_text": "Texto esmaecido"
	},
	"radii": {
	"_tab_label": "Arredondado"
	},
	"shadows": {
	"_tab_label": "Luz e sombra",
	"component": "Componente",
	"override": "Sobrescrever",
	"shadow_id": "Sombra #{value}",
	"blur": "Borrado",
	"spread": "Difusão",
	"inset": "Inserção",
	"hint": "Para as sombras você também pode usar --variável como valor de cor para utilizar variáveis do CSS3. Tenha em mente que configurar a opacidade não será possível neste caso.",
	"filter_hint": {
	"always_drop_shadow": "Atenção, esta sombra sempre utiliza {0} quando compatível com o navegador.",
	"drop_shadow_syntax": "{0} não é compatível com o parâmetro {1} e a palavra-chave {2}.",
	"avatar_inset": "Tenha em mente que combinar as sombras de inserção e a não-inserção em avatares pode causar resultados inesperados em avatares transparentes.",
	"spread_zero": "Sombras com uma difusão > 0 aparecerão como se fossem definidas como 0.",
	"inset_classic": "Sombras de inserção utilizarão {0}"
	},
	"components": {
	"panel": "Painel",
	"panelHeader": "Topo do painel",
	"topBar": "Barra do topo",
	"avatar": "Avatar do usuário (na visualização do perfil)",
	"avatarStatus": "Avatar do usuário (na exibição de posts)",
	"popup": "Dicas e notificações",
	"button": "Botão",
	"buttonHover": "Botão (em cima)",
	"buttonPressed": "Botão (pressionado)",
	"buttonPressedHover": "Botão (pressionado+em cima)",
	"input": "Campo de entrada"
	}
	},
	"fonts": {
	"_tab_label": "Fontes",
	- "help": "Selecionar fonte dos elementos da interface. Para fonte \"personalizada\" você deve entrar exatamente o nome da fonte no sistema.",
	+ "help": "Selecione as fontes dos elementos da interface. Para fonte \"personalizada\" você deve inserir o mesmo nome da fonte no sistema.",
	"components": {
	"interface": "Interface",
	"input": "Campo de entrada",
	"post": "Postar texto",
	"postCode": "Texto monoespaçado em post (formatação rica)"
	},
	"family": "Nome da fonte",
	"size": "Tamanho (em px)",
	"weight": "Peso",
	"custom": "Personalizada"
	},
	"preview": {
	"header": "Pré-visualizar",
	"content": "Conteúdo",
	"error": "Erro de exemplo",
	"button": "Botão",
	"text": "Vários {0} e {1}",
	"mono": "conteúdo",
	"input": "Acabei de chegar no Rio!",
	"faint_link": "manual útil",
	"fine_print": "Leia nosso {0} para não aprender nada!",
	"header_faint": "Está ok!",
	"checkbox": "Li os termos e condições",
	"link": "um belo link"
	}
	}
	},
	"timeline": {
	"collapse": "Esconder",
	"conversation": "Conversa",
	"error_fetching": "Erro ao buscar atualizações",
	"load_older": "Carregar postagens antigas",
	"no_retweet_hint": "Posts apenas para seguidores ou diretos não podem ser repetidos",
	"repeated": "Repetido",
	"show_new": "Mostrar novas",
	"up_to_date": "Atualizado",
	"no_more_statuses": "Sem mais posts",
	"no_statuses": "Sem posts"
	},
	"status": {
	"reply_to": "Responder a",
	"replies_list": "Respostas:"
	},
	"user_card": {
	"approve": "Aprovar",
	"block": "Bloquear",
	"blocked": "Bloqueado!",
	"deny": "Negar",
	"favorites": "Favoritos",
	"follow": "Seguir",
	"follow_sent": "Pedido enviado!",
	"follow_progress": "Enviando…",
	"follow_again": "Enviar solicitação novamente?",
	"follow_unfollow": "Deixar de seguir",
	"followees": "Seguindo",
	"followers": "Seguidores",
	"following": "Seguindo!",
	"follows_you": "Segue você!",
	"its_you": "É você!",
	"media": "Mídia",
	"mute": "Silenciar",
	"muted": "Silenciado",
	"per_day": "por dia",
	- "remote_follow": "Seguidor Remoto",
	+ "remote_follow": "Seguir remotamente",
	"statuses": "Postagens",
	"unblock": "Desbloquear",
	"unblock_progress": "Desbloqueando...",
	"block_progress": "Bloqueando...",
	"unmute": "Retirar silêncio",
	"unmute_progress": "Retirando silêncio...",
	"mute_progress": "Silenciando..."
	},
	"user_profile": {
	"timeline_title": "Linha do tempo do usuário",
	"profile_does_not_exist": "Desculpe, este perfil não existe.",
	"profile_loading_error": "Desculpe, houve um erro ao carregar este perfil."
	},
	"who_to_follow": {
	"more": "Mais",
	"who_to_follow": "Quem seguir"
	},
	"tool_tip": {
	"media_upload": "Envio de mídia",
	"repeat": "Repetir",
	"reply": "Responder",
	"favorite": "Favoritar",
	"user_settings": "Configurações do usuário"
	},
	"upload":{
	"error": {
	"base": "Falha no envio.",
	"file_too_big": "Arquivo grande demais [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Tente novamente mais tarde"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/zh.json b/src/i18n/zh.json
	index 089a98e2e3..da6dae5fdd 100644
	--- a/src/i18n/zh.json
	+++ b/src/i18n/zh.json
	@@ -1,206 +1,206 @@
	{
	"chat": {
	"title": "聊天"
	},
	"features_panel": {
	"chat": "聊天",
	"gopher": "Gopher",
	"media_proxy": "媒体代理",
	"scope_options": "可见范围设置",
	"text_limit": "文本长度限制",
	"title": "功能",
	"who_to_follow": "推荐关注"
	},
	"finder": {
	"error_fetching_user": "获取用户时发生错误",
	"find_user": "寻找用户"
	},
	"general": {
	"apply": "应用",
	"submit": "提交"
	},
	"login": {
	"login": "登录",
	"logout": "登出",
	"password": "密码",
	"placeholder": "例如：lain",
	"register": "注册",
	"username": "用户名"
	},
	"nav": {
	"chat": "本地聊天",
	"friend_requests": "关注请求",
	"mentions": "提及",
	"public_tl": "公共时间线",
	"timeline": "时间线",
	"twkn": "所有已知网络"
	},
	"notifications": {
	"broken_favorite": "未知的状态，正在搜索中...",
	"favorited_you": "收藏了你的状态",
	"followed_you": "关注了你",
	"load_older": "加载更早的通知",
	"notifications": "通知",
	"read": "阅读！",
	"repeated_you": "转发了你的状态"
	},
	"post_status": {
	"account_not_locked_warning": "你的帐号没有 {0}。任何人都可以关注你并浏览你的上锁内容。",
	"account_not_locked_warning_link": "上锁",
	"attachments_sensitive": "标记附件为敏感内容",
	"content_type": {
	- "plain_text": "纯文本"
	+ "text/plain": "纯文本"
	},
	"content_warning": "主题（可选）",
	"default": "刚刚抵达上海",
	"direct_warning": "本条内容只有被提及的用户能够看到。",
	"posting": "发送",
	"scope": {
	"direct": "私信 - 只发送给被提及的用户",
	"private": "仅关注者 - 只有关注了你的人能看到",
	"public": "公共 - 发送到公共时间轴",
	"unlisted": "不公开 - 所有人可见，但不会发送到公共时间轴"
	}
	},
	"registration": {
	"bio": "简介",
	"email": "电子邮箱",
	"fullname": "全名",
	"password_confirm": "确认密码",
	"registration": "注册",
	"token": "邀请码"
	},
	"settings": {
	"attachmentRadius": "附件",
	"attachments": "附件",
	"autoload": "启用滚动到底部时的自动加载",
	"avatar": "头像",
	"avatarAltRadius": "头像（通知）",
	"avatarRadius": "头像",
	"background": "背景",
	"bio": "简介",
	"btnRadius": "按钮",
	"cBlue": "蓝色（回复，关注）",
	"cGreen": "绿色（转发）",
	"cOrange": "橙色（收藏）",
	"cRed": "红色（取消）",
	"change_password": "修改密码",
	"change_password_error": "修改密码的时候出了点问题。",
	"changed_password": "成功修改了密码！",
	"collapse_subject": "折叠带主题的内容",
	"confirm_new_password": "确认新密码",
	"current_avatar": "当前头像",
	"current_password": "当前密码",
	"current_profile_banner": "您当前的横幅图片",
	"data_import_export_tab": "数据导入/导出",
	"default_vis": "默认可见范围",
	"delete_account": "删除账户",
	"delete_account_description": "永久删除你的帐号和所有消息。",
	"delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。",
	"delete_account_instructions": "在下面输入你的密码来确认删除账户",
	"export_theme": "导出预置主题",
	"filtering": "过滤器",
	"filtering_explanation": "所有包含以下词汇的内容都会被隐藏，一行一个",
	"follow_export": "导出关注",
	"follow_export_button": "将关注导出成 csv 文件",
	"follow_export_processing": "正在处理，过一会儿就可以下载你的文件了",
	"follow_import": "导入关注",
	"follow_import_error": "导入关注时错误",
	"follows_imported": "关注已导入！尚需要一些时间来处理。",
	"foreground": "前景",
	"general": "通用",
	"hide_attachments_in_convo": "在对话中隐藏附件",
	"hide_attachments_in_tl": "在时间线上隐藏附件",
	"hide_post_stats": "隐藏推文相关的统计数据(例如：收藏的次数)",
	"hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）",
	"import_followers_from_a_csv_file": "从 csv 文件中导入关注",
	"import_theme": "导入预置主题",
	"inputRadius": "输入框",
	"instance_default": "(默认：{value})",
	"interfaceLanguage": "界面语言",
	"invalid_theme_imported": "您所选择的主题文件不被 Pleroma 支持，因此主题未被修改。",
	"limited_availability": "在您的浏览器中无法使用",
	"links": "链接",
	"lock_account_description": "你需要手动审核关注请求",
	"loop_video": "循环视频",
	"loop_video_silent_only": "只循环没有声音的视频（例如：Mastodon 里的“GIF”）",
	"name": "名字",
	"name_bio": "名字及简介",
	"new_password": "新密码",
	"notification_visibility": "要显示的通知类型",
	"notification_visibility_follows": "关注",
	"notification_visibility_likes": "点赞",
	"notification_visibility_mentions": "提及",
	"notification_visibility_repeats": "转发",
	"no_rich_text_description": "不显示富文本格式",
	"nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开",
	"oauth_tokens": "OAuth令牌",
	"token": "代币",
	"refresh_token": "刷新令牌",
	"valid_until": "有效期至",
	"revoke_token": "撤消",
	"panelRadius": "面板",
	"pause_on_unfocused": "在离开页面时暂停时间线推送",
	"presets": "预置",
	"profile_background": "个人资料背景图",
	"profile_banner": "横幅图片",
	"profile_tab": "个人资料",
	"radii_help": "设置界面边缘的圆角 (单位：像素)",
	"replies_in_timeline": "时间线中的回复",
	"reply_link_preview": "启用鼠标悬停时预览回复链接",
	"reply_visibility_all": "显示所有回复",
	"reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复",
	"reply_visibility_self": "只显示发送给我的回复",
	"saving_err": "保存设置时发生错误",
	"saving_ok": "设置已保存",
	"security_tab": "安全",
	"set_new_avatar": "设置新头像",
	"set_new_profile_background": "设置新的个人资料背景",
	"set_new_profile_banner": "设置新的横幅图片",
	"settings": "设置",
	"stop_gifs": "鼠标悬停时播放GIF",
	"streaming": "开启滚动到顶部时的自动推送",
	"text": "文本",
	"theme": "主题",
	"theme_help": "使用十六进制代码（#rrggbb）来设置主题颜色。",
	"tooltipRadius": "提醒",
	"user_settings": "用户设置",
	"values": {
	"false": "否",
	"true": "是"
	}
	},
	"timeline": {
	"collapse": "折叠",
	"conversation": "对话",
	"error_fetching": "获取更新时发生错误",
	"load_older": "加载更早的状态",
	"no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发。",
	"repeated": "已转发",
	"show_new": "显示新内容",
	"up_to_date": "已是最新"
	},
	"user_card": {
	"approve": "允许",
	"block": "屏蔽",
	"blocked": "已屏蔽！",
	"deny": "拒绝",
	"follow": "关注",
	"followees": "正在关注",
	"followers": "关注者",
	"following": "正在关注！",
	"follows_you": "关注了你！",
	"mute": "隐藏",
	"muted": "已隐藏",
	"per_day": "每天",
	"remote_follow": "跨站关注",
	"statuses": "状态"
	},
	"user_profile": {
	"timeline_title": "用户时间线"
	},
	"who_to_follow": {
	"more": "更多",
	"who_to_follow": "推荐关注"
	}
	}
	diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
	index e828a74b49..7ab89c1235 100644
	--- a/src/lib/persisted_state.js
	+++ b/src/lib/persisted_state.js
	@@ -1,104 +1,92 @@
	import merge from 'lodash.merge'
	import objectPath from 'object-path'
	import localforage from 'localforage'
	import { each } from 'lodash'

	let loaded = false

	const defaultReducer = (state, paths) => (
	paths.length === 0 ? state : paths.reduce((substate, path) => {
	objectPath.set(substate, path, objectPath.get(state, path))
	return substate
	}, {})
	)

	const saveImmedeatelyActions = [
	'markNotificationsAsSeen',
	'clearCurrentUser',
	'setCurrentUser',
	'setHighlight',
	'setOption',
	'setClientData',
	'setToken'
	]

	const defaultStorage = (() => {
	return localforage
	})()

	export default function createPersistedState ({
	key = 'vuex-lz',
	paths = [],
	getState = (key, storage) => {
	let value = storage.getItem(key)
	return value
	},
	setState = (key, state, storage) => {
	if (!loaded) {
	console.log('waiting for old state to be loaded...')
	return Promise.resolve()
	} else {
	return storage.setItem(key, state)
	}
	},
	reducer = defaultReducer,
	storage = defaultStorage,
	subscriber = store => handler => store.subscribe(handler)
	} = {}) {
	return getState(key, storage).then((savedState) => {
	return store => {
	try {
	if (savedState !== null && typeof savedState === 'object') {
	// build user cache
	const usersState = savedState.users \|\| {}
	usersState.usersObject = {}
	const users = usersState.users \|\| []
	each(users, (user) => { usersState.usersObject[user.id] = user })
	savedState.users = usersState

	store.replaceState(
	merge({}, store.state, savedState)
	)
	}
	- if (store.state.config.customTheme) {
	- // This is a hack to deal with async loading of config.json and themes
	- // See: style_setter.js, setPreset()
	- window.themeLoaded = true
	- store.dispatch('setOption', {
	- name: 'customTheme',
	- value: store.state.config.customTheme
	- })
	- }
	- if (store.state.oauth.token) {
	- store.dispatch('loginUser', store.state.oauth.token)
	- }
	loaded = true
	} catch (e) {
	console.log("Couldn't load state")
	console.error(e)
	loaded = true
	}
	subscriber(store)((mutation, state) => {
	try {
	if (saveImmedeatelyActions.includes(mutation.type)) {
	setState(key, reducer(state, paths), storage)
	.then(success => {
	if (typeof success !== 'undefined') {
	if (mutation.type === 'setOption' \|\| mutation.type === 'setCurrentUser') {
	store.dispatch('settingsSaved', { success })
	}
	}
	}, error => {
	if (mutation.type === 'setOption' \|\| mutation.type === 'setCurrentUser') {
	store.dispatch('settingsSaved', { error })
	}
	})
	}
	} catch (e) {
	console.log("Couldn't persist state:")
	console.log(e)
	}
	})
	}
	})
	}
	diff --git a/src/main.js b/src/main.js
	index a3265e3a3a..9ffc37277c 100644
	--- a/src/main.js
	+++ b/src/main.js
	@@ -1,84 +1,85 @@
	import Vue from 'vue'
	import VueRouter from 'vue-router'
	import Vuex from 'vuex'

	import interfaceModule from './modules/interface.js'
	import instanceModule from './modules/instance.js'
	import statusesModule from './modules/statuses.js'
	import usersModule from './modules/users.js'
	import apiModule from './modules/api.js'
	import configModule from './modules/config.js'
	import chatModule from './modules/chat.js'
	import oauthModule from './modules/oauth.js'
	import mediaViewerModule from './modules/media_viewer.js'
	import oauthTokensModule from './modules/oauth_tokens.js'

	import VueTimeago from 'vue-timeago'
	import VueI18n from 'vue-i18n'

	import createPersistedState from './lib/persisted_state.js'
	import pushNotifications from './lib/push_notifications_plugin.js'

	import messages from './i18n/messages.js'

	import VueChatScroll from 'vue-chat-scroll'

	import afterStoreSetup from './boot/after_store.js'

	const currentLocale = (window.navigator.language \|\| 'en').split('-')[0]

	Vue.use(Vuex)
	Vue.use(VueRouter)
	Vue.use(VueTimeago, {
	locale: currentLocale === 'cs' ? 'cs' : currentLocale === 'ja' ? 'ja' : 'en',
	locales: {
	'cs': require('../static/timeago-cs.json'),
	'en': require('../static/timeago-en.json'),
	'ja': require('../static/timeago-ja.json')
	}
	})
	Vue.use(VueI18n)
	Vue.use(VueChatScroll)

	const i18n = new VueI18n({
	// By default, use the browser locale, we will update it if neccessary
	locale: currentLocale,
	fallbackLocale: 'en',
	messages
	})

	const persistedStateOptions = {
	paths: [
	'config',
	'users.lastLoginName',
	'oauth'
	]
	-}
	+};

	-createPersistedState(persistedStateOptions).then((persistedState) => {
	+(async () => {
	+ const persistedState = await createPersistedState(persistedStateOptions)
	const store = new Vuex.Store({
	modules: {
	interface: interfaceModule,
	instance: instanceModule,
	statuses: statusesModule,
	users: usersModule,
	api: apiModule,
	config: configModule,
	chat: chatModule,
	oauth: oauthModule,
	mediaViewer: mediaViewerModule,
	oauthTokens: oauthTokensModule
	},
	plugins: [persistedState, pushNotifications],
	strict: false // Socket modifies itself, let's ignore this for now.
	// strict: process.env.NODE_ENV !== 'production'
	})

	afterStoreSetup({ store, i18n })
	-})
	+})()

	// These are inlined by webpack's DefinePlugin
	/* eslint-disable */
	window.___pleromafe_mode = process.env
	window.___pleromafe_commit_hash = COMMIT_HASH
	window.___pleromafe_dev_overrides = DEV_OVERRIDES
	diff --git a/src/modules/instance.js b/src/modules/instance.js
	index 24c52f9c11..155aa2eb71 100644
	--- a/src/modules/instance.js
	+++ b/src/modules/instance.js
	@@ -1,79 +1,83 @@
	import { set } from 'vue'
	import { setPreset } from '../services/style_setter/style_setter.js'

	const defaultState = {
	// Stuff from static/config.json and apiConfig
	name: 'Pleroma FE',
	registrationOpen: true,
	textlimit: 5000,
	server: 'http://localhost:4040/',
	theme: 'pleroma-dark',
	background: '/static/aurora_borealis.jpg',
	logo: '/static/logo.png',
	logoMask: true,
	logoMargin: '.2em',
	redirectRootNoLogin: '/main/all',
	redirectRootLogin: '/main/friends',
	showInstanceSpecificPanel: false,
	scopeOptionsEnabled: true,
	formattingOptionsEnabled: false,
	alwaysShowSubjectInput: true,
	collapseMessageWithSubject: false,
	hidePostStats: false,
	hideUserStats: false,
	hideFilteredStatuses: false,
	disableChat: false,
	scopeCopy: true,
	subjectLineBehavior: 'email',
	postContentType: 'text/plain',
	loginMethod: 'password',
	nsfwCensorImage: undefined,
	vapidPublicKey: undefined,
	noAttachmentLinks: false,
	showFeaturesPanel: true,

	// Nasty stuff
	pleromaBackend: true,
	emoji: [],
	customEmoji: [],
	restrictedNicknames: [],
	postFormats: [],

	// Feature-set, apparently, not everything here is reported...
	mediaProxyAvailable: false,
	chatAvailable: false,
	gopherAvailable: false,
	suggestionsEnabled: false,
	suggestionsWeb: '',

	// Html stuff
	instanceSpecificPanelContent: '',
	- tos: ''
	+ tos: '',
	+
	+ // Version Information
	+ backendVersion: '',
	+ frontendVersion: ''
	}

	const instance = {
	state: defaultState,
	mutations: {
	setInstanceOption (state, { name, value }) {
	if (typeof value !== 'undefined') {
	set(state, name, value)
	}
	}
	},
	actions: {
	setInstanceOption ({ commit, dispatch }, { name, value }) {
	commit('setInstanceOption', {name, value})
	switch (name) {
	case 'name':
	dispatch('setPageTitle')
	break
	}
	},
	setTheme ({ commit }, themeName) {
	commit('setInstanceOption', { name: 'theme', value: themeName })
	return setPreset(themeName, commit)
	}
	}
	}

	export default instance
	diff --git a/src/modules/statuses.js b/src/modules/statuses.js
	index 6b512fa372..f14b87033e 100644
	--- a/src/modules/statuses.js
	+++ b/src/modules/statuses.js
	@@ -1,482 +1,484 @@
	-import { remove, slice, each, find, maxBy, minBy, merge, first, last, isArray } from 'lodash'
	+import { remove, slice, each, find, maxBy, minBy, merge, first, last, isArray, omitBy } from 'lodash'
	import apiService from '../services/api/api.service.js'
	// import parse from '../services/status_parser/status_parser.js'

	const emptyTl = (userId = 0) => ({
	statuses: [],
	statusesObject: {},
	faves: [],
	visibleStatuses: [],
	visibleStatusesObject: {},
	newStatusCount: 0,
	maxId: 0,
	minId: 0,
	minVisibleId: 0,
	loading: false,
	followers: [],
	friends: [],
	userId,
	flushMarker: 0
	})

	export const defaultState = () => ({
	allStatuses: [],
	allStatusesObject: {},
	maxId: 0,
	notifications: {
	desktopNotificationSilence: true,
	maxId: 0,
	minId: Number.POSITIVE_INFINITY,
	data: [],
	idStore: {},
	loading: false,
	error: false,
	fetcherId: null
	},
	favorites: new Set(),
	error: false,
	timelines: {
	mentions: emptyTl(),
	public: emptyTl(),
	user: emptyTl(),
	favorites: emptyTl(),
	media: emptyTl(),
	publicAndExternal: emptyTl(),
	friends: emptyTl(),
	tag: emptyTl(),
	dms: emptyTl()
	}
	})

	export const prepareStatus = (status) => {
	// Set deleted flag
	status.deleted = false

	// To make the array reactive
	status.attachments = status.attachments \|\| []

	return status
	}

	const visibleNotificationTypes = (rootState) => {
	return [
	rootState.config.notificationVisibility.likes && 'like',
	rootState.config.notificationVisibility.mentions && 'mention',
	rootState.config.notificationVisibility.repeats && 'repeat',
	rootState.config.notificationVisibility.follows && 'follow'
	].filter(_ => _)
	}

	const mergeOrAdd = (arr, obj, item) => {
	const oldItem = obj[item.id]

	if (oldItem) {
	// We already have this, so only merge the new info.
	- merge(oldItem, item)
	+ // We ignore null values to avoid overwriting existing properties with missing data
	+ // we also skip 'user' because that is handled by users module
	+ merge(oldItem, omitBy(item, (v, k) => v === null \|\| k === 'user'))
	// Reactivity fix.
	oldItem.attachments.splice(oldItem.attachments.length)
	return {item: oldItem, new: false}
	} else {
	// This is a new item, prepare it
	prepareStatus(item)
	arr.push(item)
	obj[item.id] = item
	return {item, new: true}
	}
	}

	const sortById = (a, b) => {
	const seqA = Number(a.id)
	const seqB = Number(b.id)
	const isSeqA = !Number.isNaN(seqA)
	const isSeqB = !Number.isNaN(seqB)
	if (isSeqA && isSeqB) {
	return seqA > seqB ? -1 : 1
	} else if (isSeqA && !isSeqB) {
	return 1
	} else if (!isSeqA && isSeqB) {
	return -1
	} else {
	return a.id > b.id ? -1 : 1
	}
	}

	const sortTimeline = (timeline) => {
	timeline.visibleStatuses = timeline.visibleStatuses.sort(sortById)
	timeline.statuses = timeline.statuses.sort(sortById)
	timeline.minVisibleId = (last(timeline.visibleStatuses) \|\| {}).id
	return timeline
	}

	const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {}, noIdUpdate = false, userId }) => {
	// Sanity check
	if (!isArray(statuses)) {
	return false
	}

	const allStatuses = state.allStatuses
	const allStatusesObject = state.allStatusesObject
	const timelineObject = state.timelines[timeline]

	const maxNew = statuses.length > 0 ? maxBy(statuses, 'id').id : 0
	const minNew = statuses.length > 0 ? minBy(statuses, 'id').id : 0
	const newer = timeline && maxNew > timelineObject.maxId && statuses.length > 0
	const older = timeline && (minNew < timelineObject.minId \|\| timelineObject.minId === 0) && statuses.length > 0

	if (!noIdUpdate && newer) {
	timelineObject.maxId = maxNew
	}
	if (!noIdUpdate && older) {
	timelineObject.minId = minNew
	}

	// This makes sure that user timeline won't get data meant for other
	// user. I.e. opening different user profiles makes request which could
	// return data late after user already viewing different user profile
	if ((timeline === 'user' \|\| timeline === 'media') && timelineObject.userId !== userId) {
	return
	}

	const addStatus = (data, showImmediately, addToTimeline = true) => {
	const result = mergeOrAdd(allStatuses, allStatusesObject, data)
	const status = result.item

	if (result.new) {
	// We are mentioned in a post
	if (status.type === 'status' && find(status.attentions, { id: user.id })) {
	const mentions = state.timelines.mentions

	// Add the mention to the mentions timeline
	if (timelineObject !== mentions) {
	mergeOrAdd(mentions.statuses, mentions.statusesObject, status)
	mentions.newStatusCount += 1

	sortTimeline(mentions)
	}
	}
	if (status.visibility === 'direct') {
	const dms = state.timelines.dms

	mergeOrAdd(dms.statuses, dms.statusesObject, status)
	dms.newStatusCount += 1

	sortTimeline(dms)
	}
	}

	// Decide if we should treat the status as new for this timeline.
	let resultForCurrentTimeline
	// Some statuses should only be added to the global status repository.
	if (timeline && addToTimeline) {
	resultForCurrentTimeline = mergeOrAdd(timelineObject.statuses, timelineObject.statusesObject, status)
	}

	if (timeline && showImmediately) {
	// Add it directly to the visibleStatuses, don't change
	// newStatusCount
	mergeOrAdd(timelineObject.visibleStatuses, timelineObject.visibleStatusesObject, status)
	} else if (timeline && addToTimeline && resultForCurrentTimeline.new) {
	// Just change newStatuscount
	timelineObject.newStatusCount += 1
	}

	return status
	}

	const favoriteStatus = (favorite, counter) => {
	const status = find(allStatuses, { id: favorite.in_reply_to_status_id })
	if (status) {
	// This is our favorite, so the relevant bit.
	if (favorite.user.id === user.id) {
	status.favorited = true
	} else {
	status.fave_num += 1
	}
	}
	return status
	}

	const processors = {
	'status': (status) => {
	addStatus(status, showImmediately)
	},
	'retweet': (status) => {
	// RetweetedStatuses are never shown immediately
	const retweetedStatus = addStatus(status.retweeted_status, false, false)

	let retweet
	// If the retweeted status is already there, don't add the retweet
	// to the timeline.
	if (timeline && find(timelineObject.statuses, (s) => {
	if (s.retweeted_status) {
	return s.id === retweetedStatus.id \|\| s.retweeted_status.id === retweetedStatus.id
	} else {
	return s.id === retweetedStatus.id
	}
	})) {
	// Already have it visible (either as the original or another RT), don't add to timeline, don't show.
	retweet = addStatus(status, false, false)
	} else {
	retweet = addStatus(status, showImmediately)
	}

	retweet.retweeted_status = retweetedStatus
	},
	'favorite': (favorite) => {
	// Only update if this is a new favorite.
	// Ignore our own favorites because we get info about likes as response to like request
	if (!state.favorites.has(favorite.id)) {
	state.favorites.add(favorite.id)
	favoriteStatus(favorite)
	}
	},
	'deletion': (deletion) => {
	const uri = deletion.uri

	// Remove possible notification
	const status = find(allStatuses, {uri})
	if (!status) {
	return
	}

	remove(state.notifications.data, ({action: {id}}) => id === status.id)

	remove(allStatuses, { uri })
	if (timeline) {
	remove(timelineObject.statuses, { uri })
	remove(timelineObject.visibleStatuses, { uri })
	}
	},
	'follow': (follow) => {
	// NOOP, it is known status but we don't do anything about it for now
	},
	'default': (unknown) => {
	console.log('unknown status type')
	console.log(unknown)
	}
	}

	each(statuses, (status) => {
	const type = status.type
	const processor = processors[type] \|\| processors['default']
	processor(status)
	})

	// Keep the visible statuses sorted
	if (timeline) {
	sortTimeline(timelineObject)
	}
	}

	const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes }) => {
	const allStatuses = state.allStatuses
	const allStatusesObject = state.allStatusesObject
	each(notifications, (notification) => {
	notification.action = mergeOrAdd(allStatuses, allStatusesObject, notification.action).item
	notification.status = notification.status && mergeOrAdd(allStatuses, allStatusesObject, notification.status).item

	// Only add a new notification if we don't have one for the same action
	if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
	state.notifications.maxId = notification.id > state.notifications.maxId
	? notification.id
	: state.notifications.maxId
	state.notifications.minId = notification.id < state.notifications.minId
	? notification.id
	: state.notifications.minId

	state.notifications.data.push(notification)
	state.notifications.idStore[notification.id] = notification

	if ('Notification' in window && window.Notification.permission === 'granted') {
	const notifObj = {}
	const action = notification.action
	const title = action.user.name
	notifObj.icon = action.user.profile_image_url
	notifObj.body = action.text // there's a problem that it doesn't put a space before links tho

	// Shows first attached non-nsfw image, if any. Should add configuration for this somehow...
	if (action.attachments && action.attachments.length > 0 && !action.nsfw &&
	action.attachments[0].mimetype.startsWith('image/')) {
	notifObj.image = action.attachments[0].url
	}

	if (!notification.seen && !state.notifications.desktopNotificationSilence && visibleNotificationTypes.includes(notification.type)) {
	let notification = new window.Notification(title, notifObj)
	// Chrome is known for not closing notifications automatically
	// according to MDN, anyway.
	setTimeout(notification.close.bind(notification), 5000)
	}
	}
	} else if (notification.seen) {
	state.notifications.idStore[notification.id].seen = true
	}
	})
	}

	const removeStatus = (state, { timeline, userId }) => {
	const timelineObject = state.timelines[timeline]
	if (userId) {
	remove(timelineObject.statuses, { user: { id: userId } })
	remove(timelineObject.visibleStatuses, { user: { id: userId } })
	timelineObject.minVisibleId = timelineObject.visibleStatuses.length > 0 ? last(timelineObject.visibleStatuses).id : 0
	timelineObject.maxId = timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
	}
	}

	export const mutations = {
	addNewStatuses,
	addNewNotifications,
	removeStatus,
	showNewStatuses (state, { timeline }) {
	const oldTimeline = (state.timelines[timeline])

	oldTimeline.newStatusCount = 0
	oldTimeline.visibleStatuses = slice(oldTimeline.statuses, 0, 50)
	oldTimeline.minVisibleId = last(oldTimeline.visibleStatuses).id
	oldTimeline.minId = oldTimeline.minVisibleId
	oldTimeline.visibleStatusesObject = {}
	each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
	},
	setNotificationFetcher (state, { fetcherId }) {
	state.notifications.fetcherId = fetcherId
	},
	resetStatuses (state) {
	const emptyState = defaultState()
	Object.entries(emptyState).forEach(([key, value]) => {
	state[key] = value
	})
	},
	clearTimeline (state, { timeline }) {
	state.timelines[timeline] = emptyTl(state.timelines[timeline].userId)
	},
	setFavorited (state, { status, value }) {
	const newStatus = state.allStatusesObject[status.id]
	newStatus.favorited = value
	},
	setFavoritedConfirm (state, { status }) {
	const newStatus = state.allStatusesObject[status.id]
	newStatus.favorited = status.favorited
	newStatus.fave_num = status.fave_num
	},
	setRetweeted (state, { status, value }) {
	const newStatus = state.allStatusesObject[status.id]
	newStatus.repeated = value
	},
	setDeleted (state, { status }) {
	const newStatus = state.allStatusesObject[status.id]
	newStatus.deleted = true
	},
	setLoading (state, { timeline, value }) {
	state.timelines[timeline].loading = value
	},
	setNsfw (state, { id, nsfw }) {
	const newStatus = state.allStatusesObject[id]
	newStatus.nsfw = nsfw
	},
	setError (state, { value }) {
	state.error = value
	},
	setNotificationsLoading (state, { value }) {
	state.notifications.loading = value
	},
	setNotificationsError (state, { value }) {
	state.notifications.error = value
	},
	setNotificationsSilence (state, { value }) {
	state.notifications.desktopNotificationSilence = value
	},
	markNotificationsAsSeen (state) {
	each(state.notifications.data, (notification) => {
	notification.seen = true
	})
	},
	queueFlush (state, { timeline, id }) {
	state.timelines[timeline].flushMarker = id
	}
	}

	const statuses = {
	state: defaultState(),
	actions: {
	addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId }) {
	commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId })
	},
	addNewNotifications ({ rootState, commit, dispatch }, { notifications, older }) {
	commit('addNewNotifications', { visibleNotificationTypes: visibleNotificationTypes(rootState), dispatch, notifications, older })
	},
	setError ({ rootState, commit }, { value }) {
	commit('setError', { value })
	},
	setNotificationsLoading ({ rootState, commit }, { value }) {
	commit('setNotificationsLoading', { value })
	},
	setNotificationsError ({ rootState, commit }, { value }) {
	commit('setNotificationsError', { value })
	},
	setNotificationsSilence ({ rootState, commit }, { value }) {
	commit('setNotificationsSilence', { value })
	},
	stopFetchingNotifications ({ rootState, commit }) {
	if (rootState.statuses.notifications.fetcherId) {
	window.clearInterval(rootState.statuses.notifications.fetcherId)
	}
	commit('setNotificationFetcher', { fetcherId: null })
	},
	deleteStatus ({ rootState, commit }, status) {
	commit('setDeleted', { status })
	apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })
	},
	favorite ({ rootState, commit }, status) {
	// Optimistic favoriting...
	commit('setFavorited', { status, value: true })
	apiService.favorite({ id: status.id, credentials: rootState.users.currentUser.credentials })
	.then(response => {
	if (response.ok) {
	return response.json()
	} else {
	return {}
	}
	})
	.then(status => {
	commit('setFavoritedConfirm', { status })
	})
	},
	unfavorite ({ rootState, commit }, status) {
	// Optimistic favoriting...
	commit('setFavorited', { status, value: false })
	apiService.unfavorite({ id: status.id, credentials: rootState.users.currentUser.credentials })
	.then(response => {
	if (response.ok) {
	return response.json()
	} else {
	return {}
	}
	})
	.then(status => {
	commit('setFavoritedConfirm', { status })
	})
	},
	retweet ({ rootState, commit }, status) {
	// Optimistic retweeting...
	commit('setRetweeted', { status, value: true })
	apiService.retweet({ id: status.id, credentials: rootState.users.currentUser.credentials })
	},
	unretweet ({ rootState, commit }, status) {
	commit('setRetweeted', { status, value: false })
	apiService.unretweet({ id: status.id, credentials: rootState.users.currentUser.credentials })
	},
	queueFlush ({ rootState, commit }, { timeline, id }) {
	commit('queueFlush', { timeline, id })
	},
	markNotificationsAsSeen ({ rootState, commit }) {
	commit('markNotificationsAsSeen')
	apiService.markNotificationsAsSeen({
	id: rootState.statuses.notifications.maxId,
	credentials: rootState.users.currentUser.credentials
	})
	}
	},
	mutations
	}

	export default statuses
	diff --git a/src/modules/users.js b/src/modules/users.js
	index 26884750d5..1fe12fc825 100644
	--- a/src/modules/users.js
	+++ b/src/modules/users.js
	@@ -1,362 +1,382 @@
	import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
	import { compact, map, each, merge, find } from 'lodash'
	import { set } from 'vue'
	import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
	import oauthApi from '../services/new_api/oauth'
	import { humanizeErrors } from './errors'

	// TODO: Unify with mergeOrAdd in statuses.js
	export const mergeOrAdd = (arr, obj, item) => {
	if (!item) { return false }
	const oldItem = obj[item.id]
	if (oldItem) {
	// We already have this, so only merge the new info.
	merge(oldItem, item)
	return { item: oldItem, new: false }
	} else {
	// This is a new item, prepare it
	arr.push(item)
	obj[item.id] = item
	if (item.screen_name && !item.screen_name.includes('@')) {
	- obj[item.screen_name] = item
	+ obj[item.screen_name.toLowerCase()] = item
	}
	return { item, new: true }
	}
	}

	const getNotificationPermission = () => {
	const Notification = window.Notification

	if (!Notification) return Promise.resolve(null)
	if (Notification.permission === 'default') return Notification.requestPermission()
	return Promise.resolve(Notification.permission)
	}

	export const mutations = {
	setMuted (state, { user: { id }, muted }) {
	const user = state.usersObject[id]
	set(user, 'muted', muted)
	},
	setCurrentUser (state, user) {
	state.lastLoginName = user.screen_name
	state.currentUser = merge(state.currentUser \|\| {}, user)
	},
	clearCurrentUser (state) {
	state.currentUser = false
	state.lastLoginName = false
	},
	beginLogin (state) {
	state.loggingIn = true
	},
	endLogin (state) {
	state.loggingIn = false
	},
	// TODO Clean after ourselves?
	addFriends (state, { id, friends, page }) {
	const user = state.usersObject[id]
	each(friends, friend => {
	if (!find(user.friends, { id: friend.id })) {
	user.friends.push(friend)
	}
	})
	user.friendsPage = page + 1
	},
	addFollowers (state, { id, followers, page }) {
	const user = state.usersObject[id]
	each(followers, follower => {
	if (!find(user.followers, { id: follower.id })) {
	user.followers.push(follower)
	}
	})
	user.followersPage = page + 1
	},
	// Because frontend doesn't have a reason to keep these stuff in memory
	// outside of viewing someones user profile.
	clearFriends (state, userId) {
	const user = state.usersObject[userId]
	if (!user) {
	return
	}
	user.friends = []
	user.friendsPage = 0
	},
	clearFollowers (state, userId) {
	const user = state.usersObject[userId]
	if (!user) {
	return
	}
	user.followers = []
	user.followersPage = 0
	},
	addNewUsers (state, users) {
	each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
	},
	+ updateUserRelationship (state, relationships) {
	+ relationships.forEach((relationship) => {
	+ const user = state.usersObject[relationship.id]
	+ if (user) {
	+ user.follows_you = relationship.followed_by
	+ user.following = relationship.following
	+ user.muted = relationship.muting
	+ user.statusnet_blocking = relationship.blocking
	+ }
	+ })
	+ },
	saveBlocks (state, blockIds) {
	state.currentUser.blockIds = blockIds
	},
	saveMutes (state, muteIds) {
	state.currentUser.muteIds = muteIds
	},
	setUserForStatus (state, status) {
	status.user = state.usersObject[status.user.id]
	},
	setUserForNotification (state, notification) {
	notification.action.user = state.usersObject[notification.action.user.id]
	notification.from_profile = state.usersObject[notification.action.user.id]
	},
	setColor (state, { user: { id }, highlighted }) {
	const user = state.usersObject[id]
	set(user, 'highlight', highlighted)
	},
	signUpPending (state) {
	state.signUpPending = true
	state.signUpErrors = []
	},
	signUpSuccess (state) {
	state.signUpPending = false
	},
	signUpFailure (state, errors) {
	state.signUpPending = false
	state.signUpErrors = errors
	}
	}

	export const getters = {
	- userById: state => id =>
	- state.users.find(user => user.id === id),
	- userByName: state => name =>
	- state.users.find(user => user.screen_name &&
	- (user.screen_name.toLowerCase() === name.toLowerCase())
	- )
	+ findUser: state => query => {
	+ const result = state.usersObject[query]
	+ // In case it's a screen_name, we can try searching case-insensitive
	+ if (!result && typeof query === 'string') {
	+ return state.usersObject[query.toLowerCase()]
	+ }
	+ return result
	+ }
	}

	export const defaultState = {
	loggingIn: false,
	lastLoginName: false,
	currentUser: false,
	users: [],
	usersObject: {},
	signUpPending: false,
	signUpErrors: []
	}

	const users = {
	state: defaultState,
	mutations,
	getters,
	actions: {
	fetchUser (store, id) {
	return store.rootState.api.backendInteractor.fetchUser({ id })
	- .then((user) => store.commit('addNewUsers', [user]))
	+ .then((user) => {
	+ store.commit('addNewUsers', [user])
	+ return user
	+ })
	+ },
	+ fetchUserRelationship (store, id) {
	+ return store.rootState.api.backendInteractor.fetchUserRelationship({ id })
	+ .then((relationships) => store.commit('updateUserRelationship', relationships))
	},
	fetchBlocks (store) {
	return store.rootState.api.backendInteractor.fetchBlocks()
	.then((blocks) => {
	store.commit('saveBlocks', map(blocks, 'id'))
	store.commit('addNewUsers', blocks)
	return blocks
	})
	},
	blockUser (store, id) {
	return store.rootState.api.backendInteractor.blockUser(id)
	.then((user) => store.commit('addNewUsers', [user]))
	},
	unblockUser (store, id) {
	return store.rootState.api.backendInteractor.unblockUser(id)
	.then((user) => store.commit('addNewUsers', [user]))
	},
	fetchMutes (store) {
	return store.rootState.api.backendInteractor.fetchMutes()
	.then((mutedUsers) => {
	each(mutedUsers, (user) => { user.muted = true })
	store.commit('addNewUsers', mutedUsers)
	store.commit('saveMutes', map(mutedUsers, 'id'))
	})
	},
	muteUser (store, id) {
	return store.state.api.backendInteractor.setUserMute({ id, muted: true })
	.then((user) => store.commit('addNewUsers', [user]))
	},
	unmuteUser (store, id) {
	return store.state.api.backendInteractor.setUserMute({ id, muted: false })
	.then((user) => store.commit('addNewUsers', [user]))
	},
	addFriends ({ rootState, commit }, fetchBy) {
	return new Promise((resolve, reject) => {
	const user = rootState.users.usersObject[fetchBy]
	const page = user.friendsPage \|\| 1
	rootState.api.backendInteractor.fetchFriends({ id: user.id, page })
	.then((friends) => {
	commit('addFriends', { id: user.id, friends, page })
	resolve(friends)
	}).catch(() => {
	reject()
	})
	})
	},
	addFollowers ({ rootState, commit }, fetchBy) {
	const user = rootState.users.usersObject[fetchBy]
	const page = user.followersPage \|\| 1
	return rootState.api.backendInteractor.fetchFollowers({ id: user.id, page })
	.then((followers) => {
	commit('addFollowers', { id: user.id, followers, page })
	return followers
	})
	},
	clearFriends ({ commit }, userId) {
	commit('clearFriends', userId)
	},
	clearFollowers ({ commit }, userId) {
	commit('clearFollowers', userId)
	},
	registerPushNotifications (store) {
	const token = store.state.currentUser.credentials
	const vapidPublicKey = store.rootState.instance.vapidPublicKey
	const isEnabled = store.rootState.config.webPushNotifications
	const notificationVisibility = store.rootState.config.notificationVisibility

	registerPushNotifications(isEnabled, vapidPublicKey, token, notificationVisibility)
	},
	unregisterPushNotifications (store) {
	const token = store.state.currentUser.credentials

	unregisterPushNotifications(token)
	},
	addNewStatuses (store, { statuses }) {
	const users = map(statuses, 'user')
	const retweetedUsers = compact(map(statuses, 'retweeted_status.user'))
	store.commit('addNewUsers', users)
	store.commit('addNewUsers', retweetedUsers)

	// Reconnect users to statuses
	each(statuses, (status) => {
	store.commit('setUserForStatus', status)
	})
	// Reconnect users to retweets
	each(compact(map(statuses, 'retweeted_status')), (status) => {
	store.commit('setUserForStatus', status)
	})
	},
	addNewNotifications (store, { notifications }) {
	const users = map(notifications, 'from_profile')
	const notificationIds = notifications.map(_ => _.id)
	store.commit('addNewUsers', users)

	const notificationsObject = store.rootState.statuses.notifications.idStore
	const relevantNotifications = Object.entries(notificationsObject)
	.filter(([k, val]) => notificationIds.includes(k))
	.map(([k, val]) => val)

	// Reconnect users to notifications
	each(relevantNotifications, (notification) => {
	store.commit('setUserForNotification', notification)
	})
	},
	async signUp (store, userInfo) {
	store.commit('signUpPending')

	let rootState = store.rootState

	let response = await rootState.api.backendInteractor.register(userInfo)
	if (response.ok) {
	const data = {
	oauth: rootState.oauth,
	instance: rootState.instance.server
	}
	let app = await oauthApi.getOrCreateApp(data)
	let result = await oauthApi.getTokenWithCredentials({
	app,
	instance: data.instance,
	username: userInfo.username,
	password: userInfo.password
	})
	store.commit('signUpSuccess')
	store.commit('setToken', result.access_token)
	store.dispatch('loginUser', result.access_token)
	} else {
	const data = await response.json()
	let errors = JSON.parse(data.error)
	// replace ap_id with username
	if (errors.ap_id) {
	errors.username = errors.ap_id
	delete errors.ap_id
	}
	errors = humanizeErrors(errors)
	store.commit('signUpFailure', errors)
	throw Error(errors)
	}
	},
	async getCaptcha (store) {
	return await store.rootState.api.backendInteractor.getCaptcha()
	},

	logout (store) {
	store.commit('clearCurrentUser')
	store.dispatch('disconnectFromChat')
	store.commit('setToken', false)
	store.dispatch('stopFetching', 'friends')
	store.commit('setBackendInteractor', backendInteractorService())
	store.dispatch('stopFetchingNotifications')
	store.commit('resetStatuses')
	},
	loginUser (store, accessToken) {
	return new Promise((resolve, reject) => {
	const commit = store.commit
	commit('beginLogin')
	store.rootState.api.backendInteractor.verifyCredentials(accessToken)
	.then((data) => {
	if (!data.error) {
	const user = data
	// user.credentials = userCredentials
	user.credentials = accessToken
	user.blockIds = []
	user.muteIds = []
	commit('setCurrentUser', user)
	commit('addNewUsers', [user])

	getNotificationPermission()
	.then(permission => commit('setNotificationPermission', permission))

	// Set our new backend interactor
	commit('setBackendInteractor', backendInteractorService(accessToken))

	if (user.token) {
	store.dispatch('setWsToken', user.token)

	// Initialize the chat socket.
	store.dispatch('initializeSocket')
	}

	// Start getting fresh posts.
	store.dispatch('startFetching', { timeline: 'friends' })

	// Get user mutes
	store.dispatch('fetchMutes')

	// Fetch our friends
	store.rootState.api.backendInteractor.fetchFriends({ id: user.id })
	.then((friends) => commit('addNewUsers', friends))
	} else {
	const response = data.error
	// Authentication failed
	commit('endLogin')
	if (response.status === 401) {
	reject('Wrong username or password')
	} else {
	reject('An error occurred, please try again')
	}
	}
	commit('endLogin')
	resolve()
	})
	.catch((error) => {
	console.log(error)
	commit('endLogin')
	reject('Failed to connect to server, try again')
	})
	})
	}
	}
	}

	export default users
	diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
	index 2de87026e6..176f1c18dc 100644
	--- a/src/services/api/api.service.js
	+++ b/src/services/api/api.service.js
	@@ -1,621 +1,643 @@
	/* eslint-env browser */
	const LOGIN_URL = '/api/account/verify_credentials.json'
	const FRIENDS_TIMELINE_URL = '/api/statuses/friends_timeline.json'
	const ALL_FOLLOWING_URL = '/api/qvitter/allfollowing'
	const PUBLIC_TIMELINE_URL = '/api/statuses/public_timeline.json'
	const PUBLIC_AND_EXTERNAL_TIMELINE_URL = '/api/statuses/public_and_external_timeline.json'
	const TAG_TIMELINE_URL = '/api/statusnet/tags/timeline'
	const FAVORITE_URL = '/api/favorites/create'
	const UNFAVORITE_URL = '/api/favorites/destroy'
	const RETWEET_URL = '/api/statuses/retweet'
	const UNRETWEET_URL = '/api/statuses/unretweet'
	const STATUS_UPDATE_URL = '/api/statuses/update.json'
	const STATUS_DELETE_URL = '/api/statuses/destroy'
	const STATUS_URL = '/api/statuses/show'
	const MEDIA_UPLOAD_URL = '/api/statusnet/media/upload'
	const CONVERSATION_URL = '/api/statusnet/conversation'
	const MENTIONS_URL = '/api/statuses/mentions.json'
	const DM_TIMELINE_URL = '/api/statuses/dm_timeline.json'
	const FOLLOWERS_URL = '/api/statuses/followers.json'
	const FRIENDS_URL = '/api/statuses/friends.json'
	const BLOCKS_URL = '/api/statuses/blocks.json'
	const FOLLOWING_URL = '/api/friendships/create.json'
	const UNFOLLOWING_URL = '/api/friendships/destroy.json'
	const QVITTER_USER_PREF_URL = '/api/qvitter/set_profile_pref.json'
	const REGISTRATION_URL = '/api/account/register.json'
	const AVATAR_UPDATE_URL = '/api/qvitter/update_avatar.json'
	const BG_UPDATE_URL = '/api/qvitter/update_background_image.json'
	const BANNER_UPDATE_URL = '/api/account/update_profile_banner.json'
	const PROFILE_UPDATE_URL = '/api/account/update_profile.json'
	const EXTERNAL_PROFILE_URL = '/api/externalprofile/show.json'
	-const QVITTER_USER_TIMELINE_URL = '/api/qvitter/statuses/user_timeline.json'
	const QVITTER_USER_NOTIFICATIONS_URL = '/api/qvitter/statuses/notifications.json'
	const QVITTER_USER_NOTIFICATIONS_READ_URL = '/api/qvitter/statuses/notifications/read.json'
	const BLOCKING_URL = '/api/blocks/create.json'
	const UNBLOCKING_URL = '/api/blocks/destroy.json'
	-const USER_URL = '/api/users/show.json'
	const FOLLOW_IMPORT_URL = '/api/pleroma/follow_import'
	const DELETE_ACCOUNT_URL = '/api/pleroma/delete_account'
	const CHANGE_PASSWORD_URL = '/api/pleroma/change_password'
	const FOLLOW_REQUESTS_URL = '/api/pleroma/friend_requests'
	const APPROVE_USER_URL = '/api/pleroma/friendships/approve'
	const DENY_USER_URL = '/api/pleroma/friendships/deny'
	const SUGGESTIONS_URL = '/api/v1/suggestions'

	const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
	+const MASTODON_USER_URL = '/api/v1/accounts'
	+const MASTODON_USER_RELATIONSHIPS_URL = '/api/v1/accounts/relationships'
	+const MASTODON_USER_TIMELINE_URL = id => `/api/v1/accounts/${id}/statuses`

	import { each, map } from 'lodash'
	import { parseStatus, parseUser, parseNotification } from '../entity_normalizer/entity_normalizer.service.js'
	import 'whatwg-fetch'
	import { StatusCodeError } from '../errors/errors'

	const oldfetch = window.fetch

	let fetch = (url, options) => {
	options = options \|\| {}
	const baseUrl = ''
	const fullUrl = baseUrl + url
	options.credentials = 'same-origin'
	return oldfetch(fullUrl, options)
	}

	// Params
	// cropH
	// cropW
	// cropX
	// cropY
	// img (base 64 encodend data url)
	const updateAvatar = ({credentials, params}) => {
	let url = AVATAR_UPDATE_URL

	const form = new FormData()

	each(params, (value, key) => {
	if (value) {
	form.append(key, value)
	}
	})

	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST',
	body: form
	}).then((data) => data.json())
	}

	const updateBg = ({credentials, params}) => {
	let url = BG_UPDATE_URL

	const form = new FormData()

	each(params, (value, key) => {
	if (value) {
	form.append(key, value)
	}
	})

	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST',
	body: form
	}).then((data) => data.json())
	}

	// Params
	// height
	// width
	// offset_left
	// offset_top
	// banner (base 64 encodend data url)
	const updateBanner = ({credentials, params}) => {
	let url = BANNER_UPDATE_URL

	const form = new FormData()

	each(params, (value, key) => {
	if (value) {
	form.append(key, value)
	}
	})

	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST',
	body: form
	}).then((data) => data.json())
	}

	// Params
	// name
	// url
	// location
	// description
	const updateProfile = ({credentials, params}) => {
	// Always include these fields, because they might be empty or false
	const fields = ['description', 'locked', 'no_rich_text', 'hide_follows', 'hide_followers', 'show_role']
	let url = PROFILE_UPDATE_URL

	const form = new FormData()

	each(params, (value, key) => {
	if (fields.includes(key) \|\| value) {
	form.append(key, value)
	}
	})
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST',
	body: form
	}).then((data) => data.json())
	}

	// Params needed:
	// nickname
	// email
	// fullname
	// password
	// password_confirm
	//
	// Optional
	// bio
	// homepage
	// location
	// token
	const register = (params) => {
	const form = new FormData()

	each(params, (value, key) => {
	if (value) {
	form.append(key, value)
	}
	})

	return fetch(REGISTRATION_URL, {
	method: 'POST',
	body: form
	})
	}

	const getCaptcha = () => fetch('/api/pleroma/captcha').then(resp => resp.json())

	const authHeaders = (accessToken) => {
	if (accessToken) {
	return { 'Authorization': `Bearer ${accessToken}` }
	} else {
	return { }
	}
	}

	const externalProfile = ({profileUrl, credentials}) => {
	let url = `${EXTERNAL_PROFILE_URL}?profileurl=${profileUrl}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'GET'
	}).then((data) => data.json())
	}

	const followUser = ({id, credentials}) => {
	let url = `${FOLLOWING_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const unfollowUser = ({id, credentials}) => {
	let url = `${UNFOLLOWING_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const blockUser = ({id, credentials}) => {
	let url = `${BLOCKING_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const unblockUser = ({id, credentials}) => {
	let url = `${UNBLOCKING_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const approveUser = ({id, credentials}) => {
	let url = `${APPROVE_USER_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const denyUser = ({id, credentials}) => {
	let url = `${DENY_USER_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const fetchUser = ({id, credentials}) => {
	- let url = `${USER_URL}?user_id=${id}`
	+ let url = `${MASTODON_USER_URL}/${id}`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((response) => {
	return new Promise((resolve, reject) => response.json()
	.then((json) => {
	if (!response.ok) {
	return reject(new StatusCodeError(response.status, json, { url }, response))
	}
	return resolve(json)
	}))
	})
	.then((data) => parseUser(data))
	}

	+const fetchUserRelationship = ({id, credentials}) => {
	+ let url = `${MASTODON_USER_RELATIONSHIPS_URL}/?id=${id}`
	+ return fetch(url, { headers: authHeaders(credentials) })
	+ .then((response) => {
	+ return new Promise((resolve, reject) => response.json()
	+ .then((json) => {
	+ if (!response.ok) {
	+ return reject(new StatusCodeError(response.status, json, { url }, response))
	+ }
	+ return resolve(json)
	+ }))
	+ })
	+}
	+
	const fetchFriends = ({id, page, credentials}) => {
	let url = `${FRIENDS_URL}?user_id=${id}`
	if (page) {
	url = url + `&page=${page}`
	}
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	.then((data) => data.map(parseUser))
	}

	const exportFriends = ({id, credentials}) => {
	let url = `${FRIENDS_URL}?user_id=${id}&all=true`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	.then((data) => data.map(parseUser))
	}

	const fetchFollowers = ({id, page, credentials}) => {
	let url = `${FOLLOWERS_URL}?user_id=${id}`
	if (page) {
	url = url + `&page=${page}`
	}
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	.then((data) => data.map(parseUser))
	}

	const fetchAllFollowing = ({username, credentials}) => {
	const url = `${ALL_FOLLOWING_URL}/${username}.json`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	.then((data) => data.map(parseUser))
	}

	const fetchFollowRequests = ({credentials}) => {
	const url = FOLLOW_REQUESTS_URL
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	}

	const fetchConversation = ({id, credentials}) => {
	let url = `${CONVERSATION_URL}/${id}.json?count=100`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => {
	if (data.ok) {
	return data
	}
	throw new Error('Error fetching timeline', data)
	})
	.then((data) => data.json())
	.then((data) => data.map(parseStatus))
	}

	const fetchStatus = ({id, credentials}) => {
	let url = `${STATUS_URL}/${id}.json`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => {
	if (data.ok) {
	return data
	}
	throw new Error('Error fetching timeline', data)
	})
	.then((data) => data.json())
	.then((data) => parseStatus(data))
	}

	const setUserMute = ({id, credentials, muted = true}) => {
	const form = new FormData()

	const muteInteger = muted ? 1 : 0

	form.append('namespace', 'qvitter')
	form.append('data', muteInteger)
	form.append('topic', `mute:${id}`)

	return fetch(QVITTER_USER_PREF_URL, {
	method: 'POST',
	headers: authHeaders(credentials),
	body: form
	})
	}

	const fetchTimeline = ({timeline, credentials, since = false, until = false, userId = false, tag = false}) => {
	const timelineUrls = {
	public: PUBLIC_TIMELINE_URL,
	friends: FRIENDS_TIMELINE_URL,
	mentions: MENTIONS_URL,
	dms: DM_TIMELINE_URL,
	notifications: QVITTER_USER_NOTIFICATIONS_URL,
	'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL,
	- user: QVITTER_USER_TIMELINE_URL,
	- media: QVITTER_USER_TIMELINE_URL,
	+ user: MASTODON_USER_TIMELINE_URL,
	+ media: MASTODON_USER_TIMELINE_URL,
	favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
	tag: TAG_TIMELINE_URL
	}
	const isNotifications = timeline === 'notifications'
	const params = []

	let url = timelineUrls[timeline]

	+ if (timeline === 'user' \|\| timeline === 'media') {
	+ url = url(userId)
	+ }
	+
	if (since) {
	params.push(['since_id', since])
	}
	if (until) {
	params.push(['max_id', until])
	}
	- if (userId) {
	- params.push(['user_id', userId])
	- }
	if (tag) {
	url += `/${tag}.json`
	}
	if (timeline === 'media') {
	params.push(['only_media', 1])
	}

	params.push(['count', 20])

	const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
	url += `?${queryString}`

	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => {
	if (data.ok) {
	return data
	}
	throw new Error('Error fetching timeline', data)
	})
	.then((data) => data.json())
	.then((data) => data.map(isNotifications ? parseNotification : parseStatus))
	}

	const verifyCredentials = (user) => {
	return fetch(LOGIN_URL, {
	method: 'POST',
	headers: authHeaders(user)
	})
	.then((response) => {
	if (response.ok) {
	return response.json()
	} else {
	return {
	error: response
	}
	}
	})
	.then((data) => data.error ? data : parseUser(data))
	}

	const favorite = ({ id, credentials }) => {
	return fetch(`${FAVORITE_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const unfavorite = ({ id, credentials }) => {
	return fetch(`${UNFAVORITE_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const retweet = ({ id, credentials }) => {
	return fetch(`${RETWEET_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const unretweet = ({ id, credentials }) => {
	return fetch(`${UNRETWEET_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const postStatus = ({credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks}) => {
	const idsText = mediaIds.join(',')
	const form = new FormData()

	form.append('status', status)
	form.append('source', 'Pleroma FE')
	if (noAttachmentLinks) form.append('no_attachment_links', noAttachmentLinks)
	if (spoilerText) form.append('spoiler_text', spoilerText)
	if (visibility) form.append('visibility', visibility)
	if (sensitive) form.append('sensitive', sensitive)
	if (contentType) form.append('content_type', contentType)
	form.append('media_ids', idsText)
	if (inReplyToStatusId) {
	form.append('in_reply_to_status_id', inReplyToStatusId)
	}

	return fetch(STATUS_UPDATE_URL, {
	body: form,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => {
	if (response.ok) {
	return response.json()
	} else {
	return {
	error: response
	}
	}
	})
	.then((data) => data.error ? data : parseStatus(data))
	}

	const deleteStatus = ({ id, credentials }) => {
	return fetch(`${STATUS_DELETE_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const uploadMedia = ({formData, credentials}) => {
	return fetch(MEDIA_UPLOAD_URL, {
	body: formData,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => response.text())
	.then((text) => (new DOMParser()).parseFromString(text, 'application/xml'))
	}

	const followImport = ({params, credentials}) => {
	return fetch(FOLLOW_IMPORT_URL, {
	body: params,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => response.ok)
	}

	const deleteAccount = ({credentials, password}) => {
	const form = new FormData()

	form.append('password', password)

	return fetch(DELETE_ACCOUNT_URL, {
	body: form,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => response.json())
	}

	const changePassword = ({credentials, password, newPassword, newPasswordConfirmation}) => {
	const form = new FormData()

	form.append('password', password)
	form.append('new_password', newPassword)
	form.append('new_password_confirmation', newPasswordConfirmation)

	return fetch(CHANGE_PASSWORD_URL, {
	body: form,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => response.json())
	}

	const fetchMutes = ({credentials}) => {
	const url = '/api/qvitter/mutes.json'

	return fetch(url, {
	headers: authHeaders(credentials)
	}).then((data) => data.json())
	}

	const fetchBlocks = ({page, credentials}) => {
	return fetch(BLOCKS_URL, {
	headers: authHeaders(credentials)
	}).then((data) => {
	if (data.ok) {
	return data.json()
	}
	throw new Error('Error fetching blocks', data)
	})
	}

	const fetchOAuthTokens = ({credentials}) => {
	const url = '/api/oauth_tokens.json'

	return fetch(url, {
	headers: authHeaders(credentials)
	- }).then((data) => data.json())
	+ }).then((data) => {
	+ if (data.ok) {
	+ return data.json()
	+ }
	+ throw new Error('Error fetching auth tokens', data)
	+ })
	}

	const revokeOAuthToken = ({id, credentials}) => {
	const url = `/api/oauth_tokens/${id}`

	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'DELETE'
	})
	}

	const suggestions = ({credentials}) => {
	return fetch(SUGGESTIONS_URL, {
	headers: authHeaders(credentials)
	}).then((data) => data.json())
	}

	const markNotificationsAsSeen = ({id, credentials}) => {
	const body = new FormData()

	body.append('latest_id', id)

	return fetch(QVITTER_USER_NOTIFICATIONS_READ_URL, {
	body,
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const apiService = {
	verifyCredentials,
	fetchTimeline,
	fetchConversation,
	fetchStatus,
	fetchFriends,
	exportFriends,
	fetchFollowers,
	followUser,
	unfollowUser,
	blockUser,
	unblockUser,
	fetchUser,
	+ fetchUserRelationship,
	favorite,
	unfavorite,
	retweet,
	unretweet,
	postStatus,
	deleteStatus,
	uploadMedia,
	fetchAllFollowing,
	setUserMute,
	fetchMutes,
	fetchBlocks,
	fetchOAuthTokens,
	revokeOAuthToken,
	register,
	getCaptcha,
	updateAvatar,
	updateBg,
	updateProfile,
	updateBanner,
	externalProfile,
	followImport,
	deleteAccount,
	changePassword,
	fetchFollowRequests,
	approveUser,
	denyUser,
	suggestions,
	markNotificationsAsSeen
	}

	export default apiService
	diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
	index 7e972d7b22..cbd0b73389 100644
	--- a/src/services/backend_interactor_service/backend_interactor_service.js
	+++ b/src/services/backend_interactor_service/backend_interactor_service.js
	@@ -1,121 +1,126 @@
	import apiService from '../api/api.service.js'
	import timelineFetcherService from '../timeline_fetcher/timeline_fetcher.service.js'

	const backendInteractorService = (credentials) => {
	const fetchStatus = ({id}) => {
	return apiService.fetchStatus({id, credentials})
	}

	const fetchConversation = ({id}) => {
	return apiService.fetchConversation({id, credentials})
	}

	const fetchFriends = ({id, page}) => {
	return apiService.fetchFriends({id, page, credentials})
	}

	const exportFriends = ({id}) => {
	return apiService.exportFriends({id, credentials})
	}

	const fetchFollowers = ({id, page}) => {
	return apiService.fetchFollowers({id, page, credentials})
	}

	const fetchAllFollowing = ({username}) => {
	return apiService.fetchAllFollowing({username, credentials})
	}

	const fetchUser = ({id}) => {
	return apiService.fetchUser({id, credentials})
	}

	+ const fetchUserRelationship = ({id}) => {
	+ return apiService.fetchUserRelationship({id, credentials})
	+ }
	+
	const followUser = (id) => {
	return apiService.followUser({credentials, id})
	}

	const unfollowUser = (id) => {
	return apiService.unfollowUser({credentials, id})
	}

	const blockUser = (id) => {
	return apiService.blockUser({credentials, id})
	}

	const unblockUser = (id) => {
	return apiService.unblockUser({credentials, id})
	}

	const approveUser = (id) => {
	return apiService.approveUser({credentials, id})
	}

	const denyUser = (id) => {
	return apiService.denyUser({credentials, id})
	}

	const startFetching = ({timeline, store, userId = false, tag}) => {
	return timelineFetcherService.startFetching({timeline, store, credentials, userId, tag})
	}

	const setUserMute = ({id, muted = true}) => {
	return apiService.setUserMute({id, muted, credentials})
	}

	const fetchMutes = () => apiService.fetchMutes({credentials})
	const fetchBlocks = (params) => apiService.fetchBlocks({credentials, ...params})
	const fetchFollowRequests = () => apiService.fetchFollowRequests({credentials})
	const fetchOAuthTokens = () => apiService.fetchOAuthTokens({credentials})
	const revokeOAuthToken = (id) => apiService.revokeOAuthToken({id, credentials})

	const getCaptcha = () => apiService.getCaptcha()
	const register = (params) => apiService.register(params)
	const updateAvatar = ({params}) => apiService.updateAvatar({credentials, params})
	const updateBg = ({params}) => apiService.updateBg({credentials, params})
	const updateBanner = ({params}) => apiService.updateBanner({credentials, params})
	const updateProfile = ({params}) => apiService.updateProfile({credentials, params})

	const externalProfile = (profileUrl) => apiService.externalProfile({profileUrl, credentials})
	const followImport = ({params}) => apiService.followImport({params, credentials})

	const deleteAccount = ({password}) => apiService.deleteAccount({credentials, password})
	const changePassword = ({password, newPassword, newPasswordConfirmation}) => apiService.changePassword({credentials, password, newPassword, newPasswordConfirmation})

	const backendInteractorServiceInstance = {
	fetchStatus,
	fetchConversation,
	fetchFriends,
	exportFriends,
	fetchFollowers,
	followUser,
	unfollowUser,
	blockUser,
	unblockUser,
	fetchUser,
	+ fetchUserRelationship,
	fetchAllFollowing,
	verifyCredentials: apiService.verifyCredentials,
	startFetching,
	setUserMute,
	fetchMutes,
	fetchBlocks,
	fetchOAuthTokens,
	revokeOAuthToken,
	register,
	getCaptcha,
	updateAvatar,
	updateBg,
	updateBanner,
	updateProfile,
	externalProfile,
	followImport,
	deleteAccount,
	changePassword,
	fetchFollowRequests,
	approveUser,
	denyUser
	}

	return backendInteractorServiceInstance
	}

	export default backendInteractorService
	diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
	index d20ce77f77..57a6adf926 100644
	--- a/src/services/entity_normalizer/entity_normalizer.service.js
	+++ b/src/services/entity_normalizer/entity_normalizer.service.js
	@@ -1,286 +1,297 @@
	const qvitterStatusType = (status) => {
	if (status.is_post_verb) {
	return 'status'
	}

	if (status.retweeted_status) {
	return 'retweet'
	}

	if ((typeof status.uri === 'string' && status.uri.match(/(fave\|objectType=Favourite)/)) \|\|
	(typeof status.text === 'string' && status.text.match(/favorited/))) {
	return 'favorite'
	}

	if (status.text.match(/deleted notice {{tag/) \|\| status.qvitter_delete_notice) {
	return 'deletion'
	}

	if (status.text.match(/started following/) \|\| status.activity_type === 'follow') {
	return 'follow'
	}

	return 'unknown'
	}

	export const parseUser = (data) => {
	const output = {}
	const masto = data.hasOwnProperty('acct')
	// case for users in "mentions" property for statuses in MastoAPI
	const mastoShort = masto && !data.hasOwnProperty('avatar')

	output.id = String(data.id)

	if (masto) {
	output.screen_name = data.acct

	// There's nothing else to get
	if (mastoShort) {
	return output
	}

	- output.name = null // missing
	- output.name_html = data.display_name
	+ // output.name = ??? missing
	+ output.name_html = addEmojis(data.display_name, data.emojis)

	- output.description = null // missing
	- output.description_html = data.note
	+ // output.description = ??? missing
	+ output.description_html = addEmojis(data.note, data.emojis)

	// Utilize avatar_static for gif avatars?
	output.profile_image_url = data.avatar
	output.profile_image_url_original = data.avatar

	// Same, utilize header_static?
	output.cover_photo = data.header

	output.friends_count = data.following_count

	output.bot = data.bot

	output.statusnet_profile_url = data.url

	if (data.pleroma) {
	- const pleroma = data.pleroma
	- output.follows_you = pleroma.follows_you
	- output.statusnet_blocking = pleroma.statusnet_blocking
	- output.muted = pleroma.muted
	+ const relationship = data.pleroma.relationship
	+
	+ if (relationship) {
	+ output.follows_you = relationship.followed_by
	+ output.following = relationship.following
	+ output.statusnet_blocking = relationship.blocking
	+ output.muted = relationship.muting
	+ }
	}

	// Missing, trying to recover
	output.is_local = !output.screen_name.includes('@')
	} else {
	output.screen_name = data.screen_name

	output.name = data.name
	output.name_html = data.name_html

	output.description = data.description
	output.description_html = data.description_html

	output.profile_image_url = data.profile_image_url
	output.profile_image_url_original = data.profile_image_url_original

	output.cover_photo = data.cover_photo

	output.friends_count = data.friends_count

	- output.bot = null // missing
	+ // output.bot = ??? missing

	output.statusnet_profile_url = data.statusnet_profile_url

	output.statusnet_blocking = data.statusnet_blocking

	output.is_local = data.is_local
	output.role = data.role
	output.show_role = data.show_role

	output.follows_you = data.follows_you

	output.muted = data.muted

	// QVITTER ONLY FOR NOW
	// Really only applies to logged in user, really.. I THINK
	output.rights = data.rights
	output.no_rich_text = data.no_rich_text
	output.default_scope = data.default_scope
	output.hide_follows = data.hide_follows
	output.hide_followers = data.hide_followers
	output.background_image = data.background_image
	// on mastoapi this info is contained in a "relationship"
	output.following = data.following
	// Websocket token
	output.token = data.token
	}

	output.created_at = new Date(data.created_at)
	output.locked = data.locked
	output.followers_count = data.followers_count
	output.statuses_count = data.statuses_count
	output.friends = []
	output.followers = []
	if (data.pleroma) {
	output.follow_request_count = data.pleroma.follow_request_count
	}

	return output
	}

	const parseAttachment = (data) => {
	const output = {}
	const masto = !data.hasOwnProperty('oembed')

	if (masto) {
	// Not exactly same...
	output.mimetype = data.type
	output.meta = data.meta // not present in BE yet
	} else {
	output.mimetype = data.mimetype
	- output.meta = null // missing
	+ // output.meta = ??? missing
	}

	output.url = data.url
	output.description = data.description

	return output
	}
	+export const addEmojis = (string, emojis) => {
	+ return emojis.reduce((acc, emoji) => {
	+ return acc.replace(
	+ new RegExp(`:${emoji.shortcode}:`, 'g'),
	+ `<img src='${emoji.url}' alt='${emoji.shortcode}' class='emoji' />`
	+ )
	+ }, string)
	+}

	export const parseStatus = (data) => {
	const output = {}
	const masto = data.hasOwnProperty('account')

	if (masto) {
	output.favorited = data.favourited
	output.fave_num = data.favourites_count

	output.repeated = data.reblogged
	output.repeat_num = data.reblogs_count

	output.type = data.reblog ? 'retweet' : 'status'
	output.nsfw = data.sensitive

	- output.statusnet_html = data.content
	+ output.statusnet_html = addEmojis(data.content, data.emojis)

	// Not exactly the same but works?
	output.text = data.content

	output.in_reply_to_status_id = data.in_reply_to_id
	output.in_reply_to_user_id = data.in_reply_to_account_id

	// Missing!! fix in UI?
	- output.in_reply_to_screen_name = null
	+ // output.in_reply_to_screen_name = ???

	// Not exactly the same but works
	output.statusnet_conversation_id = data.id

	if (output.type === 'retweet') {
	output.retweeted_status = parseStatus(data.reblog)
	}

	output.summary = data.spoiler_text
	- output.summary_html = data.spoiler_text
	+ output.summary_html = addEmojis(data.spoiler_text, data.emojis)
	output.external_url = data.url

	- // FIXME missing!!
	- output.is_local = false
	+ // output.is_local = ??? missing
	} else {
	output.favorited = data.favorited
	output.fave_num = data.fave_num

	output.repeated = data.repeated
	output.repeat_num = data.repeat_num

	// catchall, temporary
	// Object.assign(output, data)

	output.type = qvitterStatusType(data)

	if (data.nsfw === undefined) {
	output.nsfw = isNsfw(data)
	if (data.retweeted_status) {
	output.nsfw = data.retweeted_status.nsfw
	}
	} else {
	output.nsfw = data.nsfw
	}

	output.statusnet_html = data.statusnet_html
	output.text = data.text

	output.in_reply_to_status_id = data.in_reply_to_status_id
	output.in_reply_to_user_id = data.in_reply_to_user_id
	output.in_reply_to_screen_name = data.in_reply_to_screen_name

	output.statusnet_conversation_id = data.statusnet_conversation_id

	if (output.type === 'retweet') {
	output.retweeted_status = parseStatus(data.retweeted_status)
	}

	output.summary = data.summary
	output.summary_html = data.summary_html
	output.external_url = data.external_url
	output.is_local = data.is_local
	}

	output.id = String(data.id)
	output.visibility = data.visibility
	output.card = data.card
	output.created_at = new Date(data.created_at)

	// Converting to string, the right way.
	output.in_reply_to_status_id = output.in_reply_to_status_id
	? String(output.in_reply_to_status_id)
	: null
	output.in_reply_to_user_id = output.in_reply_to_user_id
	? String(output.in_reply_to_user_id)
	: null

	output.user = parseUser(masto ? data.account : data.user)

	output.attentions = ((masto ? data.mentions : data.attentions) \|\| []).map(parseUser)

	output.attachments = ((masto ? data.media_attachments : data.attachments) \|\| [])
	.map(parseAttachment)

	const retweetedStatus = masto ? data.reblog : data.retweeted_status
	if (retweetedStatus) {
	output.retweeted_status = parseStatus(retweetedStatus)
	}

	return output
	}

	export const parseNotification = (data) => {
	const mastoDict = {
	'favourite': 'like',
	'reblog': 'repeat'
	}
	const masto = !data.hasOwnProperty('ntype')
	const output = {}

	if (masto) {
	output.type = mastoDict[data.type] \|\| data.type
	- output.seen = null // missing
	+ // output.seen = ??? missing
	output.status = parseStatus(data.status)
	output.action = output.status // not sure
	output.from_profile = parseUser(data.account)
	} else {
	const parsedNotice = parseStatus(data.notice)
	output.type = data.ntype
	output.seen = Boolean(data.is_seen)
	output.status = output.type === 'like'
	? parseStatus(data.notice.favorited_status)
	: parsedNotice
	output.action = parsedNotice
	output.from_profile = parseUser(data.from_profile)
	}

	output.created_at = new Date(data.created_at)
	output.id = data.id

	return output
	}

	const isNsfw = (status) => {
	const nsfwRegex = /#nsfw/i
	- return (status.tags \|\| []).includes('nsfw') \|\| !!status.text.match(nsfwRegex)
	+ return (status.tags \|\| []).includes('nsfw') \|\| !!(status.text \|\| '').match(nsfwRegex)
	}
	diff --git a/src/services/new_api/user_search.js b/src/services/new_api/user_search.js
	index ce7da88e4d..869afa9c94 100644
	--- a/src/services/new_api/user_search.js
	+++ b/src/services/new_api/user_search.js
	@@ -1,16 +1,19 @@
	import utils from './utils.js'
	+import { parseUser } from '../entity_normalizer/entity_normalizer.service.js'

	const search = ({query, store}) => {
	return utils.request({
	store,
	- url: '/api/pleroma/search_user',
	+ url: '/api/v1/accounts/search',
	params: {
	- query
	+ q: query
	}
	- }).then((data) => data.json())
	+ })
	+ .then((data) => data.json())
	+ .then((data) => data.map(parseUser))
	}
	const UserSearch = {
	search
	}

	export default UserSearch
	diff --git a/src/services/version/version.service.js b/src/services/version/version.service.js
	new file mode 100644
	index 0000000000..a750b0dd17
	--- /dev/null
	+++ b/src/services/version/version.service.js
	@@ -0,0 +1,6 @@
	+
	+export const extractCommit = versionString => {
	+ const regex = /-g(\w+)$/i
	+ const matches = versionString.match(regex)
	+ return matches ? matches[1] : ''
	+}
	diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
	index 41fd9cd01e..847481f33d 100644
	--- a/test/unit/specs/components/user_profile.spec.js
	+++ b/test/unit/specs/components/user_profile.spec.js
	@@ -1,196 +1,202 @@
	import { mount, createLocalVue } from '@vue/test-utils'
	import Vuex from 'vuex'
	import UserProfile from 'src/components/user_profile/user_profile.vue'
	import backendInteractorService from 'src/services/backend_interactor_service/backend_interactor_service.js'
	import { getters } from 'src/modules/users.js'

	const localVue = createLocalVue()
	localVue.use(Vuex)

	const mutations = {
	clearTimeline: () => {},
	setError: () => {}
	}

	+const actions = {
	+ fetchUser: () => {},
	+ fetchUserByScreenName: () => {}
	+}
	+
	const testGetters = {
	- userByName: state => getters.userByName(state.users),
	- userById: state => getters.userById(state.users)
	+ findUser: state => getters.findUser(state.users)
	}

	const localUser = {
	id: 100,
	is_local: true,
	screen_name: 'testUser'
	}

	const extUser = {
	id: 100,
	is_local: false,
	screen_name: 'testUser@test.instance'
	}

	const externalProfileStore = new Vuex.Store({
	mutations,
	+ actions,
	getters: testGetters,
	state: {
	api: {
	backendInteractor: backendInteractorService('')
	},
	interface: {
	browserSupport: ''
	},
	config: {
	colors: '',
	highlight: {},
	customTheme: {
	colors: []
	}
	},
	instance: {
	hideUserStats: true
	},
	statuses: {
	timelines: {
	user: {
	statuses: [],
	statusesObject: {},
	faves: [],
	visibleStatuses: [],
	visibleStatusesObject: {},
	newStatusCount: 0,
	maxId: 0,
	minVisibleId: 0,
	loading: false,
	followers: [],
	friends: [],
	viewing: 'statuses',
	userId: 100,
	flushMarker: 0
	},
	media: {
	statuses: [],
	statusesObject: {},
	faves: [],
	visibleStatuses: [],
	visibleStatusesObject: {},
	newStatusCount: 0,
	maxId: 0,
	minVisibleId: 0,
	loading: false,
	followers: [],
	friends: [],
	viewing: 'statuses',
	userId: 100,
	flushMarker: 0
	}
	}
	},
	users: {
	currentUser: {
	credentials: ''
	},
	- usersObject: [extUser],
	+ usersObject: { 100: extUser },
	users: [extUser]
	}
	}
	})

	const localProfileStore = new Vuex.Store({
	mutations,
	+ actions,
	getters: testGetters,
	state: {
	api: {
	backendInteractor: backendInteractorService('')
	},
	interface: {
	browserSupport: ''
	},
	config: {
	colors: '',
	highlight: {},
	customTheme: {
	colors: []
	}
	},
	instance: {
	hideUserStats: true
	},
	statuses: {
	timelines: {
	user: {
	statuses: [],
	statusesObject: {},
	faves: [],
	visibleStatuses: [],
	visibleStatusesObject: {},
	newStatusCount: 0,
	maxId: 0,
	minVisibleId: 0,
	loading: false,
	followers: [],
	friends: [],
	viewing: 'statuses',
	userId: 100,
	flushMarker: 0
	},
	media: {
	statuses: [],
	statusesObject: {},
	faves: [],
	visibleStatuses: [],
	visibleStatusesObject: {},
	newStatusCount: 0,
	maxId: 0,
	minVisibleId: 0,
	loading: false,
	followers: [],
	friends: [],
	viewing: 'statuses',
	userId: 100,
	flushMarker: 0
	}
	}
	},
	users: {
	currentUser: {
	credentials: ''
	},
	- usersObject: [localUser],
	+ usersObject: { 100: localUser, 'testuser': localUser },
	users: [localUser]
	}
	}
	})

	describe('UserProfile', () => {
	it('renders external profile', () => {
	const wrapper = mount(UserProfile, {
	localVue,
	store: externalProfileStore,
	mocks: {
	$route: {
	params: { id: 100 },
	name: 'external-user-profile'
	},
	$t: (msg) => msg
	}
	})

	expect(wrapper.find('.user-screen-name').text()).to.eql('@testUser@test.instance')
	})

	it('renders local profile', () => {
	const wrapper = mount(UserProfile, {
	localVue,
	store: localProfileStore,
	mocks: {
	$route: {
	params: { name: 'testUser' },
	name: 'user-profile'
	},
	$t: (msg) => msg
	}
	})

	expect(wrapper.find('.user-screen-name').text()).to.eql('@testUser')
	})
	})
	diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
	index 4d49ee2424..c8bc0ae7a5 100644
	--- a/test/unit/specs/modules/users.spec.js
	+++ b/test/unit/specs/modules/users.spec.js
	@@ -1,73 +1,64 @@
	import { cloneDeep } from 'lodash'

	import { defaultState, mutations, getters } from '../../../../src/modules/users.js'

	describe('The users module', () => {
	describe('mutations', () => {
	it('adds new users to the set, merging in new information for old users', () => {
	const state = cloneDeep(defaultState)
	const user = { id: '1', name: 'Guy' }
	const modUser = { id: '1', name: 'Dude' }

	mutations.addNewUsers(state, [user])
	expect(state.users).to.have.length(1)
	expect(state.users).to.eql([user])

	mutations.addNewUsers(state, [modUser])
	expect(state.users).to.have.length(1)
	expect(state.users).to.eql([user])
	expect(state.users[0].name).to.eql('Dude')
	})

	it('sets a mute bit on users', () => {
	const state = cloneDeep(defaultState)
	const user = { id: '1', name: 'Guy' }

	mutations.addNewUsers(state, [user])
	mutations.setMuted(state, {user, muted: true})

	expect(user.muted).to.eql(true)

	mutations.setMuted(state, {user, muted: false})

	expect(user.muted).to.eql(false)
	})
	})

	- describe('getUserByName', () => {
	+ describe('findUser', () => {
	it('returns user with matching screen_name', () => {
	+ const user = { screen_name: 'Guy', id: '1' }
	const state = {
	- users: [
	- { screen_name: 'Guy', id: '1' }
	- ]
	+ usersObject: {
	+ 1: user,
	+ guy: user
	+ }
	}
	const name = 'Guy'
	const expected = { screen_name: 'Guy', id: '1' }
	- expect(getters.userByName(state)(name)).to.eql(expected)
	+ expect(getters.findUser(state)(name)).to.eql(expected)
	})

	- it('returns user with matching screen_name with different case', () => {
	- const state = {
	- users: [
	- { screen_name: 'guy', id: '1' }
	- ]
	- }
	- const name = 'Guy'
	- const expected = { screen_name: 'guy', id: '1' }
	- expect(getters.userByName(state)(name)).to.eql(expected)
	- })
	- })
	-
	- describe('getUserById', () => {
	it('returns user with matching id', () => {
	+ const user = { screen_name: 'Guy', id: '1' }
	const state = {
	- users: [
	- { screen_name: 'Guy', id: '1' }
	- ]
	+ usersObject: {
	+ 1: user,
	+ guy: user
	+ }
	}
	const id = '1'
	const expected = { screen_name: 'Guy', id: '1' }
	- expect(getters.userById(state)(id)).to.eql(expected)
	+ expect(getters.findUser(state)(id)).to.eql(expected)
	})
	})
	})
	diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
	index 6245361ca7..2b0b0d6d6b 100644
	--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
	+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
	@@ -1,270 +1,343 @@
	-import { parseStatus, parseUser, parseNotification } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
	+import { parseStatus, parseUser, parseNotification, addEmojis } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
	import mastoapidata from '../../../../fixtures/mastoapi.json'
	import qvitterapidata from '../../../../fixtures/statuses.json'

	const makeMockStatusQvitter = (overrides = {}) => {
	return Object.assign({
	activity_type: 'post',
	attachments: [],
	attentions: [],
	created_at: 'Tue Jan 15 13:57:56 +0000 2019',
	external_url: 'https://ap.example/whatever',
	fave_num: 1,
	favorited: false,
	id: '10335970',
	in_reply_to_ostatus_uri: null,
	in_reply_to_profileurl: null,
	in_reply_to_screen_name: null,
	in_reply_to_status_id: null,
	in_reply_to_user_id: null,
	is_local: false,
	is_post_verb: true,
	possibly_sensitive: false,
	repeat_num: 0,
	repeated: false,
	statusnet_conversation_id: '16300488',
	statusnet_html: '<p>haha benis</p>',
	summary: null,
	tags: [],
	text: 'haha benis',
	uri: 'https://ap.example/whatever',
	user: makeMockUserQvitter(),
	visibility: 'public'
	}, overrides)
	}

	const makeMockUserQvitter = (overrides = {}) => {
	return Object.assign({
	background_image: null,
	cover_photo: '',
	created_at: 'Mon Jan 14 13:56:51 +0000 2019',
	default_scope: 'public',
	description: 'ebin',
	description_html: '<p>ebin</p>',
	favourites_count: 0,
	fields: [],
	followers_count: 1,
	following: true,
	follows_you: true,
	friends_count: 1,
	id: '60717',
	is_local: false,
	locked: false,
	name: 'Spurdo :ebin:',
	name_html: 'Spurdo <img src="whatever">',
	no_rich_text: false,
	pleroma: { confirmation_pending: false, tags: [] },
	profile_image_url: 'https://ap.example/whatever',
	profile_image_url_https: 'https://ap.example/whatever',
	profile_image_url_original: 'https://ap.example/whatever',
	profile_image_url_profile_size: 'https://ap.example/whatever',
	rights: { delete_others_notice: false },
	screen_name: 'spurdo@ap.example',
	statuses_count: 46,
	statusnet_blocking: false,
	statusnet_profile_url: ''
	}, overrides)
	}

	const makeMockUserMasto = (overrides = {}) => {
	return Object.assign({
	acct: 'hj',
	avatar:
	'https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png',
	avatar_static:
	'https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png',
	bot: false,
	created_at: '2017-12-17T21:54:14.000Z',
	display_name: 'whatever whatever whatever witch',
	emojis: [],
	fields: [],
	followers_count: 705,
	following_count: 326,
	header:
	'https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png',
	header_static:
	'https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png',
	id: '1',
	locked: false,
	note:
	'Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user="1" href="https://shigusegubu.club/users/hj">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it\'s truly private matter and you\'re instance\'s admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.',
	pleroma: { confirmation_pending: false, tags: null },
	source: { note: '', privacy: 'public', sensitive: false },
	statuses_count: 41775,
	url: 'https://shigusegubu.club/users/hj',
	username: 'hj'
	}, overrides)
	}

	const makeMockStatusMasto = (overrides = {}) => {
	return Object.assign({
	account: makeMockUserMasto(),
	application: { name: 'Web', website: null },
	content:
	'<span><a data-user="14660" href="https://pleroma.soykaf.com/users/sampo">@<span>sampo</span></a></span> god i wish i was there',
	created_at: '2019-01-17T16:29:23.000Z',
	emojis: [],
	favourited: false,
	favourites_count: 1,
	id: '10423476',
	in_reply_to_account_id: '14660',
	in_reply_to_id: '10423197',
	language: null,
	media_attachments: [],
	mentions: [
	{
	acct: 'sampo@pleroma.soykaf.com',
	id: '14660',
	url: 'https://pleroma.soykaf.com/users/sampo',
	username: 'sampo'
	}
	],
	muted: false,
	reblog: null,
	reblogged: false,
	reblogs_count: 0,
	replies_count: 0,
	sensitive: false,
	spoiler_text: '',
	tags: [],
	uri: 'https://shigusegubu.club/objects/16033fbb-97c0-4f0e-b834-7abb92fb8639',
	url: 'https://shigusegubu.club/objects/16033fbb-97c0-4f0e-b834-7abb92fb8639',
	visibility: 'public'
	}, overrides)
	}

	const makeMockNotificationQvitter = (overrides = {}) => {
	return Object.assign({
	notice: makeMockStatusQvitter(),
	ntype: 'follow',
	from_profile: makeMockUserQvitter(),
	is_seen: 0,
	id: 123
	}, overrides)
	}

	+const makeMockEmojiMasto = (overrides = [{}]) => {
	+ return [
	+ Object.assign({
	+ shortcode: 'image',
	+ static_url: 'https://example.com/image.png',
	+ url: 'https://example.com/image.png',
	+ visible_in_picker: false
	+ }, overrides[0]),
	+ Object.assign({
	+ shortcode: 'thinking',
	+ static_url: 'https://example.com/think.png',
	+ url: 'https://example.com/think.png',
	+ visible_in_picker: false
	+ }, overrides[1])
	+ ]
	+}
	+
	parseNotification
	parseUser
	parseStatus
	makeMockStatusQvitter
	makeMockUserQvitter

	describe('API Entities normalizer', () => {
	describe('parseStatus', () => {
	describe('QVitter preprocessing', () => {
	it('doesn\'t blow up', () => {
	const parsed = qvitterapidata.map(parseStatus)
	expect(parsed.length).to.eq(qvitterapidata.length)
	})

	it('identifies favorites', () => {
	const fav = {
	uri: 'tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00',
	is_post_verb: false
	}

	const mastoFav = {
	uri: 'tag:mastodon.social,2016-11-27:objectId=73903:objectType=Favourite',
	is_post_verb: false
	}

	expect(parseStatus(makeMockStatusQvitter(fav))).to.have.property('type', 'favorite')
	expect(parseStatus(makeMockStatusQvitter(mastoFav))).to.have.property('type', 'favorite')
	})

	it('processes repeats correctly', () => {
	const post = makeMockStatusQvitter({ retweeted_status: null, id: 'deadbeef' })
	const repeat = makeMockStatusQvitter({ retweeted_status: post, is_post_verb: false, id: 'foobar' })

	const parsedPost = parseStatus(post)
	const parsedRepeat = parseStatus(repeat)

	expect(parsedPost).to.have.property('type', 'status')
	expect(parsedRepeat).to.have.property('type', 'retweet')
	expect(parsedRepeat).to.have.property('retweeted_status')
	expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
	})

	it('sets nsfw for statuses with the #nsfw tag', () => {
	const safe = makeMockStatusQvitter({id: '1', text: 'Hello oniichan'})
	const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw'})

	expect(parseStatus(safe).nsfw).to.eq(false)
	expect(parseStatus(nsfw).nsfw).to.eq(true)
	})

	it('leaves existing nsfw settings alone', () => {
	const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw', nsfw: false})

	expect(parseStatus(nsfw).nsfw).to.eq(false)
	})
	})

	describe('Mastoapi preprocessing and converting', () => {
	it('doesn\'t blow up', () => {
	const parsed = mastoapidata.map(parseStatus)
	expect(parsed.length).to.eq(mastoapidata.length)
	})

	it('processes repeats correctly', () => {
	const post = makeMockStatusMasto({ reblog: null, id: 'deadbeef' })
	const repeat = makeMockStatusMasto({ reblog: post, id: 'foobar' })

	const parsedPost = parseStatus(post)
	const parsedRepeat = parseStatus(repeat)

	expect(parsedPost).to.have.property('type', 'status')
	expect(parsedRepeat).to.have.property('type', 'retweet')
	expect(parsedRepeat).to.have.property('retweeted_status')
	expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
	})
	+
	+ it('adds emojis to post content', () => {
	+ const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), content: 'Makes you think :thinking:' })
	+
	+ const parsedPost = parseStatus(post)
	+
	+ expect(parsedPost).to.have.property('statusnet_html').that.contains('<img')
	+ })
	+
	+ it('adds emojis to subject line', () => {
	+ const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), spoiler_text: 'CW: 300 IQ :thinking:' })
	+
	+ const parsedPost = parseStatus(post)
	+
	+ expect(parsedPost).to.have.property('summary_html').that.contains('<img')
	+ })
	})
	})

	// Statuses generally already contain some info regarding users and there's nearly 1:1 mapping, so very little to test
	describe('parseUsers (MastoAPI)', () => {
	it('sets correct is_local for users depending on their screen_name', () => {
	const local = makeMockUserMasto({ acct: 'foo' })
	const remote = makeMockUserMasto({ acct: 'foo@bar.baz' })

	expect(parseUser(local)).to.have.property('is_local', true)
	expect(parseUser(remote)).to.have.property('is_local', false)
	})
	+
	+ it('adds emojis to user name', () => {
	+ const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), display_name: 'The :thinking: thinker' })
	+
	+ const parsedUser = parseUser(user)
	+
	+ expect(parsedUser).to.have.property('name_html').that.contains('<img')
	+ })
	+
	+ it('adds emojis to user bio', () => {
	+ const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), note: 'Hello i like to :thinking: a lot' })
	+
	+ const parsedUser = parseUser(user)
	+
	+ expect(parsedUser).to.have.property('description_html').that.contains('<img')
	+ })
	})

	// We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI
	// is more of an afterthought
	describe('parseNotifications (QvitterAPI)', () => {
	it('correctly normalizes data to FE\'s format', () => {
	const notif = makeMockNotificationQvitter({
	id: 123,
	notice: makeMockStatusQvitter({ id: 444 }),
	from_profile: makeMockUserQvitter({ id: 'spurdo' })
	})
	expect(parseNotification(notif)).to.have.property('id', 123)
	expect(parseNotification(notif)).to.have.property('seen', false)
	expect(parseNotification(notif)).to.have.deep.property('status.id', '444')
	expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
	expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
	})

	it('correctly normalizes favorite notifications', () => {
	const notif = makeMockNotificationQvitter({
	id: 123,
	ntype: 'like',
	notice: makeMockStatusQvitter({
	id: 444,
	favorited_status: makeMockStatusQvitter({ id: 4412 })
	}),
	is_seen: 1,
	from_profile: makeMockUserQvitter({ id: 'spurdo' })
	})
	expect(parseNotification(notif)).to.have.property('id', 123)
	expect(parseNotification(notif)).to.have.property('type', 'like')
	expect(parseNotification(notif)).to.have.property('seen', true)
	expect(parseNotification(notif)).to.have.deep.property('status.id', '4412')
	expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
	expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
	})
	})
	+
	+ describe('MastoAPI emoji adder', () => {
	+ const emojis = makeMockEmojiMasto()
	+ const imageHtml = '<img src="https://example.com/image.png" alt="image" class="emoji" />'
	+ .replace(/"/g, '\'')
	+ const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" class="emoji" />'
	+ .replace(/"/g, '\'')
	+
	+ it('correctly replaces shortcodes in supplied string', () => {
	+ const result = addEmojis('This post has :image: emoji and :thinking: emoji', emojis)
	+ expect(result).to.include(thinkHtml)
	+ expect(result).to.include(imageHtml)
	+ })
	+
	+ it('handles consecutive emojis correctly', () => {
	+ const result = addEmojis('Lelel emoji spam :thinking::thinking::thinking::thinking:', emojis)
	+ expect(result).to.include(thinkHtml + thinkHtml + thinkHtml + thinkHtml)
	+ })
	+
	+ it('Doesn\'t replace nonexistent emojis', () => {
	+ const result = addEmojis('Admin add the :tenshi: emoji', emojis)
	+ expect(result).to.equal('Admin add the :tenshi: emoji')
	+ })
	+ })
	})

File Metadata

Mime Type: text/x-diff
Expires: Sat, Aug 8, 8:38 PM (1 d, 17 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1723952
Default Alt Text: (475 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions