,
, etc.)
+ // and replacing valid shortnames like :smile: and :wink: as well as unicode strings
+ // that _aren't_ within tags with an version.
+ // The goal is to be the same as an emojione.regShortNames/regUnicode replacement, but faster.
+ let i = -1;
+ let insideTag = false;
+ let insideShortname = false;
+ let shortnameStartIndex = -1;
+ let match;
+ while (++i < str.length) {
+ const char = str.charAt(i);
+ if (insideShortname && char === ':') {
+ const shortname = str.substring(shortnameStartIndex, i + 1);
+ if (shortname in emojione.emojioneList) {
+ const unicode = emojione.emojioneList[shortname].unicode[emojione.emojioneList[shortname].unicode.length - 1];
+ const alt = emojione.convert(unicode.toUpperCase());
+ const replacement = `
`;
+ str = str.substring(0, shortnameStartIndex) + replacement + str.substring(i + 1);
+ i += (replacement.length - shortname.length - 1); // jump ahead the length we've added to the string
+ } else {
+ i--; // stray colon, try again
+ }
+ insideShortname = false;
+ } else if (insideTag && char === '>') {
+ insideTag = false;
+ } else if (char === '<') {
+ insideTag = true;
+ insideShortname = false;
+ } else if (!insideTag && char === ':') {
+ insideShortname = true;
+ shortnameStartIndex = i;
+ } else if (!insideTag && (match = trie.search(str.substring(i)))) {
+ const unicodeStr = match;
+ if (unicodeStr in emojione.jsEscapeMap) {
+ const unicode = emojione.jsEscapeMap[unicodeStr];
+ const short = mappedUnicode[unicode];
+ const filename = emojione.emojioneList[short].fname;
+ const alt = emojione.convert(unicode.toUpperCase());
+ const replacement = `
`;
+ str = str.substring(0, i) + replacement + str.substring(i + unicodeStr.length);
+ i += (replacement.length - unicodeStr.length); // jump ahead the length we've added to the string
+ }
}
-
- const unicode = emojione.jsEscapeMap[unicodeChar];
- const short = mappedUnicode[unicode];
- const filename = emojione.emojioneList[short].fname;
- const alt = emojione.convert(unicode.toUpperCase());
-
- return ``;
- });
-};
-
-const shortnameToImage = str => str.replace(emojione.regShortNames, shortname => {
- if (typeof shortname === 'undefined' || shortname === '' || !(shortname in emojione.emojioneList)) {
- return shortname;
}
+ return str;
+}
- const unicode = emojione.emojioneList[shortname].unicode[emojione.emojioneList[shortname].unicode.length - 1];
- const alt = emojione.convert(unicode.toUpperCase());
-
- return ``;
-});
-
-export default function emojify(text) {
- return toImage(text);
-};
+export default emojify;
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 955d0000e7..3c8b63114f 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -9,11 +9,11 @@ import LoadingIndicator from '../../components/loading_indicator';
import Column from '../ui/components/column';
import HeaderContainer from './containers/header_container';
import ColumnBackButton from '../../components/column_back_button';
-import Immutable from 'immutable';
+import { List as ImmutableList } from 'immutable';
import ImmutablePureComponent from 'react-immutable-pure-component';
const mapStateToProps = (state, props) => ({
- statusIds: state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'items'], Immutable.List()),
+ statusIds: state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'items'], ImmutableList()),
isLoading: state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'isLoading']),
hasMore: !!state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'next']),
me: state.getIn(['meta', 'me']),
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index c83dbb63ec..83c66a5d59 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -2,6 +2,7 @@ import React from 'react';
import Dropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';
+import { EmojiPicker as EmojiPickerAsync } from '../../ui/util/async-components';
const messages = defineMessages({
emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' },
@@ -50,7 +51,7 @@ export default class EmojiPickerDropdown extends React.PureComponent {
this.setState({ active: true });
if (!EmojiPicker) {
this.setState({ loading: true });
- import(/* webpackChunkName: "emojione_picker" */ 'emojione-picker').then(TheEmojiPicker => {
+ EmojiPickerAsync().then(TheEmojiPicker => {
EmojiPicker = TheEmojiPicker.default;
this.setState({ loading: false });
}).catch(() => {
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 3ec205f2c2..69bead689f 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -2,6 +2,7 @@ import React from 'react';
import ComposeFormContainer from './containers/compose_form_container';
import NavigationContainer from './containers/navigation_container';
import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import { mountCompose, unmountCompose } from '../../actions/compose';
import { openModal } from '../../actions/modal';
@@ -15,6 +16,8 @@ import SearchResultsContainer from './containers/search_results_container';
const messages = defineMessages({
start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
+ home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
+ notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
@@ -22,6 +25,7 @@ const messages = defineMessages({
});
const mapStateToProps = state => ({
+ columns: state.getIn(['settings', 'columns']),
showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
});
@@ -31,6 +35,7 @@ export default class Compose extends React.PureComponent {
static propTypes = {
dispatch: PropTypes.func.isRequired,
+ columns: ImmutablePropTypes.list.isRequired,
multiColumn: PropTypes.bool,
showSearch: PropTypes.bool,
intl: PropTypes.object.isRequired,
@@ -60,11 +65,22 @@ export default class Compose extends React.PureComponent {
let header = '';
if (multiColumn) {
+ const { columns } = this.props;
header = (
/g, '\n').replace(/<\/p>
/g, '\n\n');
normalStatus.search_index = new DOMParser().parseFromString(searchContent, 'text/html').documentElement.textContent;
- return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(normalStatus)));
+ return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus)));
};
const normalizeStatuses = (state, statuses) => {
@@ -82,7 +82,7 @@ const filterStatuses = (state, relationship) => {
return state;
};
-const initialState = Immutable.Map();
+const initialState = ImmutableMap();
export default function statuses(state = initialState, action) {
switch(action.type) {
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 1b738a16aa..065e89f961 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -15,25 +15,25 @@ import {
ACCOUNT_BLOCK_SUCCESS,
ACCOUNT_MUTE_SUCCESS,
} from '../actions/accounts';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
-const initialState = Immutable.Map();
+const initialState = ImmutableMap();
-const initialTimeline = Immutable.Map({
+const initialTimeline = ImmutableMap({
unread: 0,
online: false,
top: true,
loaded: false,
isLoading: false,
next: false,
- items: Immutable.List(),
+ items: ImmutableList(),
});
const normalizeTimeline = (state, timeline, statuses, next) => {
- const ids = Immutable.List(statuses.map(status => status.get('id')));
+ const ids = ImmutableList(statuses.map(status => status.get('id')));
const wasLoaded = state.getIn([timeline, 'loaded']);
const hadNext = state.getIn([timeline, 'next']);
- const oldIds = state.getIn([timeline, 'items'], Immutable.List());
+ const oldIds = state.getIn([timeline, 'items'], ImmutableList());
return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
mMap.set('loaded', true);
@@ -44,8 +44,8 @@ const normalizeTimeline = (state, timeline, statuses, next) => {
};
const appendNormalizedTimeline = (state, timeline, statuses, next) => {
- const ids = Immutable.List(statuses.map(status => status.get('id')));
- const oldIds = state.getIn([timeline, 'items'], Immutable.List());
+ const ids = ImmutableList(statuses.map(status => status.get('id')));
+ const oldIds = state.getIn([timeline, 'items'], ImmutableList());
return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
mMap.set('isLoading', false);
@@ -56,7 +56,7 @@ const appendNormalizedTimeline = (state, timeline, statuses, next) => {
const updateTimeline = (state, timeline, status, references) => {
const top = state.getIn([timeline, 'top']);
- const ids = state.getIn([timeline, 'items'], Immutable.List());
+ const ids = state.getIn([timeline, 'items'], ImmutableList());
const includesId = ids.includes(status.get('id'));
const unread = state.getIn([timeline, 'unread'], 0);
@@ -124,11 +124,11 @@ export default function timelines(state = initialState, action) {
case TIMELINE_EXPAND_FAIL:
return state.update(action.timeline, initialTimeline, map => map.set('isLoading', false));
case TIMELINE_REFRESH_SUCCESS:
- return normalizeTimeline(state, action.timeline, Immutable.fromJS(action.statuses), action.next);
+ return normalizeTimeline(state, action.timeline, fromJS(action.statuses), action.next);
case TIMELINE_EXPAND_SUCCESS:
- return appendNormalizedTimeline(state, action.timeline, Immutable.fromJS(action.statuses), action.next);
+ return appendNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next);
case TIMELINE_UPDATE:
- return updateTimeline(state, action.timeline, Immutable.fromJS(action.status), action.references);
+ return updateTimeline(state, action.timeline, fromJS(action.status), action.references);
case TIMELINE_DELETE:
return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
case ACCOUNT_BLOCK_SUCCESS:
diff --git a/app/javascript/mastodon/reducers/user_lists.js b/app/javascript/mastodon/reducers/user_lists.js
index 83bf1be1bc..8db18c5dc6 100644
--- a/app/javascript/mastodon/reducers/user_lists.js
+++ b/app/javascript/mastodon/reducers/user_lists.js
@@ -20,22 +20,22 @@ import {
MUTES_FETCH_SUCCESS,
MUTES_EXPAND_SUCCESS,
} from '../actions/mutes';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
-const initialState = Immutable.Map({
- followers: Immutable.Map(),
- following: Immutable.Map(),
- reblogged_by: Immutable.Map(),
- favourited_by: Immutable.Map(),
- follow_requests: Immutable.Map(),
- blocks: Immutable.Map(),
- mutes: Immutable.Map(),
+const initialState = ImmutableMap({
+ followers: ImmutableMap(),
+ following: ImmutableMap(),
+ reblogged_by: ImmutableMap(),
+ favourited_by: ImmutableMap(),
+ follow_requests: ImmutableMap(),
+ blocks: ImmutableMap(),
+ mutes: ImmutableMap(),
});
const normalizeList = (state, type, id, accounts, next) => {
- return state.setIn([type, id], Immutable.Map({
+ return state.setIn([type, id], ImmutableMap({
next,
- items: Immutable.List(accounts.map(item => item.id)),
+ items: ImmutableList(accounts.map(item => item.id)),
}));
};
@@ -56,22 +56,22 @@ export default function userLists(state = initialState, action) {
case FOLLOWING_EXPAND_SUCCESS:
return appendToList(state, 'following', action.id, action.accounts, action.next);
case REBLOGS_FETCH_SUCCESS:
- return state.setIn(['reblogged_by', action.id], Immutable.List(action.accounts.map(item => item.id)));
+ return state.setIn(['reblogged_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
case FAVOURITES_FETCH_SUCCESS:
- return state.setIn(['favourited_by', action.id], Immutable.List(action.accounts.map(item => item.id)));
+ return state.setIn(['favourited_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
case FOLLOW_REQUESTS_FETCH_SUCCESS:
- return state.setIn(['follow_requests', 'items'], Immutable.List(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
+ return state.setIn(['follow_requests', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
case FOLLOW_REQUESTS_EXPAND_SUCCESS:
return state.updateIn(['follow_requests', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
case FOLLOW_REQUEST_REJECT_SUCCESS:
return state.updateIn(['follow_requests', 'items'], list => list.filterNot(item => item === action.id));
case BLOCKS_FETCH_SUCCESS:
- return state.setIn(['blocks', 'items'], Immutable.List(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
+ return state.setIn(['blocks', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
case BLOCKS_EXPAND_SUCCESS:
return state.updateIn(['blocks', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
case MUTES_FETCH_SUCCESS:
- return state.setIn(['mutes', 'items'], Immutable.List(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
+ return state.setIn(['mutes', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
case MUTES_EXPAND_SUCCESS:
return state.updateIn(['mutes', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
default:
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 07d9a2629b..d26d1b727f 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -1,5 +1,5 @@
import { createSelector } from 'reselect';
-import Immutable from 'immutable';
+import { List as ImmutableList } from 'immutable';
const getAccountBase = (state, id) => state.getIn(['accounts', id], null);
const getAccountCounters = (state, id) => state.getIn(['accounts_counters', id], null);
@@ -73,10 +73,10 @@ export const makeGetNotification = () => {
};
export const getAccountGallery = createSelector([
- (state, id) => state.getIn(['timelines', `account:${id}:media`, 'items'], Immutable.List()),
+ (state, id) => state.getIn(['timelines', `account:${id}:media`, 'items'], ImmutableList()),
state => state.get('statuses'),
], (statusIds, statuses) => {
- let medias = Immutable.List();
+ let medias = ImmutableList();
statusIds.forEach(statusId => {
const status = statuses.get(statusId);
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index 9d63d8f982..a0cb91ae4b 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -1,2 +1,7 @@
import { start } from 'rails-ujs';
+
+// import default stylesheet with variables
+require('font-awesome/css/font-awesome.css');
+require('mastodon-application-style');
+
start();
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 8a3ae0b3cf..06cc1b53ac 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -5,6 +5,9 @@ import emojify from '../mastodon/emoji';
import { getLocale } from '../mastodon/locales';
import loadPolyfills from '../mastodon/load_polyfills';
import { processBio } from '../glitch/util/bio_metadata';
+import TimelineContainer from '../mastodon/containers/timeline_container';
+import React from 'react';
+import ReactDOM from 'react-dom';
require.context('../images/', true);
@@ -37,6 +40,13 @@ function loaded() {
const datetime = new Date(content.getAttribute('datetime'));
content.textContent = relativeFormat.format(datetime);;
});
+
+ const mountNode = document.getElementById('mastodon-timeline');
+
+ if (mountNode !== null) {
+ const props = JSON.parse(mountNode.getAttribute('data-props'));
+ ReactDOM.render(
Pour confirmer votre inscription, merci de cliquer sur le lien suivant :
<%= link_to 'Confirmer mon compte', confirmation_url(@resource, confirmation_token: @token) %>
Après votre première connexion, vous pourrez accéder à la documentation de l'outil.
+Après votre première connexion, vous pourrez accéder à la documentation de l’outil.
Pensez également à jeter un œil à nos <%= link_to 'conditions d\'utilisation', terms_url %>.
Amicalement,
-L'équipe <%= @instance %>
\ No newline at end of file +L’équipe <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.fr.text.erb b/app/views/user_mailer/confirmation_instructions.fr.text.erb index cf8e39689c..7730715f8d 100644 --- a/app/views/user_mailer/confirmation_instructions.fr.text.erb +++ b/app/views/user_mailer/confirmation_instructions.fr.text.erb @@ -5,10 +5,10 @@ Vous venez de vous créer un compte sur <%= @instance %> et nous vous en remerci Pour confirmer votre inscription, merci de cliquer sur le lien suivant : <%= confirmation_url(@resource, confirmation_token: @token) %> -Après votre première connexion, vous pourrez accéder à la documentation de l'outil. +Après votre première connexion, vous pourrez accéder à la documentation de l’outil. -Pour rappel, nos conditions d'utilisation sont indiquées ici <%= terms_url %> +Pour rappel, nos conditions d’utilisation sont indiquées ici <%= terms_url %> Amicalement, -L'équipe <%= @instance %> \ No newline at end of file +L’équipe <%= @instance %> diff --git a/app/views/user_mailer/password_change.pl.html.erb b/app/views/user_mailer/password_change.pl.html.erb index 46423483a0..a7cb15a05e 100644 --- a/app/views/user_mailer/password_change.pl.html.erb +++ b/app/views/user_mailer/password_change.pl.html.erb @@ -1,3 +1,3 @@Witaj, <%= @resource.email %>!
-Informujemy, że ostatnio zmieniono Twoje hasło Mastodona.
+Informujemy, że ostatnio zmieniono Twoje hasło na <%= @instance %>.
diff --git a/app/views/user_mailer/password_change.pl.text.erb b/app/views/user_mailer/password_change.pl.text.erb index 85d5e11752..bd2efee0f3 100644 --- a/app/views/user_mailer/password_change.pl.text.erb +++ b/app/views/user_mailer/password_change.pl.text.erb @@ -1,3 +1,3 @@ Witaj, <%= @resource.email %>! -Informujemy, że ostatnio zmieniono Twoje hasło Mastodona. +Informujemy, że ostatnio zmieniono Twoje hasło na <%= @instance %>. diff --git a/app/views/user_mailer/reset_password_instructions.fr.html.erb b/app/views/user_mailer/reset_password_instructions.fr.html.erb index 95789e3879..db55c58848 100644 --- a/app/views/user_mailer/reset_password_instructions.fr.html.erb +++ b/app/views/user_mailer/reset_password_instructions.fr.html.erb @@ -1,8 +1,8 @@Bonjour <%= @resource.email %> !
-Quelqu'un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous.
+Quelqu’un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous.
<%= link_to 'Modifier mon mot de passe', edit_password_url(@resource, reset_password_token: @token) %>
-Si vous n'êtes pas à l'origine de cette demande, vous pouvez ignorer ce message.
-Votre mot de passe ne sera pas modifié tant que vous n'accéderez pas au lien ci-dessus et n'en choisirez pas un nouveau.
+Si vous n’êtes pas à l’origine de cette demande, vous pouvez ignorer ce message.
+Votre mot de passe ne sera pas modifié tant que vous n’accéderez pas au lien ci-dessus et n’en choisirez pas un nouveau.
diff --git a/app/views/user_mailer/reset_password_instructions.fr.text.erb b/app/views/user_mailer/reset_password_instructions.fr.text.erb index 73160cb4c1..07fa3644a5 100644 --- a/app/views/user_mailer/reset_password_instructions.fr.text.erb +++ b/app/views/user_mailer/reset_password_instructions.fr.text.erb @@ -1,8 +1,8 @@ Bonjour <%= @resource.email %> ! -Quelqu'un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous. +Quelqu’un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous. <%= edit_password_url(@resource, reset_password_token: @token) %> -Si vous n'êtes pas à l'origine de cette demande, vous pouvez ignorer ce message. -Votre mot de passe ne sera pas modifié tant que vous n'accéderez pas au lien ci-dessus et n'en choisirez pas un nouveau. +Si vous n’êtes pas à l’origine de cette demande, vous pouvez ignorer ce message. +Votre mot de passe ne sera pas modifié tant que vous n’accéderez pas au lien ci-dessus et n’en choisirez pas un nouveau. diff --git a/app/views/user_mailer/reset_password_instructions.pl.html.erb b/app/views/user_mailer/reset_password_instructions.pl.html.erb index f4d67c724f..2a9913a1d5 100644 --- a/app/views/user_mailer/reset_password_instructions.pl.html.erb +++ b/app/views/user_mailer/reset_password_instructions.pl.html.erb @@ -1,6 +1,7 @@Witaj, <%= @resource.email %>!
-Ktoś próbował zmienić Twoje hasło na Mastodonie. Możesz zrobić to klikając w poniższy link.
+Ktoś próbował zmienić Twoje hasło na <%= @instance %>. Możesz zrobić to klikając w +poniższy link.
<%= link_to 'Zmień moje hasło', edit_password_url(@resource, reset_password_token: @token) %>
diff --git a/app/views/user_mailer/reset_password_instructions.pl.text.erb b/app/views/user_mailer/reset_password_instructions.pl.text.erb index 78d1cab0b2..2b34afc489 100644 --- a/app/views/user_mailer/reset_password_instructions.pl.text.erb +++ b/app/views/user_mailer/reset_password_instructions.pl.text.erb @@ -1,6 +1,7 @@ Witaj, <%= @resource.email %>! -Ktoś próbował zmienić Twoje hasło na Mastodonie. Możesz zrobić to klikając w poniższy link. +Ktoś próbował zmienić Twoje hasło na <%= @instance %>. Możesz zrobić to klikając w +poniższy link. <%= edit_password_url(@resource, reset_password_token: @token) %> diff --git a/app/workers/pubsubhubbub/subscribe_worker.rb b/app/workers/pubsubhubbub/subscribe_worker.rb index 5b0956b6bb..6865e71360 100644 --- a/app/workers/pubsubhubbub/subscribe_worker.rb +++ b/app/workers/pubsubhubbub/subscribe_worker.rb @@ -3,7 +3,20 @@ class Pubsubhubbub::SubscribeWorker include Sidekiq::Worker - sidekiq_options queue: 'push' + sidekiq_options queue: 'push', retry: 10, unique: :until_executed + + sidekiq_retry_in do |count| + case count + when 0 + 30.minutes.seconds + when 1 + 2.hours.seconds + when 2 + 12.hours.seconds + else + 24.hours.seconds * (count - 2) + end + end def perform(account_id) account = Account.find(account_id) diff --git a/app/workers/push_update_worker.rb b/app/workers/push_update_worker.rb index fbcdcf6341..697cbd6a6b 100644 --- a/app/workers/push_update_worker.rb +++ b/app/workers/push_update_worker.rb @@ -6,7 +6,7 @@ class PushUpdateWorker def perform(account_id, status_id) account = Account.find(account_id) status = Status.find(status_id) - message = InlineRenderer.render(status, account, 'api/v1/statuses/show') + message = InlineRenderer.render(status, account, :status) Redis.current.publish("timeline:#{account.id}", Oj.dump(event: :update, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i)) rescue ActiveRecord::RecordNotFound diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server index a867f2c013..0beec31753 100755 --- a/bin/webpack-dev-server +++ b/bin/webpack-dev-server @@ -23,7 +23,7 @@ end begin dev_server = YAML.load_file(CONFIG_FILE)["development"]["dev_server"] - DEV_SERVER_HOST = "http#{"s" if args('--https') || dev_server["https"]}://#{args('--host') || dev_server["host"]}:#{args('--port') || dev_server["port"]}" + DEV_SERVER_HOST = "http#{"s" if args('--https') || dev_server["https"]}://#{dev_server["host"]}:#{args('--port') || dev_server["port"]}" rescue Errno::ENOENT, NoMethodError puts "Webpack dev_server configuration not found in #{CONFIG_FILE}." diff --git a/boxfile.yml b/boxfile.yml index ef847d4a03..3302231109 100644 --- a/boxfile.yml +++ b/boxfile.yml @@ -153,8 +153,59 @@ worker.sidekiq: data.db: image: nanobox/postgresql:9.5 + cron: + - id: backup + schedule: '0 3 * * *' + command: | + PGPASSWORD=${DATA_POSTGRES_PASS} pg_dump -U ${DATA_POSTGRES_USER} -w -Fc -O gonano | + gzip | + curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).sql.gz --data-binary @- && + curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ | + json_pp | + grep ${HOSTNAME} | + sort | + head -n-${BACKUP_COUNT:-1} | + sed 's/.*: "\(.*\)".*/\1/' | + while read file + do + curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE + done + data.redis: image: nanobox/redis:3.0 + cron: + - id: backup + schedule: '0 3 * * *' + command: | + curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).rdb --data-binary @/data/var/db/redis/dump.rdb && + curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ | + json_pp | + grep ${HOSTNAME} | + sort | + head -n-${BACKUP_COUNT:-1} | + sed 's/.*: "\(.*\)".*/\1/' | + while read file + do + curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE + done + data.storage: image: nanobox/unfs:0.9 + + cron: + - id: backup + schedule: '0 3 * * *' + command: | + tar cz -C /data/var/db/unfs/ | + curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).tgz --data-binary @- && + curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ | + json_pp | + grep ${HOSTNAME} | + sort | + head -n-${BACKUP_COUNT:-1} | + sed 's/.*: "\(.*\)".*/\1/' | + while read file + do + curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE + done diff --git a/config/application.rb b/config/application.rb index dd63017b3c..ed5fdb7f70 100644 --- a/config/application.rb +++ b/config/application.rb @@ -45,6 +45,7 @@ module Mastodon :io, :it, :ja, + :ko, :nl, :no, :oc, diff --git a/config/environments/development.rb b/config/environments/development.rb index c81cf7bbed..406fa970b2 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -62,6 +62,8 @@ Rails.application.configure do # routes, locales, etc. This feature depends on the listen gem. # config.file_watcher = ActiveSupport::EventedFileUpdateChecker + config.action_mailer.default_options = { from: 'notifications@localhost' } + # If using a Heroku, Vagrant or generic remote development environment, # use letter_opener_web, accessible at /letter_opener. # Otherwise, use letter_opener, which launches a browser window to view sent mail. diff --git a/config/environments/production.rb b/config/environments/production.rb index 68229531d2..d71e410bf8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -73,6 +73,8 @@ Rails.application.configure do config.action_mailer.perform_caching = false # E-mails + config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS') } + config.action_mailer.smtp_settings = { :port => ENV['SMTP_PORT'], :address => ENV['SMTP_SERVER'], diff --git a/config/environments/test.rb b/config/environments/test.rb index db98263a64..bde69eba15 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -30,6 +30,8 @@ Rails.application.configure do config.action_controller.allow_forgery_protection = false config.action_mailer.perform_caching = false + config.action_mailer.default_options = { from: 'notifications@localhost' } + # Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. diff --git a/config/initializers/active_model_serializers.rb b/config/initializers/active_model_serializers.rb new file mode 100644 index 0000000000..b0230267d4 --- /dev/null +++ b/config/initializers/active_model_serializers.rb @@ -0,0 +1,3 @@ +ActiveModelSerializers.config.tap do |config| + config.default_includes = '**' +end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index d51471d308..bf61ea0ea3 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -1,17 +1,29 @@ Warden::Manager.after_set_user except: :fetch do |user, warden| - SessionActivation.deactivate warden.raw_session['auth_id'] - warden.raw_session['auth_id'] = user.activate_session(warden.request) + SessionActivation.deactivate warden.cookies.signed['_session_id'] + + warden.cookies.signed['_session_id'] = { + value: user.activate_session(warden.request), + expires: 1.year.from_now, + httponly: true, + } end Warden::Manager.after_fetch do |user, warden| - unless user.session_active?(warden.raw_session['auth_id']) + if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']) + warden.cookies.signed['_session_id'] = { + value: warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'], + expires: 1.year.from_now, + httponly: true, + } + else warden.logout throw :warden, message: :unauthenticated end end Warden::Manager.before_logout do |_, warden| - SessionActivation.deactivate warden.raw_session['auth_id'] + SessionActivation.deactivate warden.cookies.signed['_session_id'] + warden.cookies.delete('_session_id') end Devise.setup do |config| diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index ca7531748e..5983918cd4 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -50,14 +50,14 @@ SimpleForm.setup do |config| # b.use :full_error, wrap_with: { tag: :span, class: :error } end - config.wrappers :with_label, class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b| + config.wrappers :with_label, class: [:input, :with_label], hint_class: :field_with_hint, error_class: :field_with_errors do |b| b.use :html5 b.use :label_input, wrap_with: { tag: :div, class: :label_input } b.use :hint, wrap_with: { tag: :span, class: :hint } b.use :error, wrap_with: { tag: :span, class: :error } end - config.wrappers :with_block_label, class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b| + config.wrappers :with_block_label, class: [:input, :with_block_label], hint_class: :field_with_hint, error_class: :field_with_errors do |b| b.use :html5 b.use :label b.use :hint, wrap_with: { tag: :span, class: :hint } diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml new file mode 100644 index 0000000000..858777c0e4 --- /dev/null +++ b/config/locales/activerecord.fr.yml @@ -0,0 +1,12 @@ +fr: + activerecord: + errors: + models: + account: + attributes: + username: + invalid: seulement des lettres, des nombres et des tirets bas + status: + attributes: + reblog: + taken: du statut existe déjà diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml index 6e6b48496b..975912f0f2 100644 --- a/config/locales/activerecord.ja.yml +++ b/config/locales/activerecord.ja.yml @@ -1,5 +1,8 @@ ja: activerecord: + attributes: + user: + email: メールアドレス errors: models: account: diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml index 627f612bb5..f82e1b8758 100644 --- a/config/locales/activerecord.pl.yml +++ b/config/locales/activerecord.pl.yml @@ -1,5 +1,8 @@ pl: activerecord: + attributes: + user: + email: adres e-mail errors: models: account: diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 4d045dee1e..d395dc9c37 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -3,23 +3,12 @@ ar: about: about_mastodon: ماستدون شبكة إجتماعية حرة و مفتوحة المصدر. هو بديل لامركزي لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في الشبكات الاجتماعية بكل شفافية. about_this: عن مثيل الخادوم هذا - apps: التطبيقات business_email: 'البريد الإلكتروني المهني :' closed_registrations: التسجيلات في مثيل الخادوم هذا مُغلقة حاليًا. contact: للتواصل معنا description_headline: ما هو %{domain}? domain_count_after: خوادم أخرى domain_count_before: متصل بـ - features: - api: واجهة برمجة مفتوحة للتطبيقات والخدمات - blocks: نص منسق وأدوات كتم - characters: 500 حرف في كل رسالة - chronology: خيوط متسلسلة زمنيا - ethics: 'تصميم أخلاقي : لا إعلانات و لا تعقُّب' - gifv: مجموعات صور GIFV وأشرطة فيديو قصيرة - privacy: إعدادات مدققة لخصوصية كل منشور - public: الخيوط الزمنية العمومية - features_headline: ما الذي يجعل ماستدون فريدًا ؟ get_started: إبدأ الآن links: الروابط other_instances: خوادم أخرى @@ -93,7 +82,7 @@ ar: blocking: قائمة المحظورين following: قائمة المستخدمين المتبوعين upload: تحميل - landing_strip_html: %{name} is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse.. + landing_strip_html: "%{name} is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse.." landing_strip_signup_html: If you don't, you can sign up here. media_attachments: validations: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 76d6a26051..042d609b03 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -3,23 +3,12 @@ bg: about: about_mastodon: Mastodon е безплатен сървър с отворен код за социални мрежи. Като децентрализирана алтернатива на комерсиалните платформи, той позволява избягването на риска от монополизация на твоята комуникация от единични компании. Изберете си сървър, на който се доверявате, и ще можете да контактувате с всички останали. Всеки може да пусне Mastodon и лесно да вземе участие в социалната мрежа. about_this: За тази инстанция - apps: Приложения business_email: 'Служебен e-mail:' closed_registrations: В момента регистрациите за тази инстанция са затворени. contact: За контакти description_headline: Какво е %{domain}? domain_count_after: други инстанции domain_count_before: Свързани към - features: - api: Отворено API за приложения и услуги - blocks: Богат на инструменти за блокиране и заглушаване - characters: Публикации от 500 символа - chronology: Публикациите се показват хронологично - ethics: 'Етичен дизайн: без реклами и проследяване' - gifv: GIFV комплекти и кратки видео клипове - privacy: Настройване на поверителността за всяка публикация - public: Публични канали - features_headline: Какво откроява Mastodon get_started: Първи стъпки links: Връзки other_instances: Други инстанции @@ -93,7 +82,7 @@ bg: blocking: Списък на блокираните following: Списък на последователите upload: Качване - landing_strip_html: %{name} е потребител от %{link_to_root_path}. Можеш да ги следваш, или да контактуваш с тях, ако имаш акаунт където и да е из федерираната вселена на Mastodon. + landing_strip_html: "%{name} е потребител от %{link_to_root_path}. Можеш да ги следваш, или да контактуваш с тях, ако имаш акаунт където и да е из федерираната вселена на Mastodon." landing_strip_signup_html: Ако нямаш акаунт, можеш да си създадеш ето тук. media_attachments: validations: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 2fbc63ef9b..f63aee3e68 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -3,23 +3,12 @@ ca: about: about_mastodon: Mastodon és un servidor de xarxa social lliure i de codi obert. Una alternativa descentralitzada a plataformes comercials, que evita el risc que una única companyia monopolitzi la teva comunicació. Qualsevol pot executar Mastodon i participar sense problemes en la xarxa social. about_this: Sobre aquesta instància - apps: Apps business_email: 'Adreça de contacte:' closed_registrations: Els registres estan actualment tancats en aquesta instància. contact: Contacte description_headline: Què es %{domain}? domain_count_after: altres instàncies domain_count_before: Connectat a - features: - api: API pública per a aplicacions i serveis - blocks: Moderació de contingut - characters: 500 caràcters per publicació - chronology: Les histories son cronològiques - ethics: 'Disseny ètic: sense anuncis, sense rastrejos' - gifv: Vídeos curts i GIFV - privacy: Configuracions de privacitat ajustables - public: Història federada - features_headline: El que distingeix a Mastodon get_started: Començar links: Vincles other_instances: Altres instàncies @@ -166,17 +155,13 @@ ca: settings: contact_information: email: Introduir una adreça de correu electrònic pùblica - label: Informació de contacte username: Introduir un nom d'usuari registrations: closed_message: desc_html: Apareix en la primera pàgina quan es tanquen els registresPot utilitzar etiquetes HTML title: Missatge de registre tancat open: - disabled: Desactivat - enabled: Activat title: Registre obert - setting: Ajust site_description: desc_html: Es mostra com un paràgraf a la pàgina principal i s'utilitza com una etiqueta meta.
Pots utilitzar etiquetes HTML, en particular
<a> i <em>.
title: Descripció del lloc
@@ -203,8 +188,8 @@ ca:
change_password: Canviar contrasenya
delete_account: Esborrar el compte
delete_account_html: Si vols esborrar el teu compte pots fer-ho aquí. S'et demanarà confirmació.
- didnt_get_confirmation: "No vas rebre el correu de confirmació?"
- forgot_password: "Has oblidat la contrasenya?"
+ didnt_get_confirmation: No vas rebre el correu de confirmació?
+ forgot_password: Has oblidat la contrasenya?
login: Iniciar sessió
logout: Tancar sessió
register: Enregistrarse
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f2841d0b7f..b084aca315 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3,23 +3,12 @@ de:
about:
about_mastodon: Mastodon ist ein freier, quelloffener sozialer Netzwerkserver. Als dezentralisierte Alternative zu kommerziellen Plattformen verhindert es die Risiken, die entstehen, wenn eine einzelne Firma deine Kommunikation monopolisiert. Jeder kann Mastodon verwenden und ganz einfach am sozialen Netzwerk teilnehmen.
about_this: Über diese Instanz
- apps: Apps
business_email: 'Geschäftliche E-Mail:'
closed_registrations: Die Registrierung ist auf dieser Instanz momentan geschlossen.
contact: Kontakt
description_headline: Was ist %{domain}?
domain_count_after: andere Instanzen
domain_count_before: Verbunden mit
- features:
- api: Offene API für Apps und Dienste
- blocks: Mächtige Block- und Stummschaltungswerkzeuge
- characters: 500 Zeichen pro Beitrag
- chronology: Zeitleisten sind chronologisch
- ethics: 'Ethisches Design: keine Werbung, kein Tracking'
- gifv: GIFV-Sets und kurze Videos
- privacy: Granulare Privatsphäre-Einstellungen für jeden Beitrag
- public: Öffentliche Zeitleisten
- features_headline: Was Mastodon einzigartig macht
get_started: Erste Schritte
links: Links
other_instances: Andere Instanzen
@@ -140,17 +129,13 @@ de:
settings:
contact_information:
email: Eine öffentliche E-Mail-Adresse angeben
- label: Kontaktinformationen
username: Einen Benutzernamen angeben
registrations:
closed_message:
desc_html: Wird auf der Frontseite angezeigt, wenn die Registrierung geschlossen istDu kannst HTML-Tags benutzen title: Nachricht über geschlossene Registrierung open: - disabled: Deaktiviert - enabled: Aktiviert title: Offene Registrierung - setting: Einstellung site_description: desc_html: Wird als Absatz auf der Frontseite angezeigt und als Meta-Tag benutzt.
Du kannst HTML-Tags benutzen, insbesondere
<a> und <em>.
title: Seitenbeschreibung
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index c4dbc62e0e..6805e4f38b 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -3,8 +3,8 @@ fr:
devise:
confirmations:
confirmed: Votre compte a été validé.
- send_instructions: Vous allez recevoir les instructions nécessaires à la confirmation de votre compte dans quelques minutes.
- send_paranoid_instructions: Si votre adresse e-mail existe dans notre base de données, vous allez bientôt recevoir un courriel contenant les instructions de confirmation de votre compte.
+ send_instructions: Vous allez recevoir les instructions nécessaires à la confirmation de votre compte dans quelques minutes. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
+ send_paranoid_instructions: Si votre adresse électronique existe dans notre base de données, vous allez bientôt recevoir un courriel contenant les instructions de confirmation de votre compte. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
failure:
already_authenticated: Vous êtes déjà connecté⋅e
inactive: Votre compte n’est pas encore activé.
@@ -25,12 +25,12 @@ fr:
unlock_instructions:
subject: Instructions pour déverrouiller votre compte
omniauth_callbacks:
- failure: 'Nous n’avons pas pu vous authentifier via %{kind} : ''%{reason}''.'
+ failure: 'Nous n’avons pas pu vous authentifier via %{kind} : ''%{reason}''.'
success: Authentifié avec succès via %{kind}.
passwords:
- no_token: Vous ne pouvez accéder à cette page sans passer par un courriel de réinitialisation de mot de passe. Si vous êtes passé⋅e par un courriel de ce type, assurez-vous d'utiliser l'URL complète.
- send_instructions: Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants
- send_paranoid_instructions: Si votre addresse e-mail existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel
+ no_token: Vous ne pouvez accéder à cette page sans passer par un courriel de réinitialisation de mot de passe. Si vous êtes passé⋅e par un courriel de ce type, assurez-vous d’utiliser l’URL complète.
+ send_instructions: Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
+ send_paranoid_instructions: Si votre addresse électronique existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
updated: Votre mot de passe a été modifié avec succès, vous êtes maintenant connecté⋅e
updated_not_active: Votre mot de passe a été modifié avec succès.
registrations:
@@ -46,8 +46,8 @@ fr:
signed_in: Connecté.
signed_out: Déconnecté.
unlocks:
- send_instructions: Vous allez recevoir les instructions nécessaires au déverrouillage de votre compte dans quelques instants
- send_paranoid_instructions: Si votre compte existe, vous allez bientôt recevoir un courriel contenant les instructions pour le déverrouiller.
+ send_instructions: Vous allez recevoir les instructions nécessaires au déverrouillage de votre compte dans quelques instants. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
+ send_paranoid_instructions: Si votre compte existe, vous allez bientôt recevoir un courriel contenant les instructions pour le déverrouiller. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
unlocked: Votre compte a été déverrouillé avec succès, vous êtes maintenant connecté⋅e.
errors:
messages:
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index 792e0d81e4..1c692f7a87 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -8,10 +8,10 @@ pl:
failure:
already_authenticated: Jesteś już zalogowany/zalogowana.
inactive: Twoje konto nie zostało jeszcze aktywowane.
- invalid: Błędne %{authentication_keys} lub hasło.
+ invalid: Nieprawidłowy %{authentication_keys} lub hasło.
last_attempt: Masz jeszcze jedną próbę; Twoje konto zostanie zablokowane jeśli się nie powiedzie.
locked: Twoje konto zostało zablokowane.
- not_found_in_database: Błędne %{authentication_keys} lub hasło.
+ not_found_in_database: Nieprawidłowy %{authentication_keys} lub hasło.
timeout: Twoja sesja wygasła. Zaloguj się ponownie aby kontynuować..
unauthenticated: Zapisz się lub zaloguj aby kontynuować.
unconfirmed: Zweryfikuj adres e-mail aby kontynuować.
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 24538bc485..0e74532c15 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -6,12 +6,12 @@ fr:
remote_follow:
attributes:
acct:
- blank: Le nom d'utilisateur ne doit pas être vide
+ blank: Le nom d’utilisateur ne doit pas être vide
activerecord:
attributes:
doorkeeper/application:
name: Nom
- redirect_uri: L'URL de redirection
+ redirect_uri: L’URL de redirection
errors:
messages:
record_invalid: Données invalides
@@ -50,17 +50,17 @@ fr:
edit: Modifier
submit: Envoyer
confirmations:
- destroy: Êtes-vous certain ?
+ destroy: Êtes-vous certain·e ?
edit:
- title: Modifier l'application
+ title: Modifier l’application
form:
- error: Oups ! Vérifier votre formulaire pour des erreurs possibles
+ error: Oups ! Vérifier votre formulaire pour des erreurs possibles
help:
native_redirect_uri: Utiliser %{native_redirect_uri} pour les tests locaux
redirect_uri: Utiliser une ligne par URL
scopes: Séparer les portées avec des espaces. Laisser vide pour utiliser les portées par défaut.
index:
- callback_url: URL de retour d'appel
+ callback_url: URL de retour d’appel
name: Nom
new: Nouvelle application
title: Vos applications
@@ -68,11 +68,11 @@ fr:
title: Nouvelle application
show:
actions: Actions
- application_id: ID de l'application
- callback_urls: URL du retour d'appel
+ application_id: ID de l’application
+ callback_urls: URL du retour d’appel
scopes: Portées
secret: Secret
- title: 'Application : %{name}'
+ title: 'Application : %{name}'
authorizations:
buttons:
authorize: Autoriser
@@ -81,15 +81,15 @@ fr:
title: Une erreur est survenue
new:
able_to: Cette application pourra
- prompt: Autoriser %{client_name} à utiliser votre compte ?
+ prompt: Autoriser %{client_name} à utiliser votre compte ?
title: Autorisation requise
show:
- title: Code d'autorisation
+ title: Code d’autorisation
authorized_applications:
buttons:
revoke: Annuler
confirmations:
- revoke: Êtes-vous certain ?
+ revoke: Êtes-vous certain·e ?
index:
application: Application
created_at: Créé le
@@ -98,24 +98,24 @@ fr:
title: Vos applications autorisées
errors:
messages:
- access_denied: Le propriétaire de la ressource ou le serveur d'autorisation a refusé la requête.
- credential_flow_not_configured: Le flux des identifiants du mot de passe du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n'est pas configuré.
- invalid_client: L'authentification du client a échoué à cause d'un client inconnu, d'aucune authentification de client incluse ou d'une méthode d'authentification non prise en charge.
- invalid_grant: Le consentement d'autorisation accordé n'est pas valide, a expiré, est annulé, ne concorde pas avec l'URL de redirection utilisée dans la requête d'autorisation ou a été émis à un autre client.
- invalid_redirect_uri: L'URL de redirection n'est pas valide.
+ access_denied: Le propriétaire de la ressource ou le serveur d’autorisation a refusé la requête.
+ credential_flow_not_configured: Le flux des identifiants du mot de passe du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n’est pas configuré.
+ invalid_client: L’authentification du client a échoué à cause d’un client inconnu, d’aucune authentification de client incluse ou d’une méthode d’authentification non prise en charge.
+ invalid_grant: Le consentement d’autorisation accordé n’est pas valide, a expiré, est annulé, ne concorde pas avec l’URL de redirection utilisée dans la requête d’autorisation ou a été émis à un autre client.
+ invalid_redirect_uri: L’URL de redirection n’est pas valide.
invalid_request: La requête omet un paramètre requis, inclut une valeur de paramètre non prise en charge ou est autrement mal formée.
invalid_resource_owner: Les identifiants fournis par le propriétaire de la ressource ne sont pas valides ou le propriétaire de la ressource ne peut être trouvé
- invalid_scope: La portée demandée n'est pas valide, est inconnue ou mal formée.
+ invalid_scope: La portée demandée n’est pas valide, est inconnue ou mal formée.
invalid_token:
- expired: Le jeton d'accès a expiré
- revoked: Le jeton d'accès a été révoqué
- unknown: Le jeton d'accès n'est pas valide
- resource_owner_authenticator_not_configured: La recherche du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_authenticator n'est pas configuré.
- server_error: Le serveur d'autorisation a rencontré une condition inattendue l'empêchant de faire aboutir la requête.
- temporarily_unavailable: Le serveur d'autorisation est actuellement incapable de traiter la requête à cause d'une surcharge ou d'une maintenance temporaire du serveur.
- unauthorized_client: Le client n'est pas autorisé à effectuer cette requête à l'aide de cette méthode.
- unsupported_grant_type: Le type de consentement d'autorisation n'est pas pris en charge par le serveur d'autorisation.
- unsupported_response_type: Le serveur d'autorisation ne prend pas en charge ce type de réponse.
+ expired: Le jeton d’accès a expiré
+ revoked: Le jeton d’accès a été révoqué
+ unknown: Le jeton d’accès n’est pas valide
+ resource_owner_authenticator_not_configured: La recherche du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_authenticator n’est pas configuré.
+ server_error: Le serveur d’autorisation a rencontré une condition inattendue l’empêchant de faire aboutir la requête.
+ temporarily_unavailable: Le serveur d’autorisation est actuellement incapable de traiter la requête à cause d’une surcharge ou d’une maintenance temporaire du serveur.
+ unauthorized_client: Le client n’est pas autorisé à effectuer cette requête à l’aide de cette méthode.
+ unsupported_grant_type: Le type de consentement d’autorisation n’est pas pris en charge par le serveur d’autorisation.
+ unsupported_response_type: Le serveur d’autorisation ne prend pas en charge ce type de réponse.
flash:
applications:
create:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 944c24c60c..c9b5d9ab8f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,28 +1,30 @@
---
en:
about:
- about_mastodon: Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.
- about_this: About this instance
- apps: Apps
+ about_mastodon_html: Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail.
+ about_this: About
business_email: 'Business e-mail:'
- closed_registrations: Registrations are currently closed on this instance.
+ closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there.
contact: Contact
description_headline: What is %{domain}?
domain_count_after: other instances
domain_count_before: Connected to
features:
- api: Open API for apps and services
- blocks: Rich block and muting tools
- characters: 500 characters per post
- chronology: Timelines are chronological
- ethics: 'Ethical design: no ads, no tracking'
- gifv: GIFV sets and short videos
- privacy: Granular, per-post privacy settings
- public: Public timelines
- features_headline: What sets Mastodon apart
+ humane_approach_body: Learning from failures of other networks, Mastodon aims to make ethical design choices to combat the misuse of social media.
+ humane_approach_title: A more humane approach
+ not_a_product_body: Mastodon is not a commercial network. No advertising, no data mining, no walled gardens. There is no central authority.
+ not_a_product_title: You’re a person, not a product
+ real_conversation_body: With 500 characters at your disposal and support for granular content and media warnings, you can express yourself the way you want to.
+ real_conversation_title: Built for real conversation
+ within_reach_body: Multiple apps for iOS, Android, and other platforms thanks to a developer-friendly API ecosystem allow you to keep up with your friends anywhere.
+ within_reach_title: Always within reach
+ find_another_instance: Find another instance
+ generic_description: "%{domain} is one server in the network"
get_started: Get started
+ hosted_on: Mastodon hosted on %{domain}
+ learn_more: Learn more
links: Links
- other_instances: Other instances
+ other_instances: Instance list
source_code: Source code
status_count_after: statuses
status_count_before: Who authored
@@ -30,6 +32,7 @@ en:
user_count_after: users
user_count_before: Home to
version: Version
+ what_is_mastodon: What is Mastodon?
accounts:
follow: Follow
followers: Followers
@@ -165,25 +168,31 @@ en:
view: View
settings:
contact_information:
- email: Enter a public e-mail address
- label: Contact information
- username: Enter a username
+ email: Business e-mail
+ username: Contact username
registrations:
closed_message:
- desc_html: Displayed on frontpage when registrations are closedYou can use HTML tags + desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags title: Closed registration message + deletion: + desc_html: Allow anyone to delete their account + title: Open account deletion open: - disabled: Disabled - enabled: Enabled + desc_html: Allow anyone to create an account title: Open registration - setting: Setting site_description: - desc_html: Displayed as a paragraph on the frontpage and used as a meta tag.
You can use HTML tags, in particular
<a> and <em>.
- title: Site description
+ desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <a> and <em>.
+ title: Instance description
site_description_extended:
- desc_html: Displayed on extended information pageYou can use HTML tags - title: Extended site description - site_title: Site title + desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags + title: Custom extended information + site_terms: + desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags + title: Custom terms of service + site_title: Instance name + timeline_preview: + desc_html: Display public timeline on landing page + title: Timeline preview title: Site Settings subscriptions: callback_url: Callback URL @@ -204,6 +213,7 @@ en: applications: invalid_url: The provided URL is invalid auth: + agreement_html: By signing up you agree to our terms of service and privacy policy. change_password: Security delete_account: Delete account delete_account_html: If you wish to delete your account, you can proceed here. You will be asked for confirmation. @@ -218,6 +228,12 @@ en: authorize_follow: error: Unfortunately, there was an error looking up the remote account follow: Follow + follow_request: 'You have sent a follow request to:' + following: 'Success! You are now following:' + post_follow: + close: Or, you can just close this window. + return: Return to the user's profile + web: Go to web prompt_html: 'You (%{self}) have requested to follow:' title: Follow %{acct} datetime: @@ -387,6 +403,76 @@ en: click_to_show: Click to show reblogged: boosted sensitive_content: Sensitive content + terms: + body_html: | +
Privacy Policy
+ +What information do we collect?
+ +We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.
+ +When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.
+ +When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.
+ +What do we use your information for?
+ +Any of the information we collect from you may be used in one of the following ways:
+ +-
+
- To personalize your experience — your information helps us to better respond to your individual needs. +
- To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. +
- To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. +
- To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. +
How do we protect your information?
+ +We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.
+ +What is your data retention policy?
+ +We will make a good faith effort to:
+ +-
+
- Retain server logs containing the IP address of all requests to this server no more than 90 days. +
- Retain the IP addresses associated with registered users and their posts no more than 5 years. +
Do we use cookies?
+ +Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
+ +We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.
+ +Do we disclose any information to outside parties?
+ +We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.
+ +Third party links
+ +Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.
+ +Children's Online Privacy Protection Act Compliance
+ +Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.
+ +Online Privacy Policy Only
+ +This online privacy policy applies only to information collected through our site and not to information collected offline.
+ +Your Consent
+ +By using our site, you consent to our web site privacy policy.
+ +Changes to our Privacy Policy
+ +If we decide to change our privacy policy, we will post those changes on this page.
+ +This document is CC-BY-SA. It was last updated May 31, 2013.
+ +Originally adapted from the Discourse privacy policy.
+ title: "%{instance} Terms of Service and Privacy Policy"
time:
formats:
default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 8b42415df5..d47a5db0ed 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -3,22 +3,11 @@ eo:
about:
about_mastodon: Mastodon estas senpaga, malfermitkoda socia reto. Ĝi estas sencentra alia eblo al komercaj servoj. Ĝi evitigas, ke unusola firmao regu vian tutan komunikadon. Elektu servilon, kiun vi fidas. Kiu ajn estas via elekto, vi povas interagi kun ĉiuj aliaj uzantoj. Iu ajn povas krei sian propran aperaĵon de Mastodon en sia servilo, kaj partopreni en la socia reto tute glate.
about_this: Pri tiu aperaĵo
- apps: Aplikaĵoj
business_email: 'Profesia retpoŝt-adreso:'
contact: Kontakti
description_headline: Kio estas %{domain}?
domain_count_after: aliaj aperaĵoj
domain_count_before: Konektita al
- features:
- api: Malfermita API por aplikaĵoj kaj servoj
- blocks: Kompletaj iloj por bloki kaj kaŝi
- characters: Po 500 signoj por ĉiu mesaĝo
- chronology: Tempolinioj laŭtempaj
- ethics: 'Etike kreita: neniu reklamo, neniu ŝpurado'
- gifv: Eblo diskonigi etajn videojn kaj GIFV
- privacy: Videbleco agordita laŭ la mesaĝo
- public: Publikaj tempolinioj
- features_headline: Kiel Mastodon estas malsimila
get_started: Komenci
links: Ligiloj
other_instances: Aliaj aperaĵoj
@@ -92,7 +81,7 @@ eo:
blocking: Listo de blokitoj
following: Listo de sekvatoj
upload: Alporti
- landing_strip_html: %{name} estas uzanto en %{link_to_root_path}. Vi povas sekvi tiun aŭ interagi kun tiu, se vi havas konton ie ajn en la Fediverse.
+ landing_strip_html: "%{name} estas uzanto en %{link_to_root_path}. Vi povas sekvi tiun aŭ interagi kun tiu, se vi havas konton ie ajn en la Fediverse."
landing_strip_signup_html: Se vi ne havas, vi povas membriĝi ĉi tie..
notification_mailer:
digest:
@@ -105,19 +94,19 @@ eo:
one: "1 nova sciigo ekde via lasta vizito \U0001F418"
other: "%{count} novaj sciigoj ekde via lasta vizito \U0001F418"
favourite:
- body: '%{name} favoris vian mesaĝon:'
+ body: "%{name} favoris vian mesaĝon:"
subject: "%{name} favoris vian mesaĝon"
follow:
body: "%{name} eksekvis vin:"
subject: "%{name} eksekvis vin"
follow_request:
body: "%{name} petis sekvi vin:"
- subject: '%{name} petis sekvi vin'
+ subject: "%{name} petis sekvi vin"
mention:
- body: '%{name} menciis vin en:'
- subject: '%{name} menciis vin'
+ body: "%{name} menciis vin en:"
+ subject: "%{name} menciis vin"
reblog:
- body: '%{name} diskonigis vian mesaĝon:'
+ body: "%{name} diskonigis vian mesaĝon:"
subject: "%{name} diskonigis vian mesaĝon"
pagination:
next: Sekva
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f587bb4ec9..c051c9a08d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -3,23 +3,12 @@ es:
about:
about_mastodon: Mastodon es un servidor de red social libre y de código abierto. Una alternativa descentralizada a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la red social.
about_this: Acerca de esta instancia
- apps: Apps
business_email: 'Correo de negocios:'
closed_registrations: Los registros están actualmente cerrados en esta instancia.
contact: Contacto
description_headline: "¿Qué es %{domain}?"
domain_count_after: otras instancias
domain_count_before: Conectado a
- features:
- api: API pública para aplicaciones y servicios
- blocks: Moderación de contenido
- characters: 500 caracteres por publicación
- chronology: Las historias son cronológicas
- ethics: 'Diseño etico: sin anuncios, sin rastreos'
- gifv: Videos cortos y GIFV
- privacy: Configuraciones de privacidad ajustables
- public: Historia federada
- features_headline: Lo que distingue a Mastodon
get_started: Comenzar
links: Enlaces
other_instances: Otras instancias
@@ -93,7 +82,7 @@ es:
blocking: Lista de bloqueados
following: Lista de seguidos
upload: Cargar
- landing_strip_html: %{name} es un usuario en %{link_to_root_path}. Puedes seguirlo(a) o interactuar con el o ella si tienes una cuenta en cualquier parte del fediverse.
+ landing_strip_html: "%{name} es un usuario en %{link_to_root_path}. Puedes seguirlo(a) o interactuar con el o ella si tienes una cuenta en cualquier parte del fediverse."
landing_strip_signup_html: Si no tienes una, puedes registrar aquí.
media_attachments:
validations:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 515443608e..ade76d6702 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -3,23 +3,12 @@ fa:
about:
about_mastodon: ماستدون (Mastodon) یک شبکهٔ اجتماعی آزاد و کدباز است. یک جایگزین غیرمتمرکز برای شبکههای تجاری، که نمیگذارد ارتباطهای شما را یک شرکت در انحصار خود بگیرد. یک سرور مورد اعتماد را انتخاب کنید — هر سروری که باشد، همچنان میتوانید با سرورهای دیگر ارتباط داشته باشید. هر کسی میتواند سرور ماستدون خود را راه بیندازد و در شبکهٔ اجتماعی سهیم شود.
about_this: دربارهٔ این سرور
- apps: برنامهها
business_email: 'ایمیل کاری:'
closed_registrations: امکان ثبت نام روی این سرور هماینک فعال نیست.
contact: تماس
description_headline: "%{domain} چیست؟"
domain_count_after: سرور دیگر
domain_count_before: متصل به
- features:
- api: رابط برنامهنویسی برای برنامهها و سرویسهای دیگر
- blocks: ابزارهای قدرتمند برای مسدود یا بیصدا کردن دیگران
- characters: ۵۰۰ حرف برای هر نوشته
- chronology: نمایش نوشتههای دیگران به ترتیب زمانی
- ethics: 'اخلاقمدار: بدون تبلیغات، بدون ردگیری'
- gifv: تصاویر متحرک و ویدیوهای کوتاه
- privacy: تنظیمات حریم خصوصی جداگانه برای هر نوشته
- public: نمایش نوشتههای عمومی دیگران از همهجا
- features_headline: برگهای برندهٔ ماستدون
get_started: آغاز کنید
links: پیوندها
other_instances: سرورهای دیگر
@@ -152,17 +141,13 @@ fa:
settings:
contact_information:
email: یک نشانی ایمیل عمومی وارد کنید
- label: اطلاعات تماس
username: یک نام کاربری وارد کنید
registrations:
closed_message:
desc_html: وقتی امکان ثبت نام روی سرور فعال نباشد در صفحهٔ اصلی نمایش مییابد
میتوانید HTML بنویسید
title: پیغام برای فعالنبودن ثبت نام
open:
- disabled: غیرفعال
- enabled: فعال
title: امکان ثبت نام
- setting: تنظیمات
site_description:
desc_html: روی صفحهٔ اصلی نمایش مییابد و همچنین به عنوان تگهای HTML.
میتوانید HTML بنویسید, بهویژه <a> و <em>.
title: دربارهٔ سایت
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c20bf690b1..a2488530fe 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -3,22 +3,11 @@ fi:
about:
about_mastodon: Mastodon on ilmainen, avoimeen lähdekoodiin perustuva sosiaalinen verkosto. Hajautettu vaihtoehto kaupallisille alustoille, se välttää eiskit yhden yrityksen monopolisoinnin sinun viestinnässäsi. Valitse palvelin mihin luotat — minkä tahansa valitset, voit vuorovaikuttaa muiden kanssa. Kuka tahansa voi luoda Mastodon palvelimen ja ottaa osaa sosiaaliseen verkkoon saumattomasti.
about_this: Tietoja tästä palvelimesta
- apps: Ohjelmat
business_email: 'Business e-mail:'
contact: Ota yhteyttä
description_headline: Mikä on %{domain}?
domain_count_after: muuhun palvelimeen
domain_count_before: Yhdistyneenä
- features:
- api: Avoin API ohjelmille ja palveluille
- blocks: Rikkaat esto- ja hiljennystyökalut
- characters: 500 kirjainta per viesti
- chronology: Aikajana on kronologisessa järjestyksessä
- ethics: 'Eettinen suunnittelu: ei mainoksia, ei seurantaa'
- gifv: GIFV settejä ja lyhyitä videoita
- privacy: Julkaisukohtainen yksityisyysasetus
- public: Julkiset aikajanat
- features_headline: Mikä erottaa Mastodonin muista
get_started: Aloita käyttö
links: Linkit
other_instances: Muut palvelimet
@@ -92,7 +81,7 @@ fi:
blocking: Estetyt lista
following: Seuratut lista
upload: Lähetä
- landing_strip_html: %{name} on käyttäjä domainilla %{link_to_root_path}. Voit seurata tai vuorovaikuttaa heidän kanssaan jos sinulla on tili yleisessä verkossa.
+ landing_strip_html: "%{name} on käyttäjä domainilla %{link_to_root_path}. Voit seurata tai vuorovaikuttaa heidän kanssaan jos sinulla on tili yleisessä verkossa."
landing_strip_signup_html: Jos sinulla ei ole tiliä, voit rekisteröityä täällä.
notification_mailer:
digest:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index dfe5ff990c..c2efd0c851 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3,23 +3,12 @@ fr:
about:
about_mastodon: Mastodon est un serveur libre de réseautage social. Alternative décentralisée aux plateformes commerciales, la monopolisation de vos communications par une entreprise unique est évitée. Tout un chacun peut faire tourner Mastodon et participer au réseau social de manière transparente.
about_this: À propos de cette instance
- apps: Applications
business_email: Courriel professionnel
closed_registrations: Les inscriptions sont actuellement fermées sur cette instance.
contact: Contact
- description_headline: Qu'est-ce que %{domain} ?
+ description_headline: Qu’est-ce que %{domain} ?
domain_count_after: autres instances
domain_count_before: Connectés à
- features:
- api: API ouverte aux apps et services
- blocks: Outils complets de bloquage et masquage
- characters: 500 caractères par post
- chronology: Fil chronologique
- ethics: Pas de pubs, pas de pistage
- gifv: Partage de vidéos et de GIFs
- privacy: Réglages de confidentialité au niveau des posts
- public: Fils publics
- features_headline: Ce qui rend Mastodon différent
get_started: Rejoindre le réseau
links: Liens
other_instances: Autres instances
@@ -27,21 +16,35 @@ fr:
status_count_after: posts
status_count_before: Ayant publié
terms: Conditions d’utilisation
- user_count_after: utilisateurs⋅trices
+ user_count_after: utilisateur⋅ice⋅s
user_count_before: Abrite
+ version: Version
accounts:
follow: Suivre
followers: Abonné⋅es
following: Abonnements
- nothing_here: Rien à voir ici !
+ nothing_here: Rien à voir ici !
people_followed_by: Personnes suivies par %{name}
people_who_follow: Personnes qui suivent %{name}
posts: Statuts
remote_follow: Suivre à distance
+ reserved_username: Ce nom d’utilisateur⋅ice est réservé
unfollow: Ne plus suivre
+ activitypub:
+ activity:
+ announce:
+ name: "%{account_name} a partagé une activité."
+ create:
+ name: "%{account_name} a créé une note."
+ outbox:
+ name: Boîte d’envoi de %{account_name}
+ summary: Liste d’activités de %{account_name}
admin:
accounts:
- are_you_sure: Êtes-vous certain ?
+ are_you_sure: Êtes-vous certain⋅e ?
+ confirm: Confirmer
+ confirmed: Confirmé
+ disable_two_factor_authentication: Désactiver l’authentification à deux facteurs
display_name: Nom affiché
domain: Domaine
edit: Éditer
@@ -49,6 +52,7 @@ fr:
feed_url: URL du flux
followers: Abonné⋅es
follows: Abonnements
+ ip: Adresse IP
location:
all: Tous
local: Local
@@ -70,15 +74,25 @@ fr:
perform_full_suspension: Effectuer une suspension complète
profile_url: URL du profil
public: Public
- push_subscription_expires: Expiration de l'abonnement PuSH
+ push_subscription_expires: Expiration de l’abonnement PuSH
+ redownload: Rafraîchir les avatars
+ reset: Réinitialiser
reset_password: Réinitialiser le mot de passe
+ resubscribe: Se réabonner
salmon_url: URL Salmon
+ search: Rechercher
+ show:
+ created_reports: Signalements créés par ce compte
+ report: signalement
+ targeted_reports: Signalements créés visant ce compte
silence: Rendre muet
statuses: Statuts
+ subscribe: S’abonner
title: Comptes
undo_silenced: Annuler le silence
undo_suspension: Annuler la suspension
- username: Nom d'utilisateur
+ unsubscribe: Se désabonner
+ username: Nom d’utilisateur⋅ice
web: Web
domain_blocks:
add_new: Ajouter
@@ -87,14 +101,14 @@ fr:
domain: Domaine
new:
create: Créer le blocage
- hint: Le blocage de domaine n'empêchera pas la création de comptes dans la base de données, mais il appliquera automatiquement et rétrospectivement des méthodes de modération spécifiques sur ces comptes.
+ hint: Le blocage de domaine n’empêchera pas la création de comptes dans la base de données, mais il appliquera automatiquement et rétrospectivement des méthodes de modération spécifiques sur ces comptes.
severity:
desc_html: "Silence rendra les messages des comptes concernés invisibles à ceux qui ne les suivent pas. Suspend supprimera tout le contenu des comptes concernés, les médias, et les données du profil."
silence: Muet
suspend: Suspendre
title: Nouveau blocage de domaine
reject_media: Fichiers média rejetés
- reject_media_hint: Supprime localement les fichiers média stockés et refuse d'en télécharger ultérieurement. Ne concerne pas les suspensions.
+ reject_media_hint: Supprime localement les fichiers média stockés et refuse d’en télécharger ultérieurement. Ne concerne pas les suspensions.
severities:
silence: Rendre muet
suspend: Suspendre
@@ -110,14 +124,24 @@ fr:
undo: Annuler
title: Blocage de domaines
undo: Annuler
+ instances:
+ account_count: Comptes connus
+ domain_name: Domaine
+ title: Instances connues
reports:
+ action_taken_by: Intervention de
+ are_you_sure: Êtes vous certain⋅e?
comment:
label: Commentaire
none: Aucun
delete: Supprimer
id: ID
mark_as_resolved: Marquer comme résolu
+ nsfw:
+ 'false': Ré-afficher les médias
+ 'true': Masquer les médias
report: 'Signalement #%{id}'
+ report_contents: Contenu
reported_account: Compte signalé
reported_by: Signalé par
resolved: Résolus
@@ -131,22 +155,18 @@ fr:
settings:
contact_information:
email: Entrez une adresse courriel publique
- label: Informations de contact
- username: Entrez un nom d'utilisateur
+ username: Entrez un nom d’utilisateur⋅ice
registrations:
closed_message:
- desc_html: Affiché sur la page d'accueil lorsque les inscriptions sont fermées
Vous pouvez utiliser des balises HTML
+ desc_html: Affiché sur la page d’accueil lorsque les inscriptions sont fermées
Vous pouvez utiliser des balises HTML
title: Message de fermeture des inscriptions
open:
- disabled: Désactivées
- enabled: Activées
title: Inscriptions
- setting: Paramètre
site_description:
- desc_html: Affichée sous la forme d'un paragraphe sur la page d'accueil et utilisée comme balise meta.
Vous pouvez utiliser des balises HTML, en particulier <a> et <em>.
+ desc_html: Affichée sous la forme d’un paragraphe sur la page d’accueil et utilisée comme balise meta.
Vous pouvez utiliser des balises HTML, en particulier <a> et <em>.
title: Description du site
site_description_extended:
- desc_html: Affichée sur la page d'informations complémentaires du site
Vous pouvez utiliser des balises HTML
+ desc_html: Affichée sur la page d’informations complémentaires du site
Vous pouvez utiliser des balises HTML
title: Description étendue du site
site_title: Titre du site
title: Paramètres du site
@@ -158,16 +178,22 @@ fr:
title: PubSubHubbub
topic: Sujet
title: Administration
+ admin_mailer:
+ new_report:
+ body: "%{reporter} a signalé %{target}"
+ subject: Nouveau signalement sur %{instance} (#%{id})
application_mailer:
- settings: 'Changer les préférences courriel : %{link}'
+ settings: 'Changer les préférences courriel : %{link}'
signature: Notifications de Mastodon depuis %{instance}
- view: 'Voir :'
+ view: 'Voir :'
applications:
- invalid_url: L'URL fournie est invalide
+ invalid_url: L’URL fournie est invalide
auth:
- change_password: Changer de mot de passe
- didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
- forgot_password: Mot de passe oublié ?
+ change_password: Sécurité
+ delete_account: Supprimer le compte
+ delete_account_html: Si vous désirez supprimer votre compte, vous pouvez cliquer ici. Il vous sera demandé de confirmer cette action.
+ didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
+ forgot_password: Mot de passe oublié ?
login: Se connecter
logout: Se déconnecter
register: S’inscrire
@@ -177,7 +203,7 @@ fr:
authorize_follow:
error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant
follow: Suivre
- prompt_html: 'Vous (%{self}) avez demandé à suivre :'
+ prompt_html: 'Vous (%{self}) avez demandé à suivre :'
title: Suivre %{acct}
datetime:
distance_in_words:
@@ -189,9 +215,9 @@ fr:
almost_x_years:
one: un an
other: "%{count} ans"
- half_a_minute: A l'instant
+ half_a_minute: À l’instant
less_than_x_minutes: "%{count}min"
- less_than_x_seconds: A l'instant
+ less_than_x_seconds: À l’instant
over_x_years:
one: un an
other: "%{count} ans"
@@ -199,89 +225,154 @@ fr:
x_minutes: "%{count}min"
x_months: "%{count}mois"
x_seconds: "%{count}s"
+ deletes:
+ bad_password_msg: Bien essayé ! Mot de passe incorrect
+ confirm_password: Entrez votre mot de passe pour vérifier votre identité
+ description_html: Cela va supprimer votre compte et le désactiver de manière permanente et irréversible. Votre nom d’utilisateur⋅ice restera réservé afin d’éviter la confusion
+ proceed: Supprimer compte
+ success_msg: Votre compte a été supprimé avec succès
+ warning_html: Seule la suppression du contenu depuis cette instance est garantie. Le contenu qui a été partagé est susceptible de laisser des traces. Les serveurs hors-lignes ainsi que ceux n’étant plus abonnés à vos publications ne mettront pas leur base de données à jour.
+ warning_title: Disponibilité du contenu disséminé
errors:
- '404': La page que vous recherchez n'existe pas.
- '410': La page que vous recherchez n'existe plus.
+ '403': Vous n’avez pas accès à cette page.
+ '404': La page que vous recherchez n’existe pas.
+ '410': La page que vous recherchez n’existe plus.
'422':
- content: Vérification de sécurité échouée. Bloquez-vous les cookies ?
+ content: Vérification de sécurité échouée. Bloquez-vous les cookies ?
title: Vérification de sécurité échouée
+ '429': Trop de requêtes émises dans un délai donné.
+ noscript: Pour utiliser Mastodon, veuillez activer JavaScript
exports:
blocks: Vous bloquez
csv: CSV
follows: Vous suivez
mutes: Vous faites taire
storage: Médias stockés
+ followers:
+ domain: Domaine
+ explanation_html: Si vous voulez être sûr⋅e que vos status restent privés, vous devez savoir qui vous suit. Vos status privés seront diffusés à toutes les instances des utilisateur⋅ice⋅s qui vous suivent. Vous voudrez peut-être les passer en revue et les supprimer si vous n’êtes pas sûr⋅e que votre vie privée sera respectée par l’administration ou le logiciel de ces instances.
+ followers_count: Nombre d’abonné⋅es
+ lock_link: Rendez votre compte privé
+ purge: Retirer de la liste d’abonné⋅es
+ success:
+ one: Suppression des abonné⋅es venant d’un domaine en cours…
+ other: Suppression des abonné⋅es venant de %{count} domaines en cours…
+ true_privacy_html: Soyez conscient⋅es qu’une vraie confidentialité ne peut être atteinte que par un chiffrement de bout-en-bout.
+ unlocked_warning_html: N’importe qui peut vous suivre et voir vos status privés. %{lock_link} afin de pouvoir vérifier et rejeter des abonné⋅es.
+ unlocked_warning_title: Votre compte n’est pas privé
generic:
- changes_saved_msg: Les modifications ont été enregistrées avec succès !
+ changes_saved_msg: Les modifications ont été enregistrées avec succès !
powered_by: propulsé par %{link}
save_changes: Enregistrer les modifications
validation_errors:
- one: Quelque chose ne va pas ! Vérifiez l’erreur ci-dessous.
- other: Certaines choses ne vont pas ! Vérifiez les erreurs ci-dessous.
+ one: Quelque chose ne va pas ! Vérifiez l’erreur ci-dessous.
+ other: Certaines choses ne vont pas ! Vérifiez les erreurs ci-dessous.
imports:
preface: Vous pouvez importer certaines données comme les personnes que vous suivez ou bloquez sur votre compte sur cette instance à partir de fichiers créés sur une autre instance.
success: Vos données ont été importées avec succès et seront traitées en temps et en heure
types:
- blocking: Liste d'utilisateurs⋅trices bloqué⋅es
- following: Liste d'utilisateurs⋅trices suivi⋅es
- muting: Liste d'utilisateurs⋅trices que vous faites taire
+ blocking: Liste d’utilisateur⋅ice⋅s bloqué⋅es
+ following: Liste d’utilisateur⋅ice⋅s suivi⋅es
+ muting: Liste d’utilisateur⋅ice⋅s que vous faites taire
upload: Importer
landing_strip_html: %{name} utilise %{link_to_root_path}. Vous pouvez le/la suivre et interagir si vous possédez un compte quelque part dans le "fediverse".
- landing_strip_signup_html: Si ce n'est pas le cas, vous pouvez en créer un ici.
+ landing_strip_signup_html: Si ce n’est pas le cas, vous pouvez en créer un ici.
media_attachments:
validations:
images_and_video: Impossible de joindre une vidéo à un statut contenant déjà des images
too_many: Impossible de joindre plus de 4 fichiers
notification_mailer:
digest:
- body: 'Voici ce que vous avez raté sur ${instance} depuis votre dernière visite (%{}) :'
+ body: 'Voici ce que vous avez raté sur ${instance} depuis votre dernière visite (%{}) :'
mention: "%{name} vous a mentionné⋅e"
new_followers_summary:
- one: Vous avez un⋅e nouvel⋅le abonné⋅e ! Youpi !
- other: Vous avez %{count} nouveaux⋅elles abonné⋅e⋅s ! Incroyable !
+ one: Vous avez un⋅e nouvel⋅le abonné⋅e ! Youpi !
+ other: Vous avez %{count} nouveaux⋅elles abonné⋅e⋅s ! Incroyable !
subject:
one: "Une nouvelle notification depuis votre dernière visite \U0001F418"
other: "%{count} nouvelles notifications depuis votre dernière visite \U0001F418"
favourite:
- body: "%{name} a ajouté votre post à ses favoris :"
+ body: "%{name} a ajouté votre post à ses favoris :"
subject: "%{name} a ajouté votre post à ses favoris"
follow:
- body: "%{name} vous suit !"
+ body: "%{name} vous suit !"
subject: "%{name} vous suit"
follow_request:
body: "%{name} a demandé à vous suivre"
- subject: 'Abonné⋅es en attente : %{name}'
+ subject: 'Abonné⋅es en attente : %{name}'
mention:
- body: "%{name} vous a mentionné⋅e dans :"
+ body: "%{name} vous a mentionné⋅e dans :"
subject: "%{name} vous a mentionné⋅e"
reblog:
- body: "%{name} a partagé votre statut :"
+ body: "%{name} a partagé votre statut :"
subject: "%{name} a partagé votre statut"
pagination:
next: Suivant
prev: Précédent
remote_follow:
acct: Entrez votre pseudo@instance depuis lequel vous voulez suivre ce⋅tte utilisateur⋅trice
- missing_resource: L'URL de redirection n'a pas pu être trouvée
+ missing_resource: L’URL de redirection n’a pas pu être trouvée
proceed: Continuez pour suivre
- prompt: 'Vous allez suivre :'
+ prompt: 'Vous allez suivre :'
+ sessions:
+ activity: Dernière activité
+ browser: Navigateur
+ browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ firefox: Firefox
+ generic: Navigateur inconnu
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
+ opera: Opera
+ phantom_js: PhantomJS
+ qq: QQ Browser
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ current_session: Session courante
+ description: "%{browser} sur %{platform}"
+ explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
+ ip: Adresse IP
+ platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ other: système inconnu
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
+ title: Sessions
settings:
authorized_apps: Applications autorisées
back: Retour vers Mastodon
+ delete: Suppression de compte
edit_profile: Modifier le profil
export: Export de données
+ followers: Abonné⋅es autorisé⋅es
import: Import de données
preferences: Préférences
settings: Réglages
- two_factor_authentication: Identification à deux facteurs (Two-factor auth)
+ two_factor_authentication: Identification à deux facteurs
statuses:
open_in_web: Ouvrir sur le web
over_character_limit: limite de caractères dépassée de %{max} caractères
show_more: Afficher plus
visibilities:
private: Abonné⋅es uniquement
+ private_long: Seul⋅es vos abonné⋅es verront vos status
public: Public
+ public_long: Tout le monde peut voir vos status
unlisted: Public sans être affiché sur le fil public
+ unlisted_long: Tout le monde peut voir vos status mais ils ne seront pas sur listés sur les fils publics
stream_entries:
click_to_show: Cliquer pour afficher
reblogged: partagé
@@ -291,18 +382,20 @@ fr:
default: "%d %b %Y, %H:%M"
two_factor_authentication:
code_hint: Entrez le code généré par votre application pour confirmer
- description_html: Si vous activez l'identification à deux facteurs, vous devrez être en possession de votre téléphone afin de générer un code de connexion.
+ description_html: Si vous activez l’identification à deux facteurs, vous devrez être en possession de votre téléphone afin de générer un code de connexion.
disable: Désactiver
enable: Activer
+ enabled: L’authentification à deux facteurs est activée
enabled_success: Identification à deux facteurs activée avec succès
generate_recovery_codes: Générer les codes de récupération
instructions_html: "Scannez ce QR code grâce à Google Authenticator, Authy ou une application similaire sur votre téléphone. Désormais, cette application générera des jetons que vous devrez saisir à chaque connexion."
lost_recovery_codes: Les codes de récupération vous permettent de retrouver les accès à votre comptre si vous perdez votre téléphone. Si vous perdez vos codes de récupération, vous pouvez les générer à nouveau ici. Vos anciens codes de récupération seront invalidés.
- manual_instructions: 'Si vous ne pouvez pas scanner ce QR code et devez l''entrer manuellement, voici le secret en clair :'
+ manual_instructions: 'Si vous ne pouvez pas scanner ce QR code et devez l’entrer manuellement, voici le secret en clair :'
+ recovery_codes: Codes de récupération
recovery_codes_regenerated: Codes de récupération régénérés avec succès
- recovery_instructions_html: Si vous perdez l'accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour récupérer l'accès à votre compte. Conservez les codes de récupération en toute sécurité, par exemple, en les imprimant et en les stockant avec vos autres documents importants.
+ recovery_instructions_html: Si vous perdez l’accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour récupérer l’accès à votre compte. Conservez les codes de récupération en toute sécurité, par exemple, en les imprimant et en les stockant avec vos autres documents importants.
setup: Installer
- wrong_code: Les codes entrés sont incorrects ! L'heure du serveur et celle de votre appareil sont-elles correctes ?
+ wrong_code: Les codes entrés sont incorrects ! L’heure du serveur et celle de votre appareil sont-elles correctes ?
users:
- invalid_email: L'adresse courriel est invalide
- invalid_otp_token: Le code d'authentification à deux facteurs est invalide
+ invalid_email: L’adresse courriel est invalide
+ invalid_otp_token: Le code d’authentification à deux facteurs est invalide
diff --git a/config/locales/he.yml b/config/locales/he.yml
index ec7d972ec8..21f8f1dc4c 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -3,23 +3,12 @@ he:
about:
about_mastodon: מסטודון היא רשת חברתית חופשית, מבוססת תוכנה חופשית ("קוד פתוח"). כאלטרנטיבה בלתי ריכוזית לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד — לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ברשת החברתית באופן חלק.
about_this: אודות שרת זה
- apps: ישומים
business_email: 'דוא"ל עסקי:'
closed_registrations: הרשמות סגורות לשרת זה לעת עתה.
contact: צור קשר
description_headline: מהו %{domain}?
domain_count_after: שרתים אחרים
domain_count_before: מחובר אל
- features:
- api: API פתוח לישומים ושירותים
- blocks: כלי חסימה והשתקה חזקים
- characters: 500 תווים להודעה
- chronology: הטורים כרונולוגיים
- ethics: 'תכנון מוסרי: אין פרסומות, אין מעקב'
- gifv: GIFV וסרטונים קצרים
- privacy: אפשרויות פרטיוּת נפרדות לכל הודעה
- public: טורים פומביים
- features_headline: מה מייחד קהילות מבוססות מסטודון
get_started: בואו נתחיל
links: קישורים
other_instances: שרתים אחרים
@@ -160,17 +149,13 @@ he:
settings:
contact_information:
email: נא להקליד כתובת דוא"ל פומבית
- label: פרטי התקשרות
username: נא להכניס שם משתמש
registrations:
closed_message:
desc_html: מוצג על הדף הראשי כאשר ההרשמות סגורות
ניתן להשתמש בתגיות HTML
title: מסר סגירת הרשמות
open:
- disabled: מבוטל
- enabled: מופעל
title: הרשמה פתוחה
- setting: הגדרה
site_description:
desc_html: מוצג כפסקה על הדף הראשי ומשמש כתגית מטא.
ניתן להשתמש בתגיות HTML, ובמיוחד ב־<a> ו־<em>.
title: תיאור האתר
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f873fc7ed4..8297ca6296 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -3,23 +3,12 @@ hr:
about:
about_mastodon: Mastodon je besplatna, open-source socijalna mreža. Decentralizirana alternativa komercijalnim platformama, izbjegava rizik toga da jedna tvrtka monopolizira vašu komunikaciju. Izaberite server kojem ćete vjerovati — koji god odabrali, moći ćete komunicirati sa svima ostalima. Bilo tko može imati svoju vlastitu Mastodon instancu i sudjelovati u socijalnoj mreži bez problema.
about_this: O ovoj instanci
- apps: Aplikacije
business_email: 'Poslovni e-mail:'
closed_registrations: Registracije na ovoj instanci su trenutno zatvorene.
contact: Kontakt
description_headline: Što je %{domain}?
domain_count_after: druge instance
domain_count_before: Spojen na
- features:
- api: Otvoren API za aplikacije i servise
- blocks: Bogati alati za blokiranje i ušutkivanje
- characters: 500 znakova po postu
- chronology: Timelines su kronološke
- ethics: 'Etički dizajn: bez oglasa, bez praćenja'
- gifv: GIFV setovi i kratki videi
- privacy: Granularne postavke privatnosti, po postu
- public: Javne timelines
- features_headline: Po čemu se Mastodon razlikuje
get_started: Započni
links: Linkovi
other_instances: Druge instance
@@ -94,7 +83,7 @@ hr:
following: Lista onih koje slijedim
muting: Lista utišanih
upload: Upload
- landing_strip_html: %{name} je korisnik na %{link_to_root_path}. Možeš ih slijediti ili komunicirati s njima ako imaš račun igdje u fediversu.
+ landing_strip_html: "%{name} je korisnik na %{link_to_root_path}. Možeš ih slijediti ili komunicirati s njima ako imaš račun igdje u fediversu."
landing_strip_signup_html: Ako nemaš, možeš se registrirati ovdje.
notification_mailer:
digest:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index fc4ffd046c..e3fe963317 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -3,23 +3,12 @@ id:
about:
about_mastodon: Mastodon adalah sebuah jejaring sosial terbuka, open-sourcedesentralisasi dari platform komersial, menjauhkan anda resiko dari sebuah perusahaan yang memonopoli komunikasi anda. Pilih server yang anda percayai — apapun yang anda pilih, anda tetap dapat berinteraksi dengan semua orang. Semua orang dapat menjalankan server Mastodon sendiri dan berpartisipasi dalam jejaring sosial dengan mudah.
about_this: Tentang server ini
- apps: Apl
business_email: 'E-mail bisnis:'
closed_registrations: Pendaftaran untuk server ini sedang ditutup.
contact: Kontak
description_headline: Apa itu %{domain}?
domain_count_after: server lain
domain_count_before: Terhubung dengan
- features:
- api: API terbuka untuk aplikasi dan layanan lain
- blocks: Aneka ragam fitur blokir dan pembisuan
- characters: 500 karakter per posting
- chronology: Linimasa berurutan
- ethics: 'Desain etis: tanpa iklan, tidak ada pelacakan'
- gifv: Fitur GIFV dan video pendek
- privacy: Terperinci, pengaturan privasi per postingan
- public: Linimasa publik
- features_headline: Yang berbeda dari Mastodon
get_started: Mulai
links: Link
other_instances: Server lain
@@ -151,17 +140,13 @@ id:
settings:
contact_information:
email: Masukkan alamat email
- label: Informasi kontak
username: Masukkan nama pengguna
registrations:
closed_message:
desc_html: Ditampilkan pada halaman depan saat pendaftaran ditutup
Anda bisa menggunakan tag HTML
title: Pesan penutupan pendaftaran
open:
- disabled: Dinonaktifkan
- enabled: Diaktifkan
title: Pendaftaran terbuka
- setting: Pengaturan
site_description:
desc_html: Ditampilkan sebagai sebuah paragraf di halaman depan dan digunakan sebagai tag meta.
Anda bisa menggunakan tag HTML, khususnya <a> dan <em>.
title: Deskripsi situs
diff --git a/config/locales/io.yml b/config/locales/io.yml
index db430b0feb..b587d4bc63 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -3,23 +3,12 @@ io:
about:
about_mastodon: Mastodon esas gratuita, apertitkodexa sociala reto. Ol esas sencentra altra alternativo a komercala servadi. Ol evitigas, ke sola firmo guvernez tua tota komunikadol. Selektez servero, quan tu fidas. Irge qua esas tua selekto, tu povas komunikar kun omna altra uzeri. Irgu povas krear sua propra instaluro di Mastodon en sua servero, e partoprenar en la sociala reto tote glate.
about_this: Pri ta instaluro
- apps: Apliki
business_email: 'Profesionala retpost-adreso:'
closed_registrations: Membresko ne nun esas posible en ta instaluro.
contact: Kontaktar
description_headline: Quo esas %{domain}?
domain_count_after: altra instaluri
domain_count_before: Konektita ad
- features:
- api: Apertita API por apliki e servadi
- blocks: Kompleta utensili por blokusar e celar
- characters: Til 500 signi por singla mesajo
- chronology: Tempolinei seguntempa
- ethics: 'Etike kreita: nula anunco, nula trakado'
- gifv: Posibleso diskononigar mikra videi e GIFV
- privacy: Videbleso ajustita segun la mesajo
- public: Publika tempolinei
- features_headline: Quale Mastodon esas diferanta
get_started: Komencar
links: Ligili
other_instances: Altra instaluri
@@ -139,17 +128,13 @@ io:
settings:
contact_information:
email: Enter a public e-mail address
- label: Contact information
username: Enter a username
registrations:
closed_message:
desc_html: Displayed on frontpage when registrations are closed
You can use HTML tags
title: Closed registration message
open:
- disabled: Disabled
- enabled: Enabled
title: Open registration
- setting: Setting
site_description:
desc_html: Displayed as a paragraph on the frontpage and used as a meta tag.
You can use HTML tags, in particular <a> and <em>.
title: Site description
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a96a459df3..5c014c61d2 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -3,23 +3,12 @@ it:
about:
about_mastodon: Mastodon è un social network gratuito e open-source. Un'alternativa decentralizzata alle piattaforme commerciali che evita che una singola compagnia monopolizzi il tuo modo di comunicare. Scegli un server di cui ti fidi — qualunque sia la tua scelta, potrai interagire con chiunque altro. Chiunque può sviluppare un suo server Mastodon e partecipare alla vita del social network.
about_this: A proposito di questo server
- apps: Applicazioni
business_email: 'Email di lavoro:'
closed_registrations: Al momento le iscrizioni a questo server sono chiuse.
contact: Contatti
description_headline: Cos'è %{domain}?
domain_count_after: altri server
domain_count_before: Connesso a
- features:
- api: API aperto per applicazioni e servizi
- blocks: Potenti strumenti di blocco e silenziamento
- characters: 500 caratteri per status
- chronology: Le timeline sono cronologiche
- ethics: 'Design etico: niente pubblicità, niente tracking'
- gifv: Set di GIFV e brevi video
- privacy: Opzioni di privacy mirate per-post
- public: Timeline pubbliche
- features_headline: Cosa rende Mastodon migliore
get_started: Inizia
links: Links
other_instances: Altri server
@@ -93,7 +82,7 @@ it:
blocking: Lista dei bloccati
following: Lista dei seguaci
upload: Carica
- landing_strip_html: %{name} è un utente su %{link_to_root_path}. Puoi seguirlo o interagire con lui se possiedi un account ovunque nel fediverse.
+ landing_strip_html: "%{name} è un utente su %{link_to_root_path}. Puoi seguirlo o interagire con lui se possiedi un account ovunque nel fediverse."
landing_strip_signup_html: Se non possiedi un account, puoi iscriverti qui.
media_attachments:
validations:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 80169339da..d57fe8da26 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -3,23 +3,12 @@ ja:
about:
about_mastodon: Mastodon は自由でオープンソースなソーシャルネットワークです。商用プラットフォームの代替となる分散型を採用し、あなたのやりとりが一つの会社によって独占されるのを防ぎます。信頼できるインスタンスを選択してください — どのインスタンスを選んでも、誰とでもやりとりすることができます。 だれでも自分の Mastodon インスタンスを作ることができ、シームレスにソーシャルネットワークに参加できます。
about_this: このインスタンスについて
- apps: アプリ
business_email: 'ビジネスメールアドレス:'
closed_registrations: 現在このインスタンスでの新規登録は受け付けていません。
contact: 連絡先
description_headline: "%{domain} とは？"
domain_count_after: 個のインスタンス
domain_count_before: 接続中
- features:
- api: アプリやその他サービスにAPIを公開
- blocks: 豊富なブロックやミュート機能
- characters: 1つの投稿は500文字まで利用可能
- chronology: 時系列順のタイムライン
- ethics: 広告もトラッキングもありません
- gifv: GIFVや短い動画にも対応
- privacy: 投稿ごとに公開範囲を細かく設定可能
- public: 公開タイムライン
- features_headline: Mastodon の特徴
get_started: 参加する
links: リンク
other_instances: 他のインスタンス
@@ -166,23 +155,22 @@ ja:
settings:
contact_information:
email: 公開するメールアドレスを入力
- label: 連絡先情報
username: ユーザー名を入力
registrations:
closed_message:
desc_html: 新規登録を停止しているときにフロントページに表示されます。
HTMLタグが利用可能です。
title: 新規登録停止時のメッセージ
open:
- disabled: 無効
- enabled: 有効
title: 新規登録を受け付ける
- setting: 設定
site_description:
desc_html: トップページへの表示と meta タグに使用されます。
HTMLタグ、特に<a> と <em>が利用可能です。
title: サイトの説明文
site_description_extended:
desc_html: インスタンスについてのページに表示されます。
HTMLタグが利用可能です。
title: サイトの詳細な説明
+ site_terms:
+ desc_html: プライバシーポリシーのページに表示されます。
HTMLタグが利用可能です。
+ title: サイトのプライバシーポリシー
site_title: サイトのタイトル
title: サイト設定
subscriptions:
@@ -193,6 +181,10 @@ ja:
title: PubSubHubbub
topic: トピック
title: 管理
+ admin_mailer:
+ new_report:
+ body: "%{reporter} が %{target} を通報しました"
+ subject: "%{instance} の新しい通報 (#%{id})"
application_mailer:
settings: 'メール設定の変更: %{link}'
signature: Mastodon %{instance} インスタンスからの通知
@@ -200,7 +192,7 @@ ja:
applications:
invalid_url: URLが無効です
auth:
- change_password: ログイン情報
+ change_password: セキュリティ
delete_account: アカウントの削除
delete_account_html: アカウントを削除したい場合、こちらから手続きが行えます。削除前には確認画面があります。
didnt_get_confirmation: 確認メールを受信できませんか？
@@ -320,6 +312,43 @@ ja:
missing_resource: リダイレクト先が見つかりませんでした
proceed: フォローする
prompt: 'フォローしようとしています:'
+ sessions:
+ activity: 最後のアクティビティ
+ browser: ブラウザ
+ browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ firefox: Firefox
+ generic: 不明なブラウザ
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
+ opera: Opera
+ phantom_js: PhantomJS
+ qq: QQ Browser
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ current_session: 現在のセッション
+ description: "%{browser} on %{platform}"
+ explanation: あなたのMastodonアカウントに現在ログインしているウェブブラウザの一覧です。
+ ip: IP
+ platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ other: 不明なプラットフォーム
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
+ title: セッション
settings:
authorized_apps: 認証済みアプリ
back: 戻る
@@ -344,8 +373,78 @@ ja:
unlisted_long: 誰でも見ることができますが、公開タイムラインには表示されません
stream_entries:
click_to_show: クリックして表示
- reblogged: ブーストされました
+ reblogged: さんにブーストされました
sensitive_content: 閲覧注意
+ terms:
+ body_html: |
+
プライバシーポリシー
+ +どのような情報を収集するのですか？
+ +あなたがこのサイトに登録すると、ここで共有された情報を読んだり、書いたり、評価したりして、フォーラムでの情報を集める事ができます。
+ +このサイトに登録する際には、名前とメールアドレスの入力を求めることがあります。ただし、登録をすることなくこのサイトを利用することも可能です。あなたのメールアドレスは、固有のリンクを含んだメールで確認されます。そのリンクにアクセスした場合にメールアドレスを制御することとなります。
+ +アカウントを登録し、投稿を行った際にはその投稿が行われたIPアドレスを記録します。また、このサーバーに対する全てのリクエストはIPアドレスを含むサーバーログとして保管されます。
+ +自分の情報を何に使うのですか？
+ +このサイトで収集された情報は、次のいくつかの方法で使用されます:
+ +-
+
- パーソナライズ・エクスペリエンス — あなたの情報は、あなたや他のユーザーのニーズに対応するために役立ちます。 +
- サイトの改善・最適化 — このサービスはあなたから受け取った情報やフィードバックに基づいて提供されるサイトの改善を行いつづけます。 +
- サービスの向上 — あなたの情報は、ユーザーからの要求やサポートへより効果的に対応するために役立ちます。 +
- 定期メールの送信 — メールアドレスは、情報の送信、トピックの変更やユーザー名に関係するお知らせ、お問い合わせに関する返答、その他のリクエストや質問に関してお知らせするために使用されます。 +
自分の情報はどのように保護されるのですか？
+ +このサービスはあなたの個人情報の入力、送信、またはアクセスに際してあなたの個人情報の安全性を維持するために様々なセキュリティ手段をとっています。
+ +クッキーを使用していますか？
+ +はい。クッキーはあなたがウェブブラウザ上で許可した場合にコンピュータのストレージに転送される小さなファイルです。これらのクッキーを使用すると、サイトでブラウザが識別され、登録済みのアカウントを持っている場合は登録済みのアカウントに関連付けがされます。
+ +クッキーを使用して、今後再度閲覧された場合に前回のデータから設定を呼び出したり、今後の改善のためにサイトのトラフィックやサイトの相互作用に関する集計データを作成します。このサービスは、サイトを訪れた方との理解を深めるために、第三者のサービス提供者と契約することがあります。これらのサービス提供者というものは、このサービスでの業務を行ったり、改善するためにこのサービスの代わって収集された情報を使用することはできません。
+ +このサイトは外部に何らかの情報を開示していますか？
+ +私たちは、個人を特定出来る情報を外部へ販売、取引、または他の方法で渡すことはありません。これには、このサイトを操作したり、業務を行ったり、サービスを提供するのに役立つ信頼できる第三者は含まれません。法令遵守、サイトポリシーの施行、このサービスや他の人の権利、財産または安全の保護のために適切であると判断した場合に、あなたの情報を公開する場合があります。ただし、マーケティングや広告、その他の目的で匿名での訪問者情報を他者へ提供することができます。
+ +サードパーティのリンク
+ +必要に応じて、このサービスの方針にもとづいてこのサイトや第三者のサービスを提供することがあります。これらの第三者のサイトには、個別の独立したプライバシーポリシーがあります。従って、これらのリンク先のサイトに関するコンテンツや活動にかんしては一切責任を負いません。ですが、サイトの完全性やこれらのサイトに関するフィードバックは非常に重要なものであると認識しております。
+ +子供のオンライン・プライバシー保護法
+ +このサイト、製品、サービスはすべて13歳以上の人を対象としております。このサーバーが米国にあり、13歳未満の場合はCOPPA (Children's Online Privacy Protection Act) にもとづいてこのサイトを使用しないでください。
+ +オンライン限定のプライバシーポリシー
+ +このオンライン・プライバシーポリシーは、このサイトを通じて収集された情報のみに適用され、オフラインで収集される情報には適用されません。
+ +あなたの同意
+ +このサービスを使用することにより、このサイトのプライバシーポリシーに同意するものとします。
+ +プライバシーポリシーの変更
+ +プライバシーポリシーを変更する場合は、このページへ変更内容を掲載します。
+ +この文章のライセンスはCC-BY-SAです。このページは2017年5月6日が最終更新です。
+ +オリジナルの出典 Discourse privacy policy.
+ title: "%{instance} 利用規約・プライバシーポリシー"
time:
formats:
default: "%Y年%m月%d日 %H:%M"
@@ -354,13 +453,15 @@ ja:
description_html: "二段階認証を有効にするとログイン時、電話でコードを受け取る必要があります。"
disable: 無効
enable: 有効
+ enabled: 二段階認証は有効になっています
enabled_success: 二段階認証が有効になりました
generate_recovery_codes: リカバリーコードを生成
instructions_html: "Google Authenticatorか、もしくはほかのTOTPアプリでこのQRコードをスキャンしてください。これ以降、ログインするときはそのアプリで生成されるコードが必要になります。"
lost_recovery_codes: リカバリーコードを使用すると携帯電話を紛失した場合でもアカウントにアクセスできるようになります。 リカバリーコードを紛失した場合もここで再生成することができますが、古いリカバリーコードは無効になります。
manual_instructions: 'QRコードがスキャンできず、手動での登録を希望の場合はこのシークレットコードを利用してください。:'
+ recovery_codes: リカバリーコード
recovery_codes_regenerated: リカバリーコードが再生成されました。
- recovery_instructions_html: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。 リカバリーコードは印刷して安全に保管してください。
+ recovery_instructions_html: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。リカバリーコードは大切に保全してください。たとえば印刷してほかの重要な書類と一緒に保管することができます。
setup: 初期設定
wrong_code: コードが間違っています。サーバー上の時間とデバイス上の時間が一致していることを確認してください。
users:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
new file mode 100644
index 0000000000..bafc199934
--- /dev/null
+++ b/config/locales/ko.yml
@@ -0,0 +1,396 @@
+---
+ko:
+ about:
+ about_mastodon: Mastodon 은자유로운 오픈 소스소셜 네트워크입니다. 상용 플랫폼의 대체로써 분산형 구조를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 — 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 Mastodon 인스턴스를 만들 수 있으며, Seamless하게 소셜 네트워크에 참가할 수 있습니다.
+ about_this: 이 인스턴스에 대해서
+ business_email: '비즈니스 메일 주소:'
+ closed_registrations: 현재 이 인스턴스에서는 신규 등록을 받고 있지 않습니다.
+ contact: 연락처
+ description_headline: "%{domain} 는 무엇인가요?"
+ domain_count_after: 개의 인스턴스
+ domain_count_before: 연결됨
+ get_started: 참가하기
+ links: 링크
+ other_instances: 다른 인스턴스
+ source_code: 소스 코드
+ status_count_after: Toot
+ status_count_before: Toot 수
+ terms: 개인 정보 보호 정책
+ user_count_after: 명
+ user_count_before: 사용자 수
+ version: 버전
+ accounts:
+ follow: 팔로우
+ followers: 팔로워
+ following: 팔로잉
+ nothing_here: 아무 것도 없습니다.
+ people_followed_by: "%{name} 님이 팔로우 중인 계정"
+ people_who_follow: "%{name} 님을 팔로우 중인 계정"
+ posts: 포스트
+ remote_follow: 리모트 팔로우
+ reserved_username: 이 아이디는 예약되어 있습니다.
+ unfollow: 팔로우 해제
+ activitypub:
+ activity:
+ announce:
+ name: "%{account_name} 님이 액티비티를 공유했습니다"
+ create:
+ name: "%{account_name} 님이 노트를 작성했습니다"
+ outbox:
+ name: "%{account_name} 님의 송신함"
+ summary: "%{account_name} 님의 액티비티 모음"
+ admin:
+ accounts:
+ are_you_sure: 정말로 실행하시겠습니까?
+ confirm: 확인
+ confirmed: 확인됨
+ disable_two_factor_authentication: 2단계 인증을 비활성화
+ display_name: 이름
+ domain: 도메인
+ edit: 편집
+ email: E-mail
+ feed_url: 피드 URL
+ followers: 팔로워 수
+ follows: 팔로잉 수
+ ip: IP
+ location:
+ all: 전체
+ local: 로컬
+ remote: 리모트
+ title: 위치
+ media_attachments: 첨부된 미디어
+ moderation:
+ all: 전체
+ silenced: 침묵 중
+ suspended: 정지 중
+ title: 모더레이션
+ most_recent_activity: 최근 활동
+ most_recent_ip: 최근 IP
+ not_subscribed: 구독하지 않음
+ order:
+ alphabetic: 알파벳 순
+ most_recent: 최근 활동 순
+ title: 순서
+ perform_full_suspension: 완전히 정지시키기
+ profile_url: 프로필 URL
+ public: 전체 공개
+ push_subscription_expires: PuSH 구독 기간 만료
+ redownload: 아바타 업데이트
+ reset: 초기화
+ reset_password: 비밀번호 초기화
+ resubscribe: 다시 구독
+ salmon_url: Salmon URL
+ search: 검색
+ show:
+ created_reports: 이 계정에서 제출된 신고
+ report: 신고
+ targeted_reports: 이 계정에 대한 신고
+ silence: 침묵
+ statuses: Toot 수
+ subscribe: 구독하기
+ title: 계정
+ undo_silenced: 침묵 해제
+ undo_suspension: 정지 해제
+ unsubscribe: 구독 해제
+ username: 아이디
+ web: Web
+ domain_blocks:
+ add_new: 추가하기
+ created_msg: 도메인 차단 처리를 완료했습니다.
+ destroyed_msg: 도메인 차단을 해제했습니다.
+ domain: 도메인
+ new:
+ create: 차단 추가
+ hint: 도메인 차단은 내부 데이터베이스에 계정이 생성되는 것까지는 막을 수 없지만, 그 도메인에서 생성된 계정에 자동적으로 특정한 모더레이션을 적용하게 할 수 있습니다.
+ severity:
+ desc_html: "침묵은 계정을 팔로우 하지 않고 있는 사람들에겐 계정의 Toot을 보이지 않게 합니다. 정지는 계정의 컨텐츠, 미디어, 프로필 데이터를 삭제합니다."
+ silence: 침묵
+ suspend: 정지
+ title: 새로운 도메인 차단
+ reject_media: 미디어 파일 거부하기
+ reject_media_hint: 로컬에 저장된 미디어 파일을 삭제하고, 이후로도 다운로드를 거부합니다. 정지하고는 관계 없습니다.
+ severities:
+ silence: 침묵
+ suspend: 정지
+ severity: 심각도
+ show:
+ affected_accounts:
+ one: 데이터베이스 중 1개의 계정에 영향을 끼칩니다
+ other: 데이터베이스 중 %{count}개의 계정에 영향을 끼칩니다
+ retroactive:
+ silence: 이 도메인에 존재하는 모든 계정의 침묵를 해제
+ suspend: 이 도메인에 존재하는 모든 계정의 계정 정지를 해제
+ title: "%{domain}의 도메인 차단을 해제"
+ undo: 실행 취소
+ title: 도메인 차단
+ undo: 실행 취소
+ instances:
+ account_count: 알려진 계정의 수
+ domain_name: 도메인 이름
+ title: 알려진 인스턴스들
+ reports:
+ action_taken_by: 신고 처리자
+ are_you_sure: 정말로 실행하시겠습니까?
+ comment:
+ label: 코멘트
+ none: 없음
+ delete: 삭제
+ id: ID
+ mark_as_resolved: 해결 완료 처리
+ nsfw:
+ 'false': NSFW 꺼짐
+ 'true': NSFW 켜짐
+ report: '신고 #%{id}'
+ report_contents: 내용
+ reported_account: 신고 대상 계정
+ reported_by: 신고자
+ resolved: 해결됨
+ silence_account: 계정을 침묵 처리
+ status: 상태
+ suspend_account: 계정을 정지
+ target: 대상
+ title: 신고
+ unresolved: 미해결
+ view: 표시
+ settings:
+ contact_information:
+ email: 공개할 메일 주소를 입력
+ username: 아이디를 입력
+ registrations:
+ closed_message:
+ desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다.
HTML 태그를 사용할 수 있습니다.
+ title: 신규 등록 정지 시 메시지
+ open:
+ title: 신규 등록을 받음
+ site_description:
+ desc_html: 탑 페이지와 meta 태그에 사용됩니다.
HTML 태그, 예를 들어<a> 태그와 <em> 태그를 사용할 수 있습니다.
+ title: 사이트 설명
+ site_description_extended:
+ desc_html: 인스턴스 정보 페이지에 표시됩니다.
HTML 태그를 사용할 수 있습니다.
+ title: 사이트 상세 설명
+ site_title: 사이트 이름
+ title: 사이트 설정
+ subscriptions:
+ callback_url: 콜백 URL
+ confirmed: 확인됨
+ expires_in: 기한
+ last_delivery: 최종 발송
+ title: PubSubHubbub
+ topic: 토픽
+ title: 관리
+ admin_mailer:
+ new_report:
+ body: "%{reporter} 가 %{target} 를 신고했습니다"
+ subject: "%{instance} 에 새 신고 등록됨 (#%{id})"
+ application_mailer:
+ settings: '메일 설정을 변경: %{link}'
+ signature: Mastodon %{instance} 인스턴스로에서 알림
+ view: 'View:'
+ applications:
+ invalid_url: 올바르지 않은 URL입니다
+ auth:
+ change_password: 보안
+ delete_account: 계정 삭제
+ delete_account_html: 계정을 삭제하고 싶은 경우, 여기서 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다.
+ didnt_get_confirmation: 확인 메일을 받지 못하셨습니까?
+ forgot_password: 비밀번호를 잊어버리셨습니까?
+ login: 로그인
+ logout: 로그아웃
+ register: 등록하기
+ resend_confirmation: 확인 메일을 다시 보내기
+ reset_password: 비밀번호 재설정
+ set_new_password: 새 비밀번호
+ authorize_follow:
+ error: 리모트 팔로우 도중 오류가 발생했습니다.
+ follow: 팔로우
+ prompt_html: '나(%{self}) 는 아래 계정의 팔로우를 요청했습니다:'
+ title: "%{acct} 를 팔로우"
+ datetime:
+ distance_in_words:
+ about_x_hours: "%{count}시간"
+ about_x_months: "%{count}월"
+ about_x_years: "%{count}년"
+ almost_x_years: "%{count}년"
+ half_a_minute: 지금
+ less_than_x_minutes: "%{count}분"
+ less_than_x_seconds: 지금
+ over_x_years: "%{count}년"
+ x_days: "%{count}일"
+ x_minutes: "%{count}분"
+ x_months: "%{count}월"
+ x_seconds: "%{count}초"
+ deletes:
+ bad_password_msg: 비밀번호가 올바르지 않습니다
+ confirm_password: 본인 확인을 위해, 현재 사용 중인 비밀번호를 입력해 주십시오.
+ description_html: 계정에 업로드된 모든 컨텐츠가 삭제되며, 계정은 비활성화 됩니다. 이것은 영구적으로 이루어지는 것이므로 되돌릴 수 없습니다. 사칭 행위를 방지하기 위해 같은 아이디로 다시 등록하는 것은 불가능합니다.
+ proceed: 계정 삭제
+ success_msg: 계정이 정상적으로 삭제되었습니다.
+ warning_html: 삭제가 보장되는 것은 이 인스턴스 상에서의 컨텐츠에 한합니다. 타 인스턴스 등, 외부에 멀리 공유된 컨텐츠는 흔적이 남아 삭제되지 않는 경우도 있습니다. 그리고 현재 접속이 불가능한 서버나, 업데이트를 받지 않게 된 서버에 대해서는 삭제가 반영되지 않을 수도 있습니다.
+ warning_title: 공유된 컨텐츠에 대해서
+ errors:
+ '403': 이 페이지를 표시할 권한이 없습니다
+ '404': 페이지를 찾을 수 없습니다
+ '410': 이 페이지는 더 이상 존재하지 않습니다
+ '422':
+ content: 보안 인증에 실패했습니다. Cookie를 차단하고 있진 않습니까?
+ title: 보안 인증 실패
+ '429': 요청 횟수 제한에 도달했습니다.
+ noscript: Mastodon을 사용하기 위해서는 JavaScript를 켜 주십시오.
+ exports:
+ blocks: 차단
+ csv: CSV
+ follows: 팔로우
+ mutes: 뮤트
+ storage: 미디어
+ followers:
+ domain: 도메인
+ explanation_html: 프라이버시를 확보하고 싶은 경우, 누가 여러분을 팔로우 하고 있는지 파악해둘 필요가 있습니다. 프라이빗 포스팅은 여러분의 팔로워가 소속하는 모든 인스턴스로 배달됩니다. 팔로워가 소속된 인스턴스 관리자나 소프트웨어가 여러분의 프라이버시를 존중하고 있는지 잘 모를 경우, 그 팔로워를 삭제하는 것이 좋을 수도 있습니다.
+ followers_count: 팔로워 수
+ lock_link: 비공개 계정
+ purge: 팔로워에서 삭제
+ success:
+ one: 1개 도메인에서 팔로워를 soft-block 처리 중...
+ other: "%{count}개 도메인에서 팔로워를 soft-block 처리 중..."
+ true_privacy_html: "프라이버시 보호는 End-to-End 암호화로만 이루어 질 수 있다는 것에 유의해 주십시오."
+ unlocked_warning_html: 누구든 여러분을 팔로우 할 수 있으며, 여러분의 프라이빗 투고를 볼 수 있습니다. 팔로우 할 수 있는 사람을 제한하고 싶은 경우 %{lock_link}에서 설정해 주십시오.
+ unlocked_warning_title: 이 계정은 비공개로 설정되어 있지 않습니다.
+ generic:
+ changes_saved_msg: 정상적으로 변경되었습니다.
+ powered_by: powered by %{link}
+ save_changes: 변경 사항을 저장
+ validation_errors:
+ one: 오류가 발생했습니다. 아래 오류를 확인해 주십시오
+ other: 오류가 발생했습니다. 아래 %{count}개 오류를 확인해 주십시오
+ imports:
+ preface: 다른 인스턴스에서 내보내기 한 파일에서 팔로우 / 차단 정보를 이 인스턴스 계정으로 불러올 수 있습니다.
+ success: 파일이 정상적으로 업로드 되었으며, 현재 처리 중입니다. 잠시 후 다시 확인해 주십시오.
+ types:
+ blocking: 차단한 계정 목록
+ following: 팔로우 중인 계정 목록
+ muting: 뮤트 중인 계정 목록
+ upload: 업로드
+ landing_strip_html: "%{name} 님은 %{link_to_root_path} 인스턴스의 사용자입니다. 계정을 가지고 있다면 팔로우 하거나 대화할 수 있습니다."
+ landing_strip_signup_html: 아직 계정이 없다면 여기서 등록할 수 있습니다.
+ media_attachments:
+ validations:
+ images_and_video: 이미 사진이 첨부되어 있으므로 동영상을 첨부할 수 없습니다.
+ too_many: 최대 4개까지 첨부할 수 있습니다.
+ notification_mailer:
+ digest:
+ body: "%{instance} 에서 마지막 로그인 뒤로 일어난 일:"
+ mention: "%{name} 님이 답장했습니다:"
+ new_followers_summary:
+ one: 새 팔로워가 생겼습니다!
+ other: "%{count} 명의 팔로워가 생겼습니다!"
+ subject:
+ one: "1건의 새로운 알림 \U0001F418"
+ other: "%{count}건의 새로운 알림 \U0001F418"
+ favourite:
+ body: "%{name} 님이 내 Toot을 즐겨찾기에 등록했습니다."
+ subject: "%{name} 님이 내 Toot을 즐겨찾기에 등록했습니다"
+ follow:
+ body: "%{name} 님이 나를 팔로우 했습니다"
+ subject: "%{name} 님이 나를 팔로우 했습니다"
+ follow_request:
+ body: "%{name} 님이 내게 팔로우 요청을 보냈습니다."
+ subject: "%{name} 님이 보낸 팔로우 요청"
+ mention:
+ body: "%{name} 님이 답장을 보냈습니다:"
+ subject: "%{name} 님이 답장을 보냈습니다"
+ reblog:
+ body: "%{name} 님이 내 Toot을 부스트 했습니다:"
+ subject: "%{name} 님이 내 Toot을 부스트 했습니다"
+ pagination:
+ next: 다음
+ prev: 이전
+ truncate: "…"
+ remote_follow:
+ acct: 아이디@도메인을 입력해 주십시오
+ missing_resource: 리디렉션 대상을 찾을 수 없습니다
+ proceed: 팔로우 하기
+ prompt: 팔로우 하려 하고 있습니다
+ sessions:
+ activity: 마지막 활동
+ browser: 브라우저
+ browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ firefox: Firefox
+ generic: 알 수 없는 브라우저
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
+ opera: Opera
+ phantom_js: PhantomJS
+ qq: QQ Browser
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ current_session: 현재 세션
+ description: "%{browser} on %{platform}"
+ explanation: 내 Mastodon 계정에 현재 로그인 중인 웹 브라우저 목록입니다.
+ ip: IP
+ platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ other: 알 수 없는 플랫폼
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
+ title: 세션
+ settings:
+ authorized_apps: 인증된 어플리케이션
+ back: 돌아가기
+ delete: 계정 삭제
+ edit_profile: 프로필 편집
+ export: 데이터 내보내기
+ followers: 신뢰 중인 인스턴스
+ import: 데이터 가져오기
+ preferences: 사용자 설정
+ settings: 설정
+ two_factor_authentication: 2단계 인증
+ statuses:
+ open_in_web: Web으로 열기
+ over_character_limit: 최대 %{max}자까지 입력할 수 있습니다
+ show_more: 더 보기
+ visibilities:
+ private: 비공개
+ private_long: 팔로워에게만 표시됩니다
+ public: 공개
+ public_long: 누구나 볼 수 있으며, 공개 타임라인에 표시됩니다
+ unlisted: Unlisted
+ unlisted_long: 누구나 볼 수 있지만, 공개 타임라인에는 표시되지 않습니다
+ stream_entries:
+ click_to_show: 클릭해서 표시
+ reblogged: 님이 부스트 했습니다
+ sensitive_content: 민감한 컨텐츠
+ time:
+ formats:
+ default: "%Y년 %m월 %d일 %H:%M"
+ two_factor_authentication:
+ code_hint: 확인하기 위해서 인증 어플리케이션에서 표시된 코드를 입력해 주십시오
+ description_html: "2단계 인증을 활성화 하면 로그인 시 전화로 인증 코드를 받을 필요가 있습니다."
+ disable: 비활성화
+ enable: 활성화
+ enabled: 2단계 인증이 활성화 되어 있습니다
+ enabled_success: 2단계 인증이 활성화 되었습니다
+ generate_recovery_codes: 복구 코드 생성
+ instructions_html: "Google Authenticator, 또는 타 TOTP 어플리케이션에서 이 QR 코드를 스캔해 주십시오. 이후 로그인 시에는 이 어플리케이션에서 생성되는 코드가 필요합니다."
+ lost_recovery_codes: 복구 코드를 사용하면 휴대전화를 분실한 경우에도 계정에 접근할 수 있게 됩니다. 복구 코드를 분실한 경우에도 여기서 다시 생성할 수 있지만, 예전 복구 코드는 비활성화 됩니다.
+ manual_instructions: 'QR 코드를 스캔할 수 없어 수동으로 등록을 원하시는 경우 이 비밀 코드를 사용해 주십시오: '
+ recovery_codes: 복구 코드
+ recovery_codes_regenerated: 복구 코드가 다시 생성되었습니다.
+ recovery_instructions_html: 휴대전화를 분실한 경우, 아래 복구 코드 중 하나를 사용해 계정에 접근할 수 있습니다. 복구 코드는 안전하게 보관해 주십시오. 이 코드를 인쇄해 중요한 서류와 함께 보관하는 것도 좋습니다.
+ setup: 초기 설정
+ wrong_code: 코드가 올바르지 않습니다. 서버와 휴대전화 간의 시간이 일치하는지 확인해 주십시오.
+ users:
+ invalid_email: 메일 주소가 올바르지 않습니다
+ invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d9b02e09cd..dfc58f6b35 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -3,23 +3,12 @@ nl:
about:
about_mastodon: Mastodon is een vrij, gratis en open-source sociaal netwerk. Een gedecentraliseerd alternatief voor commerciële platforms. Het voorkomt de risico's van een enkel bedrijf dat jouw communicatie monopoliseert. Kies een server die je vertrouwt — welke je ook kiest, je kunt met elke andere server communiceren. Iedereen kan een eigen Mastodon-server draaien en naadloos deelnemen in het sociale netwerk.
about_this: Over deze server
- apps: Apps
business_email: 'E-mailadres:'
closed_registrations: Registreren op deze server is momenteel uitgeschakeld.
contact: Contact
description_headline: Wat is %{domain}?
domain_count_after: andere servers
domain_count_before: Verbonden met
- features:
- api: Open API voor apps en diensten
- blocks: Uitgebreide blokkeer- en negeerhulpmiddelen
- characters: 500 tekens per bericht
- chronology: Tijdlijnen zijn chronologisch
- ethics: 'Ethisch design: geen advertenties, geen spionage'
- gifv: GIFV-sets en korte video's
- privacy: Nauwkeurige privacyinstellingen per toot (bericht)
- public: Openbare tijdlijnen
- features_headline: Wat maakt Mastodon anders
get_started: Beginnen
links: Links
other_instances: Andere servers
@@ -36,24 +25,43 @@ nl:
nothing_here: Hier is niets!
people_followed_by: Mensen die %{name} volgt
people_who_follow: Mensen die %{name} volgen
- posts: Berichten
+ posts: Toots
remote_follow: Extern volgen
unfollow: Ontvolgen
admin:
+ reports:
+ action_taken_by: Actie uitgevoerd door
+ are_you_sure: Weet je het zeker?
+ comment:
+ label: Opmerking
+ none: Geen
+ delete: Verwijderen
+ id: ID
+ mark_as_resolved: Markeer als opgelost
+ nsfw:
+ 'false': Media tonen
+ 'true': Media verbergen
+ report: 'Gerapporteerde toot #%{id}'
+ reported_account: Gerapporteerde account
+ reported_by: Gerapporteerd door
+ resolved: Opgelost
+ silence_account: Account stilzwijgen
+ status: Toot
+ suspend_account: Account blokkeren
+ target: Target
+ title: Gerapporteerde toots
+ unresolved: Onopgelost
+ view: Weergeven
settings:
contact_information:
email: Vul een openbaar gebruikt e-mailadres in
- label: Contactgegevens
username: Vul een gebruikersnaam in
registrations:
closed_message:
desc_html: Wordt op de voorpagina weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld
En ook hier kan je HTML gebruiken
title: Bericht wanneer registratie is uitgeschakeld
open:
- disabled: Uitgeschakeld
- enabled: Ingeschakeld
title: Open registratie
- setting: Instelling
site_description:
desc_html: Dit wordt als een alinea op de voorpagina getoond en gebruikt als meta-tag in de paginabron.
Je kan HTML gebruiken, zoals <a> en <em>.
title: Omschrijving Mastodon-server
@@ -62,24 +70,11 @@ nl:
title: Uitgebreide omschrijving Mastodon-server
site_title: Naam Mastodon-server
title: Server-instellingen
- admin.reports:
- comment:
- label: Opmerking
- none: Geen
- delete: Verwijderen
- id: ID
- mark_as_resolved: Markeer als opgelost
- report: 'Gerapporteerde toot #%{id}'
- reported_account: Gerapporteerde account
- reported_by: Gerapporteerd door
- resolved: Opgelost
- silence_account: Account stilzwijgen
- status: Toot
- suspend_account: Account blokkeren
- target: Target
- title: Gerapporteerde toots
- unresolved: Onopgelost
- view: Weergeven
+ title: Beheer
+ admin_mailer:
+ new_report:
+ body: "%{reporter} heeft %{target} gerapporteerd"
+ subject: Nieuwe toots gerapporteerd op %{instance} (#%{id})
application_mailer:
settings: 'E-mailvoorkeuren wijzigen: %{link}'
signature: Mastodon-meldingen van %{instance}
@@ -87,7 +82,9 @@ nl:
applications:
invalid_url: De opgegevens URL is ongeldig
auth:
- change_password: Inloggegevens
+ change_password: Beveiliging
+ delete_account: Account verwijderen
+ delete_account_html: Wanneer je jouw account graag wilt verwijderen, kan je dat hier doen. We vragen jou daar om een bevestiging.
didnt_get_confirmation: Geen bevestigingsinstructies ontvangen?
forgot_password: Wachtwoord vergeten?
login: Aanmelden
@@ -115,12 +112,23 @@ nl:
x_minutes: "%{count}m"
x_months: "%{count}ma"
x_seconds: "%{count}s"
+ deletes:
+ bad_password_msg: Goed geprobeerd hackers! Ongeldig wachtwoord
+ confirm_password: Voer jouw huidige wachtwoord in om jouw identiteit te bevestigen
+ description_html: Hierdoor worden alle gegevens van jouw account permanent, onomkeerbaar verwijderd en wordt deze gedeactiveerd. Om toekomstige identiteitsdiefstal te voorkomen, kan op deze server jouw gebruikersnaam niet meer gebruikt worden.
+ proceed: Account verwijderen
+ success_msg: Jouw account is succesvol verwijderd
+ warning_html: We kunnen alleen garanderen dat jouw gegevens op deze server worden verwijderd. Berichten (toots), incl. media, die veel zijn gedeeld laten mogelijk sporen achter. Offline servers en servers die niet meer op jouw updates zijn geabonneerd zullen niet hun databases updaten.
+ warning_title: Verwijdering gegevens op andere servers
errors:
+ '403': Jij hebt geen toestemming om deze pagina te bekijken.
'404': De pagina waarnaar jij op zoek bent bestaat niet.
'410': De pagina waarnaar jij op zoek bent bestaat niet meer.
'422':
content: Veiligheidsverificatie mislukt. Blokkeer je toevallig cookies?
title: Veiligheidsverificatie mislukt
+ '429': Te veel verbindingsaanvragen.
+ noscript: Schakel JavaScript in om Mastodon te kunnen gebruiken.
exports:
blocks: Jij blokkeert
csv: CSV
@@ -141,7 +149,7 @@ nl:
unlocked_warning_title: Jouw account is niet besloten
generic:
changes_saved_msg: Wijzigingen succesvol opgeslagen!
- powered_by: mogelijk gemaakt door %{link}
+ powered_by: wordt mogelijk gemaakt door %{link}
save_changes: Wijzigingen opslaan
validation_errors:
one: Er is iets niet helemaal goed! Bekijk onderstaande fout
@@ -154,7 +162,7 @@ nl:
following: Volglijst
muting: Negeerlijst
upload: Uploaden
- landing_strip_html: %{name} is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt.
+ landing_strip_html: "%{name} is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt."
landing_strip_signup_html: Als je dat niet hebt, kun je je hier registreren.
notification_mailer:
digest:
@@ -189,6 +197,43 @@ nl:
missing_resource: Kon vereiste doorverwijzings-URL voor jouw account niet vinden
proceed: Ga door om te volgen
prompt: 'Jij gaat volgen:'
+ sessions:
+ activity: Laatst actief
+ browser: Webbrowser
+ browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ firefox: Firefox
+ generic: Onbekende webbrowser
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
+ opera: Opera
+ phantom_js: PhantomJS
+ qq: QQ Browser
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ current_session: Huidige sessie
+ description: "%{browser} op %{platform}"
+ explanation: Dit zijn de webbrowsers die momenteel met jouw Mastodon-account zijn ingelogd.
+ ip: IP
+ platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ other: Onbekend platform
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
+ title: Sessies
settings:
authorized_apps: Geautoriseerde apps
back: Terug naar Mastodon
@@ -226,7 +271,7 @@ nl:
generate_recovery_codes: Herstelcodes genereren
instructions_html: "Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon. Van nu af aan genereert deze app aanmeldcodes die je bij het aanmelden moet invoeren."
lost_recovery_codes: Met herstelcodes kun je toegang tot jouw account krijgen wanneer je jouw telefoon bent kwijtgeraakt. Wanneer je jouw herstelcodes bent kwijtgeraakt, kan je ze hier opnieuw genereren. Jouw oude herstelcodes zijn daarna ongeldig.
- manual_instructions: 'Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.'
+ manual_instructions: Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.
recovery_codes_regenerated: Opnieuw genereren herstelcodes geslaagd
recovery_instructions_html: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. Zorg ervoor dat je de herstelcodes op een veilige plek bewaard. (Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.)
setup: Instellen
diff --git a/config/locales/no.yml b/config/locales/no.yml
index f71c08c6af..004e1ff803 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -3,23 +3,12 @@
about:
about_mastodon: Mastodon er et sosialt nettverk laget med fri programvare. Et desentralisert alternativ til kommersielle plattformer. Slik kan det unngå risikoene ved å ha et enkelt selskap som monopoliserer din kommunikasjon. Velg en tjener du stoler på — uansett hvilken du velger så kan du kommunisere med alle andre. Alle kan kjøre sin egen Mastodon og delta sømløst i det sosiale nettverket.
about_this: Om denne instansen
- apps: Applikasjoner
business_email: 'Bedriftsepost:'
closed_registrations: Registreringer er for øyeblikket lukket på denne instansen.
contact: Kontakt
description_headline: Hva er %{domain}?
domain_count_after: andre instanser
domain_count_before: Koblet til
- features:
- api: Åpent API for applikasjoner og tjenester
- blocks: Rikholdige blokkeringsverktøy
- characters: 500 tegn per status
- chronology: Tidslinjer er kronologiske
- ethics: 'Etisk design: Ingen reklame, ingen sporing'
- gifv: Støtte for GIFV og korte videoer
- privacy: Finmaskede personvernsinnstillinger
- public: Felles tidslinjer
- features_headline: Hva skiller Mastodon fra andre sosiale nettverk
get_started: Kom i gang
links: Lenker
other_instances: Andre instanser
@@ -153,17 +142,13 @@
settings:
contact_information:
email: Skriv en offentlig e-postadresse
- label: Kontaktinformasjon
username: Skriv brukernavn
registrations:
closed_message:
desc_html: Vises på forsiden når registreringer er lukket
Du kan bruke HTML-tagger
title: Melding for lukket registrering
open:
- disabled: På
- enabled: Av
title: Åpen registrering
- setting: Innstilling
site_description:
desc_html: Vises som et avsnitt på forsiden og brukes som en meta-tagg.
Du kan bruke HTML-tagger, spesielt <a> og <em>.
title: Nettstedsbeskrivelse
@@ -321,6 +306,76 @@
click_to_show: Klikk for å vise
reblogged: fremhevde
sensitive_content: Følsomt innhold
+ terms:
+ body_html: |
+
Personvernserklæring
+ +Hvilke opplysninger samler vi?
+ +Vi samler opplysninger fra deg når du registrerer deg på nettstedet vårt, og vi samler data når du deltar på forumet ved å lese, skrive og evaluere innholdet som deles her.
+ +Når du registrerer deg på nettstedet vårt, kan du bli bedt om å oppgi navnet og e-postadressen din. Imidlertid kan du besøke nettstedet vårt uten å registrere deg. E-postadressen din vil bli bekreftet med en e-post som inneholder en unik lenke. Hvis siden den lenker til, blir besøkt, vet vi at du har kontroll over e-postadressen.
+ +Når du registrerer deg og skriver innlegg, registrerer vi IP-adressen som innlegget stammer fra. Vi kan også oppbevare logger som inkluderer IP-adressen til alle forespørslene sendt til tjeneren vår.
+ +Hva bruker vi opplysningene dine til?
+ +Alle opplysningene vi samler fra deg, kan bli brukt på en av følgende måter:
+ +-
+
- For å gjøre opplevelsen din mer personlig. Opplysningene dine hjelper oss å svare bedre på dine individuelle behov. +
- For å forbedre nettstedet vårt. Vi jobber konstant for å forbedre nettstedets tilbud basert på opplysningene og tilbakemeldingene vi mottar fra deg. +
- For å forbedre vår kundeservice. Dine opplysninger hjelper oss å svare mer effektivt på dine forespørsler sendt til kundeservice eller behov om støtte. +
- For å sende periodiske e-poster. E-postadressen du oppgir, kan bli brukt til å sende deg informasjon, påminnelser som du ber om ved endringer av emner eller ved svar til brukernavnet ditt, til henvendelser, og/eller andre forspørsler eller andre spørsmål. +
Hvordan sikrer vi opplysningene?
+ +Vi gjennomfører flere sikkerhetstiltak for å holde personopplysningene dine sikre når du skriver inn, lagrer eller henter dem.
+ +Hva er retningslinjene deres for lagring av data?
+ +Vi vil forsøke i god tro å:
+ +-
+
- Ikke oppbevare tjener-logger som inneholder IP-adressen til alle forespørslene til denne tjeneren i lenger enn i 90 dager. +
- Ikke oppbevare IP-adressene forbundet med registrerte brukere og deres innlegg lenger enn i 5 år. +
Bruker vi informasjonskapsler?
+ +Ja. Informasjonskapsler er små filer som et nettsted eller dets tjenesteleverandør overfører til harddisken på datamaskinen din gjennom nettleseren din (dersom du tillater det). Disse informasjonskapslene gjør det mulig for nettstedet å gjenkjenne nettleseren din og, dersom du har en konto, knytte nettleseren til den.
+ +Vi bruker informasjonskapsler for å forstå og lagre preferansene dine for fremtidige besøk og for å samle aggregatdata om trafikk på og samhandling med nettstedet slik at vi kan tilby bedre opplevelser og verktøy på nettstedet i fremtiden. Vi kan inngå avtaler med tredjeparts tjenesteleverandører for å bistå oss i å forstå besøkerne våres bedre. Disse tjenesteleverandørene har ikke lov til å bruke opplysningene samlet på våres vegne unntatt til å hjelpe oss å gjennomføre og forbedre anliggendet vårt.
+ +Gir vi noen opplysninger videre til andre parter?
+ +Vi verken selger, handler med eller overfører på noen annen måte til andre parter dine identifiserbare personopplysninger. Dette inkluderer ikke tredjeparter som har vår tillit og bistår oss i å drive nettstedet, utføre våre anliggender eller yter tjenester til deg, så lenge disse partene samtykker til å behandle disse opplysningene fortrolig. Vi kan også frigi opplysningene dine dersom vi tror at å frigi dem er hensiktsmessig for å overholde loven, håndheve nettstedet retningslinjer eller beskytte våre og andres rettigheter. Imidlertid kan opplysninger som ikke er personlig identifiserbare, bli delt med andre parter for markedsføring, reklame eller annet bruk.
+ +Tredjeparts lenker
+ +Av og til, etter skjønn, kan vil inkludere eller tilby tredjeparts produkter eller tjenester på nettstedet vårt. Disse tredjeparts nettstedene har separate og selvstendige personvernerklæringer. Vi bærer derfor intet ansvar eller forpliktelser for innholdet eller aktivitetene til disse nettstedene det lenkes til. Ikke mindre prøver vi å bevare vår eget nettsteds integritet og ønsker enhver tilbakemelding om disse nettstedene velkomne.
+ +Overensstemmelse med Children's Online Privacy Protection Act
+ +Nettstedet er rettet mot folk som er minst 13 år gamle. Dersom denne tjeneren er i USA, og du er under 13 år i henhold til kravene i COPPA (Children's Online Privacy Protection Act), ikke bruk dette nettstedet.
+ +Personvernerklæring bare for nettet
+ +Denne nett-personvernerklæringen gjelder bare for informasjon samlet gjennom nettstedet vårt og ikke for opplysninger samlet når en er frakoblet.
+ +Ditt samtykke
+ +Ved å bruke dette nettstedet samtykker du til nettstedets personvernerklæring.
+ +Endringer i vår personvernerklæring
+ +Dersom vi beslutter å endre personvernerklæringen vår, vil vi publisere disse endringene på denne siden.
+ +Dette dokumentet er lisensiert under CC-BY-SA. De ble sist oppdatert 12. april 2017.
+ +Dokumentet er en adoptert og endret versjon fra Discourse privacy policy.
+ title: "%{instance} Personvern og villkår for bruk av nettstedet" time: formats: default: "%-d. %b %Y, %H:%M" diff --git a/config/locales/oc.yml b/config/locales/oc.yml index c882b43a11..91a6ca7910 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -3,23 +3,12 @@ oc: about: about_mastodon: Mastodon es un malhum social liure e open-source. Una alternativa decentralizada a las platformas comercialas, aquò evita qu’una sola companiá monopolize vòstra comunicacion. Causissètz une servidor que vos fisatz, quina que siague vòstra causida, podètz interagir amb tot lo mond. Qual que siague pòt aver son instància Mastodon e participar al malhum social sens cap de problèmas. about_this: A prepaus d’aquesta instància - apps: Aplicacions business_email: 'Corrièl professional :' closed_registrations: Las inscripcions son clavadas pel moment sus aquesta instància. contact: Contacte description_headline: Qué es %{domain} ? domain_count_after: autras instàncias domain_count_before: Connectat a - features: - api: API dubèrta per las aplicacions e servicis - blocks: Aisinas complètas per blocar e rescondre - characters: 500 caractèrs per publicacion - chronology: Flux d’actualitat cronologic - ethics: 'Ethical design: pas cap de reclama o traçador' - gifv: Partatge de GIFs e vidèos cortas - privacy: Nivèl de confidencialitat configurable per cada publicacion - public: Fluxes d’actualitat publics - features_headline: Çò que fa que Mastodon es diferent get_started: Venètz al malhum links: Ligams other_instances: Autras instàncias @@ -160,17 +149,13 @@ oc: settings: contact_information: email: Picatz una adreça de corrièl - label: Informacions de contacte username: Picatz un nom d’utilizaire registrations: closed_message: desc_html: Afichat sus las pagina d’acuèlh quand las inscripcions son tampadas.Podètz utilizar de balisas HTML title: Messatge de barradura de las inscripcions open: - disabled: Desactivadas - enabled: Activadas title: Inscripcions - setting: Paramètre site_description: desc_html: Afichada jos la forma de paragrafe sus la pagina d’acuèlh e utilizada coma balisa meta.
Podètz utilizar de balisas HTML, coma
<a> et <em>.
title: Descripcion del site
@@ -220,7 +205,7 @@ oc:
- dv
- ds
abbr_month_names:
- -
+ -
- gen
- feb
- mar
@@ -242,11 +227,11 @@ oc:
- divendres
- dissabte
formats:
- default: "%d/%m/%Y"
- long: Lo %B %d de %Y
- short: "%b %d"
+ default: "%e/%m/%Y"
+ long: Lo %e %B de %Y
+ short: "%e %b"
month_names:
- -
+ -
- de genièr
- de febrièr
- de març
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 113d7f235a..c6588e8464 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -3,23 +3,12 @@ pl:
about:
about_mastodon: Mastodon jest wolną i otwartą siecią społecznościową, zdecentralizowaną alternatywą dla zamkniętych, komercyjnych platform. Pozwala uniknąć ryzyka monopolizacji Twojej komunikacji przez jedną korporację. Wybierz serwer, któremu ufasz — nie ograniczy to Twoich możliwości komunikacji z innymi osobami w sieci. Każdy może też uruchomić własną instancję Mastodona i dołączyć do reszty tej sieci społecznościowej.
about_this: O tej instancji
- apps: Aplikacje
business_email: 'Służbowy adres e-mail:'
closed_registrations: Rejestracja na tej instancji jest obecnie zamknięta.
contact: Kontakt
description_headline: Czym jest %{domain}?
domain_count_after: instancji
domain_count_before: Serwer połączony z
- features:
- api: Otwarte API dla aplikacji i usług
- blocks: Rozbudowane narzędzia blokowania i ukrywania
- characters: 500 znaków na wpis
- chronology: Chronologiczny porządek wyświetlania
- ethics: 'Etyczne założenia: nie śledzimy, bez reklam'
- gifv: obsługa GIFV i krótkich wideo
- privacy: Precyzyjne ustawienia widoczności poszczególnych postów
- public: Publiczne osie czasu
- features_headline: Co wyróżnia Mastodona
get_started: Rozpocznijmy!
links: Odnośniki
other_instances: Inne instancje
@@ -61,8 +50,8 @@ pl:
edit: Edytuj
email: Adres e-mail
feed_url: Adres kanału
- followers: Obserwujący
- follows: Obserwacje
+ followers: Śledzący
+ follows: Śledzeni
ip: Adres IP
location:
all: Wszystkie
@@ -114,7 +103,7 @@ pl:
create: Utwórz blokadę
hint: Blokada domen nie zabroni tworzenia wpisów kont w bazie danych, ale pozwoli na automatyczną moderację kont do nich należących.
severity:
- desc_html: "Wyciszenie uczyni wpisy użytkownika niewidoczne dla osób, które go nie obserwują. Zawieszenie spowoduje usunięcie całej zawartości dodanej przez użytkownika."
+ desc_html: "Wyciszenie uczyni wpisy użytkownika widoczne tylko dla osób, które go śledzą. Zawieszenie spowoduje usunięcie całej zawartości dodanej przez użytkownika."
silence: Wycisz
suspend: Zawieś
title: Nowa blokada domen
@@ -166,23 +155,22 @@ pl:
settings:
contact_information:
email: Wprowadź publiczny adres e-mail
- label: Informacje kontaktowe
username: Wprowadź nazwę użytkownika
registrations:
closed_message:
desc_html: Wyświetlana na stronie głównej, gdy możliwość otwarej rejestracjinie jest dostępna. Możesz korzystać z tagów HTML title: Wiadomość o nieaktywnej rejestracji open: - disabled: Nieaktywna - enabled: Aktywna title: Otwarta rejestracja - setting: Ustawienie site_description: desc_html: Wyświetlany jako nagłówek na stronie głównej oraz jako meta tag.
Możesz korzystać z tagów HTML, w szczególności z
<a> i <em>.
title: Opis strony
site_description_extended:
desc_html: Wyświetlany w rozszerzonych informacjach o stronieMożesz korzystać z tagów HTML title: Extended site description + site_terms: + desc_html: Wyświetlana na stronie zasad użytkowania
Możesz używać tagów HTML + title: Polityka prywatności strony site_title: Tytuł strony title: Ustawienia strony subscriptions: @@ -195,7 +183,7 @@ pl: title: Administracja admin_mailer: new_report: - body: "Użytkownik %{reporter} zgłosił %{target}" + body: Użytkownik %{reporter} zgłosił %{target} subject: Nowe zgłoszenie na %{instance} (#%{id}) application_mailer: settings: 'Zmień ustawienia powiadamiania: %{link}' @@ -206,9 +194,9 @@ pl: auth: change_password: Bezpieczeństwo delete_account: Usunięcie konta - delete_account_html: Jeżeli próbowałeś usunąć konto, przejdź tutaj. Otrzymasz prośbę o potwierdzenie. + delete_account_html: Jeżeli chcesz usunąć konto, przejdź tutaj. Otrzymasz prośbę o potwierdzenie. didnt_get_confirmation: Nie otrzymałeś instrukcji weryfikacji? - forgot_password: Zapomniane hasło + forgot_password: Nie pamiętasz hasła? login: Zaloguj się logout: Wyloguj się register: Rejestracja @@ -218,6 +206,12 @@ pl: authorize_follow: error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd follow: Śledź + follow_request: 'Wysłano prośbę o pozwolenie na obserwację:' + following: 'Pomyślnie! Od teraz śledzisz:' + post_follow: + close: Ewentualnie, możesz po prostu zamknąć tą stronę. + return: Powróć do strony użytkownika + web: Przejdź do sieci prompt_html: 'Ty (%{self}) chcesz śledzić:' title: Śledź %{acct} datetime: @@ -259,15 +253,15 @@ pl: storage: Urządzenie przechowujące dane followers: domain: Domena - explanation_html: Jeżeli chcesz mieć pewność, kto może przeczytać Twoje statusy, musisz kontrolować, kto Cię obserwuje. Twoje prywatne statusy są dostarczane na te instancje, na których jesteś obserwowany. Możesz sprawdzać swoich obserwowanych i blokować ich, jeśli nie ufasz właścicielom lub oprogramowaniu danej instancji. - followers_count: Liczba obserwujących + explanation_html: Jeżeli chcesz mieć pewność, kto może przeczytać Twoje statusy, musisz kontrolować, kto śledzi Twój profil. Twoje prywatne statusy są dostarczane na te instancje, na których jesteś śledzony. Możesz sprawdzać, kto Cię śledzi i blokować ich, jeśli nie ufasz właścicielom lub oprogramowaniu danej instancji. + followers_count: Liczba śledzących lock_link: Zablokuj swoje konto - purge: Usuń z obserwujących + purge: Przestań śledzić success: - one: W trakcie usuwania obserwujcych z jednej domeny… - other: W trakcie usuwania obserwujących z %{count} domen… + one: W trakcie usuwania śledzących z jednej domeny… + other: W trakcie usuwania śledzących z %{count} domen… true_privacy_html: Pamiętaj, że rzeczywista prywatność może zostać uzyskana wyłącznie dzięki szyfrowaniu end-to-end. - unlocked_warning_html: Każdy może cię zaobserwować, aby natychmiastowo zobaczyć twoje statusy. %{lock_link} aby móc kontrolować obserwujących. + unlocked_warning_html: Każdy może cię śledzić, aby natychmiastowo zobaczyć twoje statusy. %{lock_link} aby móc kontrolować, kto Cię śledzi. unlocked_warning_title: Twoje konto nie jest zablokowane generic: changes_saved_msg: Ustawienia zapisane! @@ -371,7 +365,7 @@ pl: delete: Usuń konto edit_profile: Edytuj profil export: Eksportuj dane - followers: Autoryzowani obserwujący + followers: Autoryzowani śledzący import: Importuj dane preferences: Preferencje settings: Ustawienia @@ -382,15 +376,85 @@ pl: show_more: Pokaż więcej visibilities: private: Tylko dla śledzących - private_long: Widoczne tylko obserwowanych + private_long: Widoczne tylko dla śledzących public: Publiczny public_long: Widoczne dla wszystkich unlisted: Niewypisany unlisted_long: Widoczne dla wszystkich, ale nie wyświetlane na publicznych osiach czasu stream_entries: click_to_show: Naciśnij aby wyświetlić - reblogged: podbito + reblogged: podbił sensitive_content: Wrażliwa zawartość + terms: + body_html: | +
Polityka prywatności
+ +Jakie informacje zbieramy?
+ +Zbieramy informacje podane przy rejestracji i treści utworzone w trakcie korzystania z serwisu.
+ +Podczas rejestracji, możesz otrzymać prośbę o podanie adresu e-mail. Możesz jednak odwiedzać stronę bez rejestracji. Adres zostanie zweryfikowany przez kliknięcie w link wysłany w wiadomości. Dzięki temu wiemy, że jesteś właścicielem tego adresu.
+ +Podczas rejestracji i tworzenia postów, Twój adres IP jest zapisywany na naszych serwerach. Możemy też przechowywać adres IP użyty przy każdej operacji w serwisie.
+ +Jak wykorzystujemy zebrane informacje?
+ +Zebrane informacje mogą zostać w jednym z następujących celach:
+ +-
+
- Aby poprawić wrażenia — informacje o Tobie pomagają w dostosowywaniu serwisu do Twoich potrzeb. +
- Aby usprawnić stronę — nieustannie staramy się ulepszyć stronę na podstawie informacji o Tobie i Twoich opinii. +
- Aby usprawnić obsługę klienta — informacje pomogą obsłudze klienta utrzymywać kontakt z Tobą. +
- Aby okazjonalnie wysyłać wiadomości e-mail — Na podany adres e-mail mogą zostać wysłane wiadomości o wspomnieniu o Tobie we wpisach, przejrzeniu Twojego zgłoszenia i innych interakcji z Tobą. +
Jak zabezpieczamy dane?
+ +Korzystamy z wielu zabezpieczeń, aby utrudnić osobom niepowołanym dostęp do danych, które wprowadzasz, publikujesz i czytasz.
+ +Jak długo przechowujecie dane?
+ +Dołożymy wszelkich starań, aby przechowywać:
+ +-
+
- dzienniki serwera zawierające adresy IP przypisane do każdych operacji nie dłużej niż 90 dni. +
- adresy IP przypisane do użytkowników i ich wpisów nie dłużej niż 5 lat. +
Czy używamy plików cookies?
+ +Tak. Pliki cookies (zwane często ciasteczkami) są małymi zbiorami danych przechowywanych na Twoim dysku przez stronę internetową, aby rozpoznawać przeglądarkę i powiązać ją (jeżeli jesteś zarejestrowany/a) z Twoim kontem, jeżeli na to pozwolisz.
+ +Możemy używać ciasteczek, aby skonfigurować stronę na podstawie zapisanych preferencji, oraz dostosować ją do potrzeb innych użytkowników. Możemy korzystać z usług firm trzecich pomagających w zrozumieniu potrzeb użytkownika. Te usługi nie mogą korzystać ze zdobytych danych w celach innych niż analiza pomagająca ulepszać ten serwis.
+ +Czy przekazujecie dane podmiotów trzecim?
+ +Nie dokonujemy transakcji danych pozwalających na identyfikację Twojej osoby umieszczonych na tym serwisie. Nie oznacza to, że nie przekazujemy ich zaufanym podmiotom, które korzystają z nich poufnie. Możemy jednak udostępniać dane, jeżeli jest to wymagane prawnie, lub dla utrzymania bezpieczeństwa strony i innych użytkowników. W celach marketingowych (i podobnych) mogą zostać użyte jedynie dane niepozwalające na identyfikację osoby.
+ +Odnośniki do treści stron trzecich
+ +Czasem na stronie mogą pojawić się odnośniki do stron trzecich. Mają one odrębne regulaminy i politykę prywatności. Nie odpowiadamy więc za zawartość tych stron. Dokładamy jednak wszelkich starań, aby nie stanowiły one zagrożenia, prosimy jednak o opinie na temat ich wykorzystania.
+ +Children's Online Privacy Protection Act Compliance
+ +Ta strona i usługa jest przeznaczona dla osób, które ukończyły 13 lat. Jeżeli serwer znajduje się na terenie USA i nie masz ukończonych 13 lat, zgodnie z amerykańską ustawą COPPA (Children's Online Privacy Protection Act) nie możesz korzystać z tego serwisu.
+ +Polityka prywatności dotyczy tylko Internetu
+ +Ta polityka prywatności dotyczy jedynie danych zbieranych w Internecie, nie tych, które przechowywane są na Twoim kompurerze, np. pliki cookies.
+ +Wyrażenie zgody
+ +Korzystanie ze strony jest równoznaczne z akceptacją naszej polityki prywatności.
+ +Zmiany w naszej polityce prywatności
+ +Jeżeli zdecydujemy się na zmiany w polityce prywatności, zmiany pojawią się na tej stronie.
+ +Dokument jest dostępny na licencji CC-BY-SA. Ostatnio modyfikowany 31 maja 2013, przetłumaczony 4 lipca 2017. Tłumaczenie (mimo dołożenia wszelkich starań) może nie być w pełni poprawne.
+ +Tekst bazuje na polityce prywatności Discourse.
+ title: Zasady korzystania i polityka prywatności %{instance}
time:
formats:
default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 973a8d401f..355c20d05f 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -3,23 +3,12 @@ pt-BR:
about:
about_mastodon: Mastodon é um servidor de rede social grátis, e open-source. Uma alternativa descentralizada ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie — qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na rede social federada sem problemas.
about_this: Sobre essa instância
- apps: Aplicações
business_email: 'Email comercial:'
closed_registrations: Registros estão fechadas para essa instância.
contact: Contato
description_headline: O que é %{domain}?
domain_count_after: outras instâncias
domain_count_before: Conectado a
- features:
- api: Aberto para API de aplicações e serviços
- blocks: Bloqueos e ferramentas para mudar
- characters: 500 caracteres por post
- chronology: Timeline são cronologicas
- ethics: 'Design ético: sem propaganda, sem tracking'
- gifv: GIFV e vídeos curtos
- privacy: Granular, privacidade setada por post
- public: Timelines públicas
- features_headline: O que torna Mastodon diferente
get_started: Comece aqui
links: Links
other_instances: Outras instâncias
@@ -152,17 +141,13 @@ pt-BR:
settings:
contact_information:
email: Entre um endereço de email público
- label: Informação de contato
username: Entre com usuário
registrations:
closed_message:
desc_html: Mostrar na página inicial quando registros estão fecados
Você pode usar tags HTML
title: Mensagem de registro fechados
open:
- disabled: Desabilitado
- enabled: Habilitado
title: Aberto para registro
- setting: Preferências
site_description:
desc_html: Mostrar como parágrafo e usado como meta tag.
Vôce pode usar tags HTML, em particular <a> e <em>.
title: Descrição do site
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index dff2898c06..40be8a6c56 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -3,23 +3,12 @@ pt:
about:
about_mastodon: Mastodon é uma rede social grátis e em código aberto. Uma alternativa descentralizada às plataformas comerciais, que evita o risco de uma única empresa monopolizar a tua comunicação. Escolhe um servidor que confies, não importa qual, pois vais poder comunicar com todos os outros. Qualquer um pode criar uma instância Mastodon e participar nesta rede social.
about_this: Sobre esta instância
- apps: Aplicações
business_email: 'Email comercial:'
closed_registrations: Novos registos estão fechados nesta instância.
contact: Contacto
description_headline: O que é o %{domain}?
domain_count_after: outras instâncias
domain_count_before: Ligado a
- features:
- api: API aberta para aplicações e serviços
- blocks: Ferramentas para silenciar e bloquear
- characters: 500 caracteres por post
- chronology: Timelines cronológicas
- ethics: 'Design ético: sem públicidade ou tracking'
- gifv: GIFV e pequenos vídeos
- privacy: Privacidade granular por post
- public: Timelines públicas
- features_headline: O que torna Mastodon diferente
get_started: Começar
links: Links
other_instances: Outras instâncias
@@ -147,17 +136,13 @@ pt:
settings:
contact_information:
email: Inserir um endereço de email para tornar público
- label: Informação de contacto
username: Insira um nome de utilizador
registrations:
closed_message:
desc_html: Mostrar na página inicial quando registos estão encerrados
Podes usar tags HTML
title: Mensagem de registos encerrados
open:
- disabled: Desabilitado
- enabled: Habilitado
title: Aceitar novos registos
- setting: Preferências
site_description:
desc_html: Mostrar como parágrafo na página inicial e usado como meta tag.
Podes usar tags HTML, em particular <a> e <em>.
title: Descrição do site
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9cf067d884..5cfc2b1caf 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -3,23 +3,12 @@ ru:
about:
about_mastodon: Mastodon - это свободная социальная сеть с открытым исходным кодом. Как децентрализованная альтернатива коммерческим платформам, Mastodon предотвращает риск монополизации Вашего общения одной компанией. Выберите сервер, которому Вы доверяете — что бы Вы ни выбрали, Вы сможете общаться со всеми остальными. Любой может запустить свой собственный узел Mastodon и участвовать в социальной сети совершенно бесшовно.
about_this: Об этом узле
- apps: Приложения
business_email: 'Деловой e-mail:'
closed_registrations: В данный момент регистрация на этом узле закрыта.
contact: Связаться
description_headline: Что такое %{domain}?
domain_count_after: другими узлами
domain_count_before: Связан с
- features:
- api: Открытый API для приложений и сервисов
- blocks: Продвинутые инструменты блокирования и глушения
- characters: 500 символов на пост
- chronology: Хронологические ленты
- ethics: 'Этичный дизайн: нет рекламы, нет слежения'
- gifv: GIFV и короткие видео
- privacy: Тонкие настройки приватности для каждого поста
- public: Публичные ленты
- features_headline: Что выделяет Mastodon
get_started: Начать
links: Ссылки
other_instances: Другие узлы
@@ -134,17 +123,13 @@ ru:
settings:
contact_information:
email: Введите публичный e-mail
- label: Контактная информация
username: Введите имя пользователя
registrations:
closed_message:
desc_html: Отображается на титульной странице, когда закрыта регистрация
Можно использовать HTML-теги
title: Сообщение о закрытой регистрации
open:
- disabled: Закрыта
- enabled: Открыта
title: Открыть регистрацию
- setting: Настройка
site_description:
desc_html: Отображается в качестве параграфа на титульной странице и используется в качестве мета-тега.
Можно использовать HTML-теги, в особенности <a> и <em>.
title: Описание сайта
@@ -292,6 +277,43 @@ ru:
missing_resource: Поиск требуемого перенаправления URL для Вашего аккаунта завершился неудачей
proceed: Продолжить подписку
prompt: 'Вы хотите подписаться на:'
+ sessions:
+ activity: Последняя активность
+ browser: Браузер
+ browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ firefox: Firefox
+ generic: Неизвестный браузер
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
+ opera: Opera
+ phantom_js: PhantomJS
+ qq: QQ Browser
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ current_session: Текущая сессия
+ description: "%{browser} на %{platform}"
+ explanation: Это веб-браузеры, в которых на данный момент выполнен вход в Ваш аккаунт Mastodon.
+ ip: IP
+ platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ other: неизвестной платформе
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
+ title: Сессии
settings:
authorized_apps: Авторизованные приложения
back: Назад в Mastodon
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 3e769fb96b..fc5ab5ec8c 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -37,7 +37,9 @@ en:
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before boosting
setting_default_privacy: Post privacy
+ setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
+ setting_system_font_ui: Use system's default font
severity: Severity
type: Import type
username: Username
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index ae4975143c..8717a4abd5 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -4,12 +4,20 @@ fr:
hints:
defaults:
avatar: Au format PNG, GIF ou JPG. 2Mo maximum. Sera réduit à 120x120px
- display_name: 30 caractères maximum
+ display_name:
+ one: 1 caractère restant
+ other: %{count} caractères restants
header: Au format PNG, GIF ou JPG. 2Mo maximum. Sera réduit à 700x335px
- locked: Vous devrez approuver chaque abonné⋅e et vos statuts ne s'afficheront qu'à vos abonné⋅es
- note: 160 caractères maximum
+ locked: Vous devrez approuver chaque abonné⋅e et vos statuts ne s’afficheront qu’à vos abonné⋅es
+ note:
+ one: 1 caractère restant
+ other: %{count} caractères restants
imports:
data: Un fichier CSV généré par une autre instance de Mastodon
+ sessions:
+ otp: Entrez le code d’authentification à deux facteurs depuis votre téléphone ou utilisez un de vos codes de récupération.
+ user:
+ filtered_languages: Les langues sélectionnées seront retirées de vos fils publics.
labels:
defaults:
avatar: Image de profil
@@ -21,15 +29,18 @@ fr:
email: Adresse courriel
header: Image d’en-tête
locale: Langue
- locked: Rendre le compte privé
+ locked: Verrouiller le compte
new_password: Nouveau mot de passe
note: Présentation
- otp_attempt: Code d'identification à deux facteurs
+ otp_attempt: Code d’identification à deux facteurs
password: Mot de passe
+ setting_auto_play_gif: Lire automatiquement les GIFs animés
setting_boost_modal: Afficher un dialogue de confirmation avant de partager
setting_default_privacy: Confidentialité des statuts
+ setting_delete_modal: Afficher un dialogue de confirmation avant de supprimer un pouet
+ setting_system_font_ui: Utiliser la police par défaut du système
severity: Séverité
- type: Type d'import
+ type: Type d’import
username: Identifiant
interactions:
must_be_follower: Masquer les notifications des personnes qui ne vous suivent pas
@@ -38,7 +49,7 @@ fr:
digest: Envoyer des courriels récapitulatifs
favourite: Envoyer un courriel lorsque quelqu’un ajoute mes statuts à ses favoris
follow: Envoyer un courriel lorsque quelqu’un me suit
- follow_request: Envoyer un courriel lorsque quelqu'un demande à me suivre
+ follow_request: Envoyer un courriel lorsque quelqu’un demande à me suivre
mention: Envoyer un courriel lorsque quelqu’un me mentionne
reblog: Envoyer un courriel lorsque quelqu’un partage mes statuts
'no': Non
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index b9f11d7b38..9342398a8c 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -34,7 +34,9 @@ ja:
setting_auto_play_gif: アニメーションGIFを自動再生する
setting_boost_modal: ブーストする前に確認ダイアログを表示する
setting_default_privacy: 投稿の公開範囲
+ setting_default_sensitive: メディアを常に閲覧注意としてマークする
setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する
+ setting_system_font_ui: システムのデフォルトフォントを使う
severity: 重大性
type: インポートする項目
username: ユーザー名
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
new file mode 100644
index 0000000000..b7dbc8bef8
--- /dev/null
+++ b/config/locales/simple_form.ko.yml
@@ -0,0 +1,58 @@
+---
+ko:
+ simple_form:
+ hints:
+ defaults:
+ avatar: PNG, GIF 혹은 JPG. 최대 2MB. 120x120px로 다운스케일 됨
+ display_name:
+ one: 1 글자 남음
+ other: %{count} 글자 남음
+ header: PNG, GIF 혹은 JPG. 최대 2MB. 700x335px로 다운스케일 됨
+ locked: 수동으로 팔로워를 승인하고, 기본 Toot 프라이버시 설정을 팔로워 전용으로 변경
+ note:
+ one: 1 글자 남음
+ other: %{count} 글자 남음
+ imports:
+ data: 다른 마스토돈 인스턴스에서 추출된 CSV 파일
+ sessions:
+ otp: 2단계 인증 코드를 휴대전화를 보고 입력하거나, 복구 코드 중 하나를 사용
+ user:
+ filtered_languages: 선택된 언어가 공개 타임라인에서 제외 될 것입니다.
+ labels:
+ defaults:
+ avatar: 아바타
+ confirm_new_password: 새로운 비밀번호 다시 입력
+ confirm_password: 현재 비밀번호 다시 입력
+ current_password: 현재 비밀번호 입력
+ data: 데이터
+ display_name: 표시되는 이름
+ email: 이메일 주소
+ header: 헤더
+ locale: 언어
+ locked: 계정 잠금
+ new_password: 새로운 비밀번호 입력
+ note: 자기소개
+ otp_attempt: 2단계 인증 코드
+ password: 비밀번호
+ setting_auto_play_gif: 애니메이션 GIF를 자동 재생
+ setting_boost_modal: 부스트 전 확인 창을 보여주기
+ setting_default_privacy: Toot 프라이버시
+ setting_delete_modal: Toot 삭제 전 확인 창을 보여주기
+ severity: 심각도
+ type: 불러오기 종류
+ username: 유저 이름
+ interactions:
+ must_be_follower: 나를 팔로우 하지 않는 사람에게서 온 알림을 차단
+ must_be_following: 내가 팔로우 하지 않는 사람에게서 온 알림을 차단
+ notification_emails:
+ digest: 요약 이메일 보내기
+ favourite: 누군가 내 상태를 즐겨찾기로 등록했을 때 이메일 보내기
+ follow: 누군가 나를 팔로우 했을 때 이메일 보내기
+ follow_request: 누군가 나를 팔로우 하길 원할 때 이메일 보내기
+ mention: 누군가 나에게 답장했을 때 이메일 보내기
+ reblog: 누군가 내 Toot을 부스트 했을 때 이메일 보내기
+ 'no': '아니오'
+ required:
+ mark: "*"
+ text: 필수 항목
+ 'yes': '네'
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 09e76eba09..e4c4d7c8c9 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -42,7 +42,9 @@ pl:
setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
setting_default_privacy: Widoczność posta
+ setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
setting_delete_modal: Pytaj o potwierdzenie przed usunięciem postu
+ setting_system_font_ui: Używaj domyślnej czcionki systemu
severity: Priorytet
type: Typ importu
username: Nazwa użytkownika
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 322e5e74bf..263babdd01 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -3,23 +3,12 @@ th:
about:
about_mastodon: แมสโทดอน เป็น ดีเซ็นทรัลไลซ์ฟรีโอเพ่นซอร์ส โซเชี่ยวเน็ตเวริ์ค. เป็นทางเลือกทดแทนโซเชี่ยวเน็ตเวิร์คที่ทำเป็นธุรกิจการค้า, ป้องกันการผูกขาดช่องทางการสื่อสารของคุณ. เลือกเซร์ฟเวอร์ที่คุณไว้ใจ — ที่คุณเลือกได้เอง, สื่อสารกับคนที่คุณต้องการได้เสมอ. ใครๆก็รันแมสโทดอนอินซะแตนซ์ได้ และ เชื่อมต่อกับโซเชี่ยวเน็ตเวิร์ค โดยไม่มีอะไรมาขวางกั้น.
about_this: เกี่ยวกับอินซะแตนซ์นี้
- apps: แอ๊ฟ
business_email: 'อีเมล์ธุรกิจ:'
closed_registrations: อินซะแตนซ์นี้ปิดรับลงทะเบียนแล้ว.
contact: ติดต่อ
description_headline: โดเมนคือ %{domain} ?
domain_count_after: อินซะแตนซ์อื่นๆ
domain_count_before: เชื่อมต่อกับ
- features:
- api: API เปิดสำหรับ Apps และ Services
- blocks: มีเครื่องมือสำหรับ Block และ Mute
- characters: เขียนได้ 500 ตัวอักษรต่อโพสต์
- chronology: Timelines are chronological
- ethics: 'ออกแบบด้วยจรรยาบรรณ: ไม่มีโฆษณา, ไม่มีการแทรค'
- gifv: รองรับภาพ GIFV และ วีดีโอสั้น
- privacy: Granular, per-post privacy settings
- public: ไทม์ไลน์สาธารณะ
- features_headline: What sets Mastodon apart
get_started: เริ่มกันเลย
links: ลิงก์
other_instances: อินซะแตนซ์อื่นๆ
@@ -153,17 +142,13 @@ th:
settings:
contact_information:
email: กรอกที่อยู่อีเมล์สาธารณะ
- label: ข้อมูลที่ติดต่อ
username: กรอกชื่อผู้ใช้
registrations:
closed_message:
desc_html: Displayed on frontpage when registrations are closed
ใช้ HTML tags ได้
title: ปิดข้อความลงทะเบียน
open:
- disabled: ปิดการใช้งาน
- enabled: ปิดใช้งาน
title: เปิดรับลงทะเบียน
- setting: ตั้งค่า
site_description:
desc_html: Displayed as a paragraph on the frontpage and used as a meta tag.
ใช้ HTML tags ได้, in particular <a> และ <em>.
title: คำอธิบายไซต์
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 0e33e2efe7..e7864cc579 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -3,23 +3,12 @@ tr:
about:
about_mastodon: Mastodon ücretsiz ve açık kaynaklı bir sosyal ağdır. Merkezileştirilmemiş yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon sosyal ağına dahil edebilir.
about_this: Bu sunucu hakkında
- apps: Uygulamalar
business_email: 'İş e-postası:'
closed_registrations: Bu sunucu şu anda yeni kayıt almamaktadır.
contact: İletişim
description_headline: Peki %{domain} nedir?
domain_count_after: sunucu var.
domain_count_before: Bağlı olduğu
- features:
- api: Uygulama ve servisler için açık API
- blocks: Zengin blok ve iletişim araçları
- characters: 500 karakterlik gönderiler
- chronology: Kronolojik zaman tüneli
- ethics: 'Etik tasarım: reklam ve izleme yok'
- gifv: GIFV ve diğer video türleri
- privacy: Gönderi bazlı gizlilik
- public: Herkese açık zaman tünelleri
- features_headline: Mastodon'ı diğerlerinden ayıran nedir?
get_started: Kayıt ol
links: Bağlantılar
other_instances: Diğer sunucular
@@ -152,17 +141,13 @@ tr:
settings:
contact_information:
email: Herkese açık e-posta adresiniz
- label: İletişim bilgisi
username: Bir kullanıcı adı giriniz
registrations:
closed_message:
desc_html: Kayıt alımları kapatıldığında ana sayfada görüntülenecek mesajdır.
HTML etiketleri kullanabilirsiniz.
title: Kayıt alımları kapatılma mesajı
open:
- disabled: Kapalı
- enabled: Açık
title: Kayıt alımları
- setting: Ayar adı
site_description:
desc_html: Ana sayfada paragraf olarak görüntülenecek bilgidir.
Özellikle <a> ve <em> olmak suretiyle HTML etiketlerini kullanabilirsiniz.
title: Site açıklaması
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 1327c1a7b2..129fc5bb79 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -3,23 +3,12 @@ uk:
about:
about_mastodon: Mastodon - це вільна соціальна мережа з відкритим вихідним кодом. Вона є децентралізованою альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте — що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в соціальній мережі.
about_this: Про цю інстанцію
- apps: Додатки
business_email: 'Діловий email:'
closed_registrations: На даний момент реєстрація на цій інстанції закрита.
contact: Зв'язатися
description_headline: Що таке %{domain}?
domain_count_after: іншими інстанціями
domain_count_before: Зв'язаний з
- features:
- api: Відкритий API для додаків та сервісів
- blocks: Продвинуті інструменти самомодерації
- characters: 500 символів на пост
- chronology: Хронологічні стрічки
- ethics: 'Этичний дизайн: немає реклами, немає стеження'
- gifv: GIFV та короткі відео
- privacy: Тонкі налаштування приватності для кожного поста
- public: Публічні стрічки
- features_headline: Що виділяє Mastodon
get_started: Почати
links: Посилання
other_instances: Інші інстанції
@@ -134,17 +123,13 @@ uk:
settings:
contact_information:
email: Введіть публічний email
- label: Контактна інформація
username: Введіть ім'я користувача
registrations:
closed_message:
desc_html: Відображається на титульній сторінці, коли реєстрація закрита
Можна використовувати HTML-теги
title: Повідомлення про закриту реєстрацію
open:
- disabled: Закрита
- enabled: Відкрита
title: Відкрити реєстрацію
- setting: Налаштування
site_description:
desc_html: Відображається у якості параграфа на титульній сторінці та використовується у якості мета-тега.
Можна використовувати HTML-теги, особливо <a> і <em>.
title: Опис сайту
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6c8e9fc6d9..650d4bd159 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -3,23 +3,12 @@ zh-CN:
about:
about_mastodon: Mastodon（长毛象）是一个自由、开放源码的社交网站。它是一个分布式的服务，避免你的通信被单一商业机构垄断操控。请你选择一家你信任的 Mastodon 实例，在上面创建帐号，然后你就可以和任一 Mastodon 实例上的用户互通，享受无缝的社交交流。
about_this: 关于本实例
- apps: 应用程序
business_email: 商业电邮︰
closed_registrations: 这个实例目前不开放注册 _(:3」∠)_
contact: 联络
description_headline: 关于 %{domain}
domain_count_after: 个其它实例
domain_count_before: 现已接入
- features:
- api: 开放 API，供各式应用程序及服务接入
- blocks: 完善的封锁用户、静音功能
- characters: 每篇嘟文最多 500 字
- chronology: 纯粹按时间排序，不作多余处理
- ethics: 良心设计︰没有广告，不追踪你的使用行为
- gifv: 支持显示 GIFV 动图小视频
- privacy: 可逐篇嘟文设置隐私
- public: 提供公共时间轴
- features_headline: 是什么让 Mastodon 与众不同
get_started: 上手使用
links: 链接
other_instances: 其它实例
@@ -159,17 +148,13 @@ zh-CN:
settings:
contact_information:
email: 输入一个公开的电邮地址
- label: 联系数据
username: 输入用户名称
registrations:
closed_message:
desc_html: 当本站暂停接受注册时，会显示这个消息。
可使用 HTML
title: 暂停注册消息
open:
- disabled: 停用
- enabled: 启用
title: 开放注册
- setting: 设置
site_description:
desc_html: 在首页显示，及在 meta 标签中用作网站介绍。
你可以在此使用 HTML 标签，尤其是<a> 和 <em>。
title: 本站介绍
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 4d8262c5b7..d2db78be16 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -3,23 +3,12 @@ zh-HK:
about:
about_mastodon: Mastodon（萬象）是自由、開源的社交網絡。服務站各自獨立而互連，避免單一商業機構壟斷。找你所信任的服務站，建立帳號，你即可與任何服務站上的用戶溝通，享受無縫的網絡交流。
about_this: 關於本服務站
- apps: 應用程式
business_email: 聯絡網站管理者︰
closed_registrations: 本服務站暫時停止接受登記。
contact: 聯絡
description_headline: 關於 %{domain}
domain_count_after: 個其他服務站
domain_count_before: 已連接至
- features:
- api: 開放 API，供各式應用程式及服務連入
- blocks: 完善的封鎖用戶、靜音功能
- characters: 每篇文章最多 500 字
- chronology: 時間軸忠實按時排序，不多餘處理
- ethics: 良心設計︰無廣告，不追蹤用戶
- gifv: 支援顯示 GIFV 短片圖組
- privacy: 可逐篇文章設定私隱度
- public: 公共時間軸
- features_headline: 甚麼讓 Mastodon 與眾不同
get_started: 立即登記
links: 連結
other_instances: 其他服務站
@@ -152,17 +141,13 @@ zh-HK:
settings:
contact_information:
email: 輸入一個公開的電郵地址
- label: 聯絡資料
username: 輸入用戶名稱
registrations:
closed_message:
desc_html: 當本站暫停接受註冊時，會顯示這個訊息。
可使用 HTML
title: 暫停註冊訊息
open:
- disabled: 停用
- enabled: 啟用
title: 開放註冊
- setting: 設定
site_description:
desc_html: 在首頁顯示，及在 meta 標籤使用作網站介紹。
你可以在此使用 <a> 和 <em> 等 HTML 標籤。
title: 本站介紹
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 754175a7ae..67aa2830fa 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -3,23 +3,12 @@ zh-TW:
about:
about_mastodon: Mastodon （長毛象）是一個自由、開放原始碼的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 服務站，在上面建立帳號，然後您就可以和任一 Mastodon 服務站上的使用者互通，享受無縫的社群網路交流。
about_this: 關於本服務站
- apps: 應用程式
business_email: 商務信箱︰
closed_registrations: 本服務站暫時停止接受註冊。
contact: 聯絡我們
description_headline: 關於 %{domain}
domain_count_after: 個服務站相連
domain_count_before: 與其他
- features:
- api: 開放 API，供各式應用程式及服務串接
- blocks: 完善的封鎖使用者、靜音功能
- characters: 每篇文章最多 500 字
- chronology: 時間軸按時序顯示文章，不作多餘處理
- ethics: 良心設計︰沒有廣告，不追蹤您的使用行為
- gifv: 支援顯示 GIFV 短片
- privacy: 可逐篇文章調整隱私設定
- public: 公開時間軸
- features_headline: Mastodon 與眾不同之處
get_started: 立即註冊
links: 連結
other_instances: 其他服務站
@@ -113,17 +102,13 @@ zh-TW:
settings:
contact_information:
email: 請輸入輸入一個公開電子信箱
- label: 聯絡資訊
username: 請輸入使用者名稱
registrations:
closed_message:
desc_html: 關閉註冊時顯示在首頁的內容，可使用 HTML 標籤。
title: 關閉註冊訊息
open:
- disabled: 停用
- enabled: 啟用
title: 開放註冊
- setting: 設定
site_description:
desc_html: 顯示在首頁並且作為 meta 標籤的短文。
可使用 HTML 標籤，包括 <a> 及 <em>。
title: 網站描述
diff --git a/config/settings.yml b/config/settings.yml
index 19d2ca7bed..32776515c5 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -10,14 +10,17 @@ defaults: &defaults
site_title: 'dev.glitch.social'
site_description: ''
site_extended_description: ''
+ site_terms: ''
site_contact_username: ''
site_contact_email: ''
open_registrations: true
closed_registrations_message: ''
open_deletion: true
+ timeline_preview: true
boost_modal: false
- auto_play_gif: true
+ auto_play_gif: false
delete_modal: true
+ system_font_ui: false
notification_emails:
follow: false
reblog: false
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 0d2c9acfb4..303fca81b2 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -12,7 +12,6 @@ module.exports = merge(sharedConfig, {
stats: 'normal',
plugins: [
- new webpack.optimize.ModuleConcatenationPlugin(),
new webpack.optimize.UglifyJsPlugin({
sourceMap: true,
mangle: true,
diff --git a/config/webpack/translationRunner.js b/config/webpack/translationRunner.js
index 097099b48c..d616c78391 100644
--- a/config/webpack/translationRunner.js
+++ b/config/webpack/translationRunner.js
@@ -2,7 +2,7 @@ const fs = require('fs');
const path = require('path');
const { default: manageTranslations } = require('react-intl-translations-manager');
-const RFC5646_REGEXP = /^[a-z]{2,3}(?:|[A-Z]+)$/;
+const RFC5646_REGEXP = /^[a-z]{2,3}(?:|-[A-Z]+)$/;
const rootDirectory = path.resolve(__dirname, '..', '..');
const translationsDirectory = path.resolve(rootDirectory, 'app', 'javascript', 'mastodon', 'locales');
diff --git a/config/webpacker.yml b/config/webpacker.yml
index c1cd6e93b2..aa429a1dda 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -19,7 +19,7 @@ development:
<<: *default
dev_server:
- host: 0.0.0.0
+ host: 127.0.0.1
port: 8080
https: false
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 44f3e4390b..3c92ce4179 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 6
+ 7
end
def pre
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 0e182c7556..b2b3528584 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -74,7 +74,7 @@ namespace :mastodon do
end
namespace :media do
- desc 'Removes media attachments that have not been assigned to any status for longer than a day'
+ desc 'Removes media attachments that have not been assigned to any status for longer than a day (deprecated)'
task clear: :environment do
# No-op
# This task is now executed via sidekiq-scheduler
@@ -100,6 +100,18 @@ namespace :mastodon do
MediaAttachment.where(file_file_name: nil).where.not(type: :unknown).in_batches.update_all(type: :unknown)
Rails.logger.debug 'Done!'
end
+
+ desc 'Redownload avatars/headers of remote users. Optionally limit to a particular domain with DOMAIN'
+ task redownload_avatars: :environment do
+ accounts = Account.remote
+ accounts = accounts.where(domain: ENV['DOMAIN']) if ENV['DOMAIN'].present?
+
+ accounts.find_each do |account|
+ account.reset_avatar!
+ account.reset_header!
+ account.save
+ end
+ end
end
namespace :push do
@@ -111,7 +123,7 @@ namespace :mastodon do
end
end
- desc 'Re-subscribes to soon expiring PuSH subscriptions'
+ desc 'Re-subscribes to soon expiring PuSH subscriptions (deprecated)'
task refresh: :environment do
# No-op
# This task is now executed via sidekiq-scheduler
@@ -119,13 +131,13 @@ namespace :mastodon do
end
namespace :feeds do
- desc 'Clear timelines of inactive users'
+ desc 'Clear timelines of inactive users (deprecated)'
task clear: :environment do
# No-op
# This task is now executed via sidekiq-scheduler
end
- desc 'Clears all timelines'
+ desc 'Clear all timelines without regenerating them'
task clear_all: :environment do
Redis.current.keys('feed:*').each { |key| Redis.current.del(key) }
end
@@ -151,7 +163,7 @@ namespace :mastodon do
end
end
- desc 'List all admin users'
+ desc 'List e-mails of all admin users'
task admins: :environment do
puts 'Admin user emails:'
puts User.admins.map(&:email).join("\n")
@@ -161,16 +173,12 @@ namespace :mastodon do
namespace :settings do
desc 'Open registrations on this instance'
task open_registrations: :environment do
- setting = Setting.where(var: 'open_registrations').first
- setting.value = true
- setting.save
+ Setting.open_registrations = true
end
desc 'Close registrations on this instance'
task close_registrations: :environment do
- setting = Setting.where(var: 'open_registrations').first
- setting.value = false
- setting.save
+ Setting.open_registrations = false
end
end
diff --git a/nanobox/nginx-local.conf b/nanobox/nginx-local.conf
index 023328733b..f56339cac9 100644
--- a/nanobox/nginx-local.conf
+++ b/nanobox/nginx-local.conf
@@ -27,8 +27,8 @@ http {
}
map $http_upgrade $connection_upgrade {
- default upgrade;
- '' close;
+ default upgrade;
+ '' close;
}
# Configuration for Nginx
@@ -38,6 +38,8 @@ http {
root /app/public;
+ client_max_body_size 8M;
+
location / {
try_files $uri @rails;
}
diff --git a/nanobox/nginx-stream.conf.erb b/nanobox/nginx-stream.conf.erb
index b39d3ff1de..2a047dd9f6 100644
--- a/nanobox/nginx-stream.conf.erb
+++ b/nanobox/nginx-stream.conf.erb
@@ -22,8 +22,8 @@ http {
}
map $http_upgrade $connection_upgrade {
- default upgrade;
- '' close;
+ default upgrade;
+ '' close;
}
# Configuration for Nginx
diff --git a/nanobox/nginx-web.conf.erb b/nanobox/nginx-web.conf.erb
index 55245bf281..24cd17cffd 100644
--- a/nanobox/nginx-web.conf.erb
+++ b/nanobox/nginx-web.conf.erb
@@ -22,8 +22,8 @@ http {
}
map $http_upgrade $connection_upgrade {
- default upgrade;
- '' close;
+ default upgrade;
+ '' close;
}
# Configuration for Nginx
@@ -36,6 +36,8 @@ http {
root /app/public;
+ client_max_body_size 8M;
+
location / {
try_files $uri @rails;
}
diff --git a/package.json b/package.json
index 60f9af1e92..4c5a3f1d9d 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
"array-includes": "^3.0.3",
"autoprefixer": "^7.1.0",
"axios": "^0.16.2",
- "babel-cli": "^6.24.1",
"babel-core": "^6.25.0",
"babel-loader": "^7.1.0",
"babel-plugin-lodash": "^3.2.11",
@@ -33,6 +32,7 @@
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.23.0",
+ "babel-plugin-transform-react-inline-elements": "^6.22.0",
"babel-plugin-transform-react-jsx-self": "^6.22.0",
"babel-plugin-transform-react-jsx-source": "^6.22.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.6",
@@ -71,7 +71,7 @@
"pg": "^6.4.0",
"postcss-loader": "^2.0.6",
"postcss-smart-import": "^0.7.4",
- "precss": "^1.4.0",
+ "precss": "^2.0.0",
"prop-types": "^15.5.10",
"punycode": "^2.1.0",
"rails-ujs": "^5.1.2",
@@ -89,7 +89,7 @@
"react-router-dom": "^4.1.1",
"react-router-scroll": "ytase/react-router-scroll#build",
"react-simple-dropdown": "^3.0.0",
- "react-swipeable": "^4.0.1",
+ "react-swipeable-views": "^0.12.3",
"react-textarea-autosize": "^5.0.7",
"react-toggle": "^4.0.1",
"redis": "^2.7.1",
@@ -103,10 +103,11 @@
"sass-loader": "^6.0.6",
"stringz": "^0.2.2",
"style-loader": "^0.18.2",
+ "substring-trie": "^1.0.0",
"throng": "^4.0.0",
"tiny-queue": "^0.2.1",
"uuid": "^3.1.0",
- "uws": "^0.14.5",
+ "uws": "^8.14.0",
"webpack": "^3.0.0",
"webpack-bundle-analyzer": "^2.8.2",
"webpack-manifest-plugin": "^1.1.0",
@@ -118,17 +119,17 @@
"@storybook/react": "^3.1.6",
"babel-eslint": "^7.2.3",
"chai": "^4.0.1",
- "chai-enzyme": "^0.7.1",
+ "chai-enzyme": "^0.8.0",
"enzyme": "^2.9.1",
"eslint": "^3.19.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.10.3",
- "jsdom": "^10.1.0",
+ "jsdom": "^11.0.0",
"mocha": "^3.4.1",
"react-intl-translations-manager": "^5.0.0",
"react-test-renderer": "^15.6.1",
"sinon": "^2.3.5",
- "webpack-dev-server": "lencioni/webpack-dev-server#patch-1",
+ "webpack-dev-server": "^2.5.1",
"yargs": "^8.0.2"
},
"optionalDependencies": {
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 305260475a..8be27d8668 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -3,11 +3,64 @@ require 'rails_helper'
RSpec.describe Admin::AccountsController, type: :controller do
render_views
+ let(:user) { Fabricate(:user, admin: true) }
+
before do
- sign_in Fabricate(:user, admin: true), scope: :user
+ sign_in user, scope: :user
end
describe 'GET #index' do
+ around do |example|
+ default_per_page = Account.default_per_page
+ Account.paginates_per 1
+ example.run
+ Account.paginates_per default_per_page
+ end
+
+ it 'filters with parameters' do
+ new = AccountFilter.method(:new)
+
+ expect(AccountFilter).to receive(:new) do |params|
+ h = params.to_h
+
+ expect(h[:local]).to eq '1'
+ expect(h[:remote]).to eq '1'
+ expect(h[:by_domain]).to eq 'domain'
+ expect(h[:silenced]).to eq '1'
+ expect(h[:recent]).to eq '1'
+ expect(h[:suspended]).to eq '1'
+ expect(h[:username]).to eq 'username'
+ expect(h[:display_name]).to eq 'display name'
+ expect(h[:email]).to eq 'local-part@domain'
+ expect(h[:ip]).to eq '0.0.0.42'
+
+ new.call({})
+ end
+
+ get :index, params: {
+ local: '1',
+ remote: '1',
+ by_domain: 'domain',
+ silenced: '1',
+ recent: '1',
+ suspended: '1',
+ username: 'username',
+ display_name: 'display name',
+ email: 'local-part@domain',
+ ip: '0.0.0.42'
+ }
+ end
+
+ it 'paginates accounts' do
+ Fabricate(:account)
+
+ get :index, params: { page: 2 }
+
+ accounts = assigns(:accounts)
+ expect(accounts.count).to eq 1
+ expect(accounts.klass).to be Account
+ end
+
it 'returns http success' do
get :index
expect(response).to have_http_status(:success)
diff --git a/spec/controllers/admin/settings_controller_spec.rb b/spec/controllers/admin/settings_controller_spec.rb
index d9dde3c92a..609bc762b8 100644
--- a/spec/controllers/admin/settings_controller_spec.rb
+++ b/spec/controllers/admin/settings_controller_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
it 'cannot create a setting value for a non-admin key' do
expect(Setting.new_setting_key).to be_blank
- patch :update, params: { new_setting_key: 'New key value' }
+ patch :update, params: { form_admin_settings: { new_setting_key: 'New key value' } }
expect(response).to redirect_to(edit_admin_settings_path)
expect(Setting.new_setting_key).to be_nil
@@ -40,7 +40,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
it 'creates a settings value that didnt exist before for eligible key' do
expect(Setting.site_extended_description).to be_blank
- patch :update, params: { site_extended_description: 'New key value' }
+ patch :update, params: { form_admin_settings: { site_extended_description: 'New key value' } }
expect(response).to redirect_to(edit_admin_settings_path)
expect(Setting.site_extended_description).to eq 'New key value'
@@ -56,7 +56,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
it 'updates a settings value' do
Setting.site_title = 'Original'
- patch :update, params: { site_title: 'New title' }
+ patch :update, params: { form_admin_settings: { site_title: 'New title' } }
expect(response).to redirect_to(edit_admin_settings_path)
expect(Setting.site_title).to eq 'New title'
@@ -72,7 +72,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
it 'typecasts open_registrations to boolean' do
Setting.open_registrations = false
- patch :update, params: { open_registrations: 'true' }
+ patch :update, params: { form_admin_settings: { open_registrations: '1' } }
expect(response).to redirect_to(edit_admin_settings_path)
expect(Setting.open_registrations).to eq true
diff --git a/spec/controllers/authorize_follows_controller_spec.rb b/spec/controllers/authorize_follows_controller_spec.rb
index b801aa6617..26e46a23c2 100644
--- a/spec/controllers/authorize_follows_controller_spec.rb
+++ b/spec/controllers/authorize_follows_controller_spec.rb
@@ -94,7 +94,7 @@ describe AuthorizeFollowsController do
end
it 'follows account when found' do
- target_account = double(id: '123')
+ target_account = Fabricate(:account)
result_account = double(target_account: target_account)
service = double
allow(FollowService).to receive(:new).and_return(service)
@@ -103,7 +103,7 @@ describe AuthorizeFollowsController do
post :create, params: { acct: 'acct:user@hostname' }
expect(service).to have_received(:call).with(account, 'user@hostname')
- expect(response).to redirect_to(web_url('accounts/123'))
+ expect(response).to render_template(:success)
end
end
end
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index cc1dbe5a1a..d44d720b14 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -23,41 +23,14 @@ RSpec.describe HomeController, type: :controller do
expect(assigns(:body_classes)).to eq 'app-body'
end
- it 'assigns @token' do
- app = Doorkeeper::Application.create!(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri)
- allow(Doorkeeper.configuration).to receive(:access_token_expires_in).and_return(42)
-
- subject
- token = Doorkeeper::AccessToken.find_by(token: assigns(:token))
-
- expect(token.application).to eq app
- expect(token.resource_owner_id).to eq user.id
- expect(token.scopes).to eq Doorkeeper::OAuth::Scopes.from_string('read write follow')
- expect(token.expires_in_seconds).to eq 42
- expect(token.use_refresh_token?).to eq false
- end
-
- it 'assigns @web_settings for {} if not available' do
- subject
- expect(assigns(:web_settings)).to eq({})
- end
-
- it 'assigns @web_settings for Web::Setting if available' do
- setting = Fabricate('Web::Setting', data: '{"home":{}}', user: user)
- subject
- expect(assigns(:web_settings)).to eq setting.data
- end
-
- it 'assigns @admin' do
- admin = Fabricate(:account)
- Setting.site_contact_username = admin.username
- subject
- expect(assigns(:admin)).to eq admin
- end
-
- it 'assigns streaming_api_base_url' do
+ it 'assigns @initial_state_json' do
subject
- expect(assigns(:streaming_api_base_url)).to eq 'ws://localhost:4000'
+ initial_state_json = json_str_to_hash(assigns(:initial_state_json))
+ expect(initial_state_json[:meta]).to_not be_nil
+ expect(initial_state_json[:compose]).to_not be_nil
+ expect(initial_state_json[:accounts]).to_not be_nil
+ expect(initial_state_json[:settings]).to_not be_nil
+ expect(initial_state_json[:media_attachments]).to_not be_nil
end
end
end
diff --git a/spec/controllers/manifests_controller_spec.rb b/spec/controllers/manifests_controller_spec.rb
new file mode 100644
index 0000000000..6f188fa352
--- /dev/null
+++ b/spec/controllers/manifests_controller_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+describe ManifestsController do
+ render_views
+
+ describe 'GET #show' do
+ before do
+ get :show, format: :json
+ end
+
+ it 'assigns @instance_presenter' do
+ expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
+ end
+
+ it 'returns http success' do
+ expect(response).to have_http_status(:success)
+ end
+ end
+end
diff --git a/spec/fixtures/requests/koi8-r.txt b/spec/fixtures/requests/koi8-r.txt
new file mode 100644
index 0000000000..d4242af019
--- /dev/null
+++ b/spec/fixtures/requests/koi8-r.txt
@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx/1.11.10
+Date: Tue, 04 Jul 2017 16:43:39 GMT
+Content-Type: text/html
+Content-Length: 273
+Connection: keep-alive
+Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT
+Accept-Ranges: bytes
+
+
+
+
+ + diff --git a/spec/fixtures/requests/sjis.txt b/spec/fixtures/requests/sjis.txt new file mode 100644 index 0000000000..faf18d35c5 --- /dev/null +++ b/spec/fixtures/requests/sjis.txt @@ -0,0 +1,20 @@ +HTTP/1.1 200 OK +Server: nginx/1.11.10 +Date: Tue, 04 Jul 2017 16:43:39 GMT +Content-Type: text/html +Content-Length: 273 +Connection: keep-alive +Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT +Accept-Ranges: bytes + + + + + +
+
+ + diff --git a/spec/fixtures/requests/sjis_with_wrong_charset.txt b/spec/fixtures/requests/sjis_with_wrong_charset.txt new file mode 100644 index 0000000000..456750c6b3 --- /dev/null +++ b/spec/fixtures/requests/sjis_with_wrong_charset.txt @@ -0,0 +1,20 @@ +HTTP/1.1 200 OK +Server: nginx/1.11.10 +Date: Tue, 04 Jul 2017 16:43:39 GMT +Content-Type: text/html; charset=utf-8 +Content-Length: 273 +Connection: keep-alive +Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT +Accept-Ranges: bytes + + + + + +
+
+ + diff --git a/spec/javascript/components/display_name.test.js b/spec/javascript/components/display_name.test.js index d6dc7edc09..ad9288d4df 100644 --- a/spec/javascript/components/display_name.test.js +++ b/spec/javascript/components/display_name.test.js @@ -1,12 +1,12 @@ import { expect } from 'chai'; import { render } from 'enzyme'; -import Immutable from 'immutable'; +import { fromJS } from 'immutable'; import React from 'react'; import DisplayName from '../../../app/javascript/mastodon/components/display_name'; describe('
');
+ });
+
+ it('does a double emojify', () => {
+ expect(emojify(':smile: and :wink:')).to.equal(
+ ' and 
');
+ });
+
+ it('works with random colons', () => {
+ expect(emojify(':smile: : :wink:')).to.equal(
+ ' : ');
+ expect(emojify(':smile::::wink:')).to.equal(
+ '::');
+ expect(emojify(':smile:::::wink:')).to.equal(
+ ':::');
+ });
+
+ it('works with tags', () => {
+ expect(emojify(':smile:
')).to.equal( + '
:smile:
and:wink:
')).to.equal( + '
');
+ });
+
+ it('does unicode', () => {
+ expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).to.equal(
+ '
');
+ expect(emojify('\uD83D\uDC68\uD83D\uDC69\uD83D\uDC67\uD83D\uDC67')).to.equal(
+ '
');
+ expect(emojify('\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66')).to.equal('
');
+ expect(emojify('\u2757')).to.equal(
+ '
');
+ });
+
+ it('does multiple unicode', () => {
+ expect(emojify('\u2757 #\uFE0F\u20E3')).to.equal(
+ ' 
');
+ expect(emojify('\u2757#\uFE0F\u20E3')).to.equal(
+ '');
+ expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).to.equal(
+ ' ');
+ expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).to.equal(
+ 'foo bar');
+ });
+
+ it('does mixed unicode and shortnames', () => {
+ expect(emojify(':smile:#\uFE0F\u20E3:wink:\u2757')).to.equal('');
+ });
+
+ it('ignores unicode inside of tags', () => {
+ expect(emojify('')).to.equal('');
+ });
+
+});
diff --git a/spec/javascript/setup.js b/spec/javascript/setup.js
index 7d4b2866ef..c9c8aed077 100644
--- a/spec/javascript/setup.js
+++ b/spec/javascript/setup.js
@@ -1,19 +1,13 @@
-import { jsdom } from 'jsdom/lib/old-api';
+import { JSDOM } from 'jsdom';
import chai from 'chai';
import chaiEnzyme from 'chai-enzyme';
chai.use(chaiEnzyme());
-var exposedProperties = ['window', 'navigator', 'document'];
-
-global.document = jsdom('');
-global.window = document.defaultView;
-Object.keys(document.defaultView).forEach((property) => {
+const { window } = new JSDOM('', {
+ userAgent: 'node.js',
+});
+Object.keys(window).forEach(property => {
if (typeof global[property] === 'undefined') {
- exposedProperties.push(property);
- global[property] = document.defaultView[property];
+ global[property] = window[property];
}
});
-
-global.navigator = {
- userAgent: 'node.js',
-};
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index bf474c3543..4bdc96866d 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -131,4 +131,17 @@ RSpec.describe FeedManager do
end
end
end
+
+ describe '#push' do
+ it 'trims timelines if they will have more than FeedManager::MAX_ITEMS' do
+ account = Fabricate(:account)
+ status = Fabricate(:status)
+ members = FeedManager::MAX_ITEMS.times.map { |count| [count, count] }
+ Redis.current.zadd("feed:type:#{account.id}", members)
+
+ FeedManager.instance.push('type', account, status)
+
+ expect(Redis.current.zcard("feed:type:#{account.id}")).to eq FeedManager::MAX_ITEMS
+ end
+ end
end
diff --git a/spec/lib/inline_rabl_scope_spec.rb b/spec/lib/inline_rabl_scope_spec.rb
deleted file mode 100644
index 3fff176e46..0000000000
--- a/spec/lib/inline_rabl_scope_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe InlineRablScope do
- describe '#current_account' do
- it 'returns the given account' do
- account = Fabricate(:account)
- expect(InlineRablScope.new(account).current_account).to eq account
- end
- end
-
- describe '#current_user' do
- it 'returns nil if the given account is nil' do
- expect(InlineRablScope.new(nil).current_user).to eq nil
- end
-
- it 'returns user of account if the given account is not nil' do
- user = Fabricate(:user)
- expect(InlineRablScope.new(user.account).current_user).to eq user
- end
- end
-end
diff --git a/spec/lib/user_settings_decorator_spec.rb b/spec/lib/user_settings_decorator_spec.rb
index 66e42fa0ec..a67487779f 100644
--- a/spec/lib/user_settings_decorator_spec.rb
+++ b/spec/lib/user_settings_decorator_spec.rb
@@ -28,6 +28,13 @@ describe UserSettingsDecorator do
expect(user.settings['default_privacy']).to eq 'public'
end
+ it 'updates the user settings value for sensitive' do
+ values = { 'setting_default_sensitive' => '1' }
+
+ settings.update(values)
+ expect(user.settings['default_sensitive']).to eq true
+ end
+
it 'updates the user settings value for boost modal' do
values = { 'setting_boost_modal' => '1' }
@@ -48,5 +55,12 @@ describe UserSettingsDecorator do
settings.update(values)
expect(user.settings['auto_play_gif']).to eq false
end
+
+ it 'updates the user settings value for system font in UI' do
+ values = { 'setting_system_font_ui' => '0' }
+
+ settings.update(values)
+ expect(user.settings['system_font_ui']).to eq false
+ end
end
end
diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb
index 15033e9ebb..1c377c17f3 100644
--- a/spec/models/feed_spec.rb
+++ b/spec/models/feed_spec.rb
@@ -2,19 +2,19 @@ require 'rails_helper'
RSpec.describe Feed, type: :model do
describe '#get' do
- it 'gets statuses with ids in the range, maintining the order from Redis' do
+ it 'gets statuses with ids in the range' do
account = Fabricate(:account)
Fabricate(:status, account: account, id: 1)
Fabricate(:status, account: account, id: 2)
Fabricate(:status, account: account, id: 3)
Fabricate(:status, account: account, id: 10)
- redis = double(zrevrangebyscore: [['val2', 2.0], ['val1', 1.0], ['val3', 3.0], ['deleted', 4.0]], exists: false)
- allow(Redis).to receive(:current).and_return(redis)
+ Redis.current.zadd(FeedManager.instance.key(:home, account.id),
+ [[4, 'deleted'], [3, 'val3'], [2, 'val2'], [1, 'val1']])
feed = Feed.new(:home, account)
results = feed.get(3)
- expect(results.map(&:id)).to eq [2, 1, 3]
+ expect(results.map(&:id)).to eq [3, 2]
expect(results.first.attributes.keys).to eq %w(id updated_at)
end
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a6df3fb262..2019ec0f69 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -184,6 +184,14 @@ RSpec.describe User, type: :model do
expect(user.setting_auto_play_gif).to eq false
end
end
+
+ describe '#setting_system_font_ui' do
+ it 'returns system font ui setting' do
+ user = Fabricate(:user)
+ user.settings[:system_font_ui] = false
+ expect(user.setting_system_font_ui).to eq false
+ end
+ end
describe '#setting_boost_modal' do
it 'returns boost modal setting' do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index cfc9eec9ea..4f7399505c 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -13,17 +13,23 @@ Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
ActiveRecord::Migration.maintain_test_schema!
WebMock.disable_net_connect!
+Redis.current = Redis::Namespace.new("mastodon_test#{ENV['TEST_ENV_NUMBER']}", redis: Redis.current)
Sidekiq::Testing.inline!
Sidekiq::Logging.logger = nil
Devise::Test::ControllerHelpers.module_eval do
alias_method :original_sign_in, :sign_in
- def sign_in(resource, deprecated = nil, scope: nil)
+ def sign_in(resource, _deprecated = nil, scope: nil)
original_sign_in(resource, scope: scope)
- SessionActivation.deactivate warden.raw_session["auth_id"]
- warden.raw_session["auth_id"] = resource.activate_session(warden.request)
+ SessionActivation.deactivate warden.cookies.signed['_session_id']
+
+ warden.cookies.signed['_session_id'] = {
+ value: resource.activate_session(warden.request),
+ expires: 1.year.from_now,
+ httponly: true,
+ }
end
end
@@ -43,6 +49,11 @@ RSpec.configure do |config|
https = ENV['LOCAL_HTTPS'] == 'true'
Capybara.app_host = "http#{https ? 's' : ''}://#{ENV.fetch('LOCAL_DOMAIN')}"
end
+
+ config.after :each do
+ keys = Redis.current.keys
+ Redis.current.del(keys) if keys.any?
+ end
end
RSpec::Sidekiq.configure do |config|
diff --git a/spec/requests/localization_spec.rb b/spec/requests/localization_spec.rb
index 2f7a5e91ef..f625a93a4f 100644
--- a/spec/requests/localization_spec.rb
+++ b/spec/requests/localization_spec.rb
@@ -6,13 +6,13 @@ describe 'Localization' do
after(:all) do
I18n.locale = I18n.default_locale
end
-
+
it 'uses a specific region when provided' do
headers = { 'Accept-Language' => 'zh-HK' }
get "/about", headers: headers
expect(response.body).to include(
- I18n.t('about.about_mastodon', locale: 'zh-HK')
+ I18n.t('about.about_mastodon_html', locale: 'zh-HK')
)
end
@@ -21,7 +21,7 @@ describe 'Localization' do
get "/about", headers: headers
expect(response.body).to include(
- I18n.t('about.about_mastodon', locale: 'es')
+ I18n.t('about.about_mastodon_html', locale: 'es')
)
end
it 'falls back to english when locale is missing' do
@@ -29,7 +29,7 @@ describe 'Localization' do
get "/about", headers: headers
expect(response.body).to include(
- I18n.t('about.about_mastodon', locale: 'en')
+ I18n.t('about.about_mastodon_html', locale: 'en')
)
end
end
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 9df41cf559..698eb03247 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -6,6 +6,12 @@ RSpec.describe FetchLinkCardService do
before do
stub_request(:head, 'http://example.xn--fiqs8s/').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
stub_request(:get, 'http://example.xn--fiqs8s/').to_return(request_fixture('idn.txt'))
+ stub_request(:head, 'http://example.com/sjis').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+ stub_request(:get, 'http://example.com/sjis').to_return(request_fixture('sjis.txt'))
+ stub_request(:head, 'http://example.com/sjis_with_wrong_charset').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+ stub_request(:get, 'http://example.com/sjis_with_wrong_charset').to_return(request_fixture('sjis_with_wrong_charset.txt'))
+ stub_request(:head, 'http://example.com/koi8-r').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+ stub_request(:get, 'http://example.com/koi8-r').to_return(request_fixture('koi8-r.txt'))
stub_request(:head, 'https://github.com/qbi/WannaCry').to_return(status: 404)
subject.call(status)
@@ -19,6 +25,33 @@ RSpec.describe FetchLinkCardService do
expect(a_request(:get, 'http://example.xn--fiqs8s/')).to have_been_made.at_least_once
end
end
+
+ context do
+ let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis') }
+
+ it 'works with SJIS' do
+ expect(a_request(:get, 'http://example.com/sjis')).to have_been_made.at_least_once
+ expect(status.preview_card.title).to eq("SJISのページ")
+ end
+ end
+
+ context do
+ let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis_with_wrong_charset') }
+
+ it 'works with SJIS even with wrong charset header' do
+ expect(a_request(:get, 'http://example.com/sjis_with_wrong_charset')).to have_been_made.at_least_once
+ expect(status.preview_card.title).to eq("SJISのページ")
+ end
+ end
+
+ context do
+ let(:status) { Fabricate(:status, text: 'Check out http://example.com/koi8-r') }
+
+ it 'works with koi8-r' do
+ expect(a_request(:get, 'http://example.com/koi8-r')).to have_been_made.at_least_once
+ expect(status.preview_card.title).to eq("Московя начинаетъ только въ XVI ст. привлекать внимане иностранцевъ.")
+ end
+ end
end
context 'in a remote status' do
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 9f56b02560..dbd08ac1b0 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -11,12 +11,29 @@ RSpec.describe PrecomputeFeedService do
account = Fabricate(:account)
followed_account = Fabricate(:account)
Fabricate(:follow, account: account, target_account: followed_account)
- status = Fabricate(:status, account: followed_account)
+ reblog = Fabricate(:status, account: followed_account)
+ status = Fabricate(:status, account: account, reblog: reblog)
- expected_redis_args = FeedManager.instance.key(:home, account.id), status.id, status.id
- expect_any_instance_of(Redis).to receive(:zadd).with(*expected_redis_args)
+ subject.call(account)
+
+ expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq status.id
+ end
+
+ it 'does not raise an error even if it could not find any status' do
+ account = Fabricate(:account)
+ subject.call(account)
+ end
+
+ it 'filters statuses' do
+ account = Fabricate(:account)
+ muted_account = Fabricate(:account)
+ Fabricate(:mute, account: account, target_account: muted_account)
+ reblog = Fabricate(:status, account: muted_account)
+ status = Fabricate(:status, account: account, reblog: reblog)
subject.call(account)
+
+ expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq nil
end
end
end
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
index 2c5130d849..c0ead63491 100644
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -10,10 +10,11 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
it 'has valid open graph tags' do
instance_presenter = double(:instance_presenter,
- site_description: 'something',
- open_registrations: false,
- closed_registrations_message: 'yes',
- )
+ site_title: 'something',
+ site_description: 'something',
+ version_number: '1.0',
+ open_registrations: false,
+ closed_registrations_message: 'yes')
assign(:instance_presenter, instance_presenter)
render
diff --git a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
index 4c709a2c9f..b8487b03ff 100644
--- a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
@@ -7,10 +7,13 @@ describe Scheduler::FeedCleanupScheduler do
let!(:inactive_user) { Fabricate(:user, current_sign_in_at: 22.days.ago) }
it 'clears feeds of inactives' do
- expect_any_instance_of(Redis).to receive(:del).with(feed_key_for(inactive_user))
- expect_any_instance_of(Redis).not_to receive(:del).with(feed_key_for(active_user))
+ Redis.current.zadd(feed_key_for(inactive_user), 1, 1)
+ Redis.current.zadd(feed_key_for(active_user), 1, 1)
subject.perform
+
+ expect(Redis.current.zcard(feed_key_for(inactive_user))).to eq 0
+ expect(Redis.current.zcard(feed_key_for(active_user))).to eq 1
end
def feed_key_for(user)
diff --git a/streaming/index.js b/streaming/index.js
index 400456d243..c7e0de96c2 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -262,11 +262,12 @@ const startWorker = (workerId) => {
const { event, payload, queued_at } = JSON.parse(message);
const transmit = () => {
- const now = new Date().getTime();
- const delta = now - queued_at;
+ const now = new Date().getTime();
+ const delta = now - queued_at;
+ const encodedPayload = typeof payload === 'number' ? payload : JSON.stringify(payload);
- log.silly(req.requestId, `Transmitting for ${req.accountId}: ${event} ${payload} Delay: ${delta}ms`);
- output(event, payload);
+ log.silly(req.requestId, `Transmitting for ${req.accountId}: ${event} ${encodedPayload} Delay: ${delta}ms`);
+ output(event, encodedPayload);
};
if (notificationOnly && event !== 'notification') {
@@ -282,7 +283,7 @@ const startWorker = (workerId) => {
return;
}
- const unpackedPayload = JSON.parse(payload);
+ const unpackedPayload = payload;
const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id));
const accountDomain = unpackedPayload.account.acct.split('@')[1];
@@ -466,6 +467,7 @@ const startWorker = (workerId) => {
const onExit = () => {
log.info(`Worker ${workerId} exiting, bye bye`);
server.close();
+ process.exit(0);
};
const onError = (err) => {
diff --git a/yarn.lock b/yarn.lock
index b8af49d629..fba802e0a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -121,6 +121,10 @@
react-split-pane "^0.1.63"
redux "^3.6.0"
+"@types/node@^6.0.46":
+ version "6.0.78"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
+
abab@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -251,7 +255,7 @@ ansi-styles@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-any-promise@^0.1.0, any-promise@~0.1.0:
+any-promise@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
@@ -456,27 +460,6 @@ axios@^0.16.2:
follow-redirects "^1.2.3"
is-buffer "^1.1.5"
-babel-cli@^6.24.1:
- version "6.24.1"
- resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.1.tgz#207cd705bba61489b2ea41b5312341cf6aca2283"
- dependencies:
- babel-core "^6.24.1"
- babel-polyfill "^6.23.0"
- babel-register "^6.24.1"
- babel-runtime "^6.22.0"
- commander "^2.8.1"
- convert-source-map "^1.1.0"
- fs-readdir-recursive "^1.0.0"
- glob "^7.0.0"
- lodash "^4.2.0"
- output-file-sync "^1.1.0"
- path-is-absolute "^1.0.0"
- slash "^1.0.0"
- source-map "^0.5.0"
- v8flags "^2.0.10"
- optionalDependencies:
- chokidar "^1.6.1"
-
babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
@@ -1044,6 +1027,12 @@ babel-plugin-transform-react-display-name@^6.23.0:
dependencies:
babel-runtime "^6.22.0"
+babel-plugin-transform-react-inline-elements@^6.22.0:
+ version "6.22.0"
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-inline-elements/-/babel-plugin-transform-react-inline-elements-6.22.0.tgz#6687211a32b49a52f22c573a2b5504a25ef17c53"
+ dependencies:
+ babel-runtime "^6.22.0"
+
babel-plugin-transform-react-jsx-self@6.22.0, babel-plugin-transform-react-jsx-self@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
@@ -1091,14 +1080,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
-babel-polyfill@^6.23.0:
- version "6.23.0"
- resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
- dependencies:
- babel-runtime "^6.22.0"
- core-js "^2.4.0"
- regenerator-runtime "^0.10.0"
-
babel-preset-env@1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a"
@@ -1284,7 +1265,7 @@ babel-register@^6.24.1:
mkdirp "^0.5.1"
source-map-support "^0.4.2"
-babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2:
+babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
dependencies:
@@ -1342,10 +1323,6 @@ balanced-match@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
-balanced-match@^0.2.0:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7"
-
balanced-match@^0.4.2:
version "0.4.2"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1545,6 +1522,10 @@ callsites@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+camelcase-css@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-1.0.1.tgz#157c4238265f5cf94a1dffde86446552cbf3f705"
+
camelcase-keys@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -1600,9 +1581,9 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"
-chai-enzyme@^0.7.1:
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/chai-enzyme/-/chai-enzyme-0.7.1.tgz#a945c81989bcc4fd96af6263f9c0a9c668f29b66"
+chai-enzyme@^0.8.0:
+ version "0.8.0"
+ resolved "https://registry.yarnpkg.com/chai-enzyme/-/chai-enzyme-0.8.0.tgz#609c552a1dcdb091f435e1e281cc4f2149a33be1"
dependencies:
html "^1.0.0"
react-element-to-jsx-string "^5.0.0"
@@ -1653,7 +1634,7 @@ cheerio@^0.22.0:
lodash.reject "^4.4.0"
lodash.some "^4.4.0"
-chokidar@^1.4.3, chokidar@^1.6.0, chokidar@^1.6.1:
+chokidar@^1.4.3, chokidar@^1.6.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
dependencies:
@@ -2021,7 +2002,7 @@ crypto-random-string@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-css-color-function@^1.2.0:
+css-color-function@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.0.tgz#72c767baf978f01b8a8a94f42f17ba5d22a776fc"
dependencies:
@@ -2343,7 +2324,7 @@ doctrine@^2.0.0:
esutils "^2.0.2"
isarray "^1.0.0"
-"dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.0.0:
+"dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.0.0, dom-helpers@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
@@ -2531,8 +2512,8 @@ es-to-primitive@^1.1.1:
is-symbol "^1.0.1"
es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
- version "0.10.23"
- resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.23.tgz#7578b51be974207a5487821b56538c224e4e7b38"
+ version "0.10.24"
+ resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.24.tgz#a55877c9924bc0c8d9bd3c2cbe17495ac1709b14"
dependencies:
es6-iterator "2"
es6-symbol "~3.1"
@@ -3026,15 +3007,6 @@ fresh@0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
-fs-extra@^0.24.0:
- version "0.24.0"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
- dependencies:
- graceful-fs "^4.1.2"
- jsonfile "^2.1.0"
- path-is-absolute "^1.0.0"
- rimraf "^2.2.8"
-
fs-extra@^0.30.0:
version "0.30.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
@@ -3045,16 +3017,6 @@ fs-extra@^0.30.0:
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
-fs-promise@^0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.3.1.tgz#bf34050368f24d6dc9dfc6688ab5cead8f86842a"
- dependencies:
- any-promise "~0.1.0"
-
-fs-readdir-recursive@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
-
fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -3204,16 +3166,6 @@ glob@7.1.1:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^5.0.3:
- version "5.0.15"
- resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
- dependencies:
- inflight "^1.0.4"
- inherits "2"
- minimatch "2 || 3"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1:
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -3236,17 +3188,6 @@ globals@^9.0.0, globals@^9.14.0:
version "9.18.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-globby@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/globby/-/globby-3.0.1.tgz#2094af8421e19152150d5893eb6416b312d9a22f"
- dependencies:
- array-union "^1.0.1"
- arrify "^1.0.0"
- glob "^5.0.3"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^1.0.0"
-
globby@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
@@ -3282,7 +3223,7 @@ gonzales-pe@^4.0.3:
dependencies:
minimist "1.1.x"
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -3911,9 +3852,9 @@ jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-jsdom@^10.1.0:
- version "10.1.0"
- resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-10.1.0.tgz#7765e00fd5c3567f34985a1c86ff466a61dacc6a"
+jsdom@^11.0.0:
+ version "11.0.0"
+ resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5"
dependencies:
abab "^1.0.3"
acorn "^4.0.4"
@@ -3925,7 +3866,7 @@ jsdom@^10.1.0:
escodegen "^1.6.1"
html-encoding-sniffer "^1.0.1"
nwmatcher ">= 1.3.9 < 2.0.0"
- parse5 "^1.5.1"
+ parse5 "^3.0.2"
pn "^1.0.0"
request "^2.79.0"
request-promise-native "^1.0.3"
@@ -4002,7 +3943,7 @@ jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
-keycode@^2.1.8:
+keycode@^2.1.7, keycode@^2.1.8:
version "2.1.9"
resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa"
@@ -4434,7 +4375,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
dependencies:
@@ -4860,14 +4801,6 @@ osenv@0, osenv@^0.1.4:
os-homedir "^1.0.0"
os-tmpdir "^1.0.0"
-output-file-sync@^1.1.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
- dependencies:
- graceful-fs "^4.1.4"
- mkdirp "^0.5.1"
- object-assign "^4.1.0"
-
p-finally@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -4919,9 +4852,11 @@ parse-json@^2.2.0:
dependencies:
error-ex "^1.2.0"
-parse5@^1.5.1:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+parse5@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
+ dependencies:
+ "@types/node" "^6.0.46"
parseurl@~1.3.1:
version "1.3.1"
@@ -5054,22 +4989,12 @@ pify@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-pinkie-promise@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-1.0.0.tgz#d1da67f5482563bb7cf57f286ae2822ecfbf3670"
- dependencies:
- pinkie "^1.0.0"
-
pinkie-promise@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
dependencies:
pinkie "^2.0.0"
-pinkie@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-1.0.0.tgz#5a47f28ba1015d0201bda7bf0f358e47bec8c7e4"
-
pinkie@^2.0.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
@@ -5109,7 +5034,7 @@ postcss-advanced-variables@1.2.2:
dependencies:
postcss "^5.0.10"
-postcss-atroot@^0.1.2:
+postcss-atroot@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/postcss-atroot/-/postcss-atroot-0.1.3.tgz#6752c0230c745140549345b2b0e30ebeda01a405"
dependencies:
@@ -5123,12 +5048,12 @@ postcss-calc@^5.2.0:
postcss-message-helpers "^2.0.0"
reduce-css-calc "^1.2.6"
-postcss-color-function@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-2.0.1.tgz#9ad226f550e8a7c7f8b8a77860545b6dd7f55241"
+postcss-color-function@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-4.0.0.tgz#7e0106f4f6a1ecb1ad5b3a8553ace5e828aae187"
dependencies:
- css-color-function "^1.2.0"
- postcss "^5.0.4"
+ css-color-function "^1.3.0"
+ postcss "^6.0.1"
postcss-message-helpers "^2.0.0"
postcss-value-parser "^3.3.0"
@@ -5147,26 +5072,25 @@ postcss-convert-values@^2.3.4:
postcss "^5.0.11"
postcss-value-parser "^3.1.2"
-postcss-custom-media@^5.0.0:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz#138d25a184bf2eb54de12d55a6c01c30a9d8bd81"
+postcss-custom-media@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz#be532784110ecb295044fb5395a18006eb21a737"
dependencies:
- postcss "^5.0.0"
+ postcss "^6.0.1"
-postcss-custom-properties@^5.0.0:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-5.0.2.tgz#9719d78f2da9cf9f53810aebc23d4656130aceb1"
+postcss-custom-properties@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-6.1.0.tgz#9caf1151ac41b1e9e64d3a2ff9ece996ca18977d"
dependencies:
- balanced-match "^0.4.2"
- postcss "^5.0.0"
+ balanced-match "^1.0.0"
+ postcss "^6.0.3"
-postcss-custom-selectors@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-3.0.0.tgz#8f81249f5ed07a8d0917cf6a39fe5b056b7f96ac"
+postcss-custom-selectors@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz#781382f94c52e727ef5ca4776ea2adf49a611382"
dependencies:
- balanced-match "^0.2.0"
- postcss "^5.0.0"
- postcss-selector-matches "^2.0.0"
+ postcss "^6.0.1"
+ postcss-selector-matches "^3.0.0"
postcss-discard-comments@^2.0.4:
version "2.0.4"
@@ -5199,7 +5123,7 @@ postcss-discard-unused@^2.2.1:
postcss "^5.0.14"
uniqs "^2.0.0"
-postcss-extend@^1.0.1:
+postcss-extend@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/postcss-extend/-/postcss-extend-1.0.5.tgz#5ea98bf787ba3cacf4df4609743f80a833b1d0e7"
dependencies:
@@ -5218,6 +5142,23 @@ postcss-flexbugs-fixes@^3.0.0:
dependencies:
postcss "^6.0.1"
+postcss-import@^10.0.0:
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-10.0.0.tgz#4c85c97b099136cc5ea0240dc1dfdbfde4e2ebbe"
+ dependencies:
+ object-assign "^4.0.1"
+ postcss "^6.0.1"
+ postcss-value-parser "^3.2.3"
+ read-cache "^1.0.0"
+ resolve "^1.1.7"
+
+postcss-js@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-1.0.0.tgz#ccee5aa3b1970dd457008e79438165f66919ba30"
+ dependencies:
+ camelcase-css "^1.0.1"
+ postcss "^6.0.1"
+
postcss-load-config@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
@@ -5250,11 +5191,11 @@ postcss-loader@^2.0.5, postcss-loader@^2.0.6:
postcss-load-config "^1.2.0"
schema-utils "^0.3.0"
-postcss-media-minmax@^2.1.0:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-2.1.2.tgz#444c5cf8926ab5e4fd8a2509e9297e751649cdf8"
+postcss-media-minmax@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz#675256037a43ef40bc4f0760bfd06d4dc69d48d2"
dependencies:
- postcss "^5.0.4"
+ postcss "^6.0.1"
postcss-merge-idents@^2.1.5:
version "2.1.7"
@@ -5317,13 +5258,15 @@ postcss-minify-selectors@^2.0.4:
postcss "^5.0.14"
postcss-selector-parser "^2.0.0"
-postcss-mixins@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-2.1.1.tgz#b141a0803efa8e2d744867f8d91596890cf9241b"
+postcss-mixins@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-6.0.1.tgz#f5c9726259a6103733b43daa6a8b67dd0ed7aa47"
dependencies:
- globby "^3.0.1"
- postcss "^5.0.10"
- postcss-simple-vars "^1.0.1"
+ globby "^6.1.0"
+ postcss "^6.0.3"
+ postcss-js "^1.0.0"
+ postcss-simple-vars "^4.0.0"
+ sugarss "^1.0.0"
postcss-modules-extract-imports@^1.0.0:
version "1.2.0"
@@ -5352,17 +5295,17 @@ postcss-modules-values@^1.1.0:
icss-replace-symbols "^1.1.0"
postcss "^6.0.1"
-postcss-nested@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-1.0.1.tgz#91f28f4e6e23d567241ac154558a0cfab4cc0d8f"
+postcss-nested@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.0.2.tgz#f38fad547f5c3747160aec3bb34745819252974a"
dependencies:
- postcss "^5.2.17"
+ postcss "^6.0.1"
-postcss-nesting@^2.0.6:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-2.3.1.tgz#94a6b6a4ef707fbec20a87fee5c957759b4e01cf"
+postcss-nesting@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-4.0.1.tgz#8fc2ce40cbfcfab7ee24e7b68fb6ebe84b641469"
dependencies:
- postcss "^5.0.19"
+ postcss "^6.0.1"
postcss-normalize-charset@^1.1.0:
version "1.1.1"
@@ -5386,17 +5329,14 @@ postcss-ordered-values@^2.1.0:
postcss "^5.0.4"
postcss-value-parser "^3.0.1"
-postcss-partial-import@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/postcss-partial-import/-/postcss-partial-import-1.3.0.tgz#2f4b773a76c7b0a69b389dcf475c4d362d0d2576"
+postcss-partial-import@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-partial-import/-/postcss-partial-import-4.1.0.tgz#f6c3e78e7bbeda4d9dab96d360367b90b353f9a4"
dependencies:
- fs-extra "^0.24.0"
- fs-promise "^0.3.1"
- object-assign "^4.0.1"
- postcss "^5.0.5"
- string-hash "^1.1.0"
+ glob "^7.1.1"
+ postcss-import "^10.0.0"
-postcss-property-lookup@^1.1.3:
+postcss-property-lookup@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/postcss-property-lookup/-/postcss-property-lookup-1.2.1.tgz#30450a1361b7aae758bbedd5201fbe057bb8270b"
dependencies:
@@ -5439,19 +5379,19 @@ postcss-scss@^1.0.0:
dependencies:
postcss "^6.0.3"
-postcss-selector-matches@^2.0.0:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-2.0.5.tgz#fa0f43be57b68e77aa4cd11807023492a131027f"
+postcss-selector-matches@^3.0.0, postcss-selector-matches@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz#e5634011e13950881861bbdd58c2d0111ffc96ab"
dependencies:
balanced-match "^0.4.2"
- postcss "^5.0.0"
+ postcss "^6.0.1"
-postcss-selector-not@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-2.0.0.tgz#c73ad21a3f75234bee7fee269e154fd6a869798d"
+postcss-selector-not@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz#2e4db2f0965336c01e7cec7db6c60dff767335d9"
dependencies:
- balanced-match "^0.2.0"
- postcss "^5.0.0"
+ balanced-match "^0.4.2"
+ postcss "^6.0.1"
postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
version "2.2.3"
@@ -5461,11 +5401,11 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss-simple-vars@^1.0.1:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-1.2.0.tgz#2e6689921144b74114e765353275a3c32143f150"
+postcss-simple-vars@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-4.0.0.tgz#d49e082897d9a4824f2268fa91d969d943e2ea76"
dependencies:
- postcss "^5.0.13"
+ postcss "^6.0.1"
postcss-smart-import@^0.7.4:
version "0.7.4"
@@ -5512,7 +5452,7 @@ postcss-zindex@^2.0.1:
postcss "^5.0.4"
uniqs "^2.0.0"
-postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.19, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.17, postcss@^5.2.6:
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.6:
version "5.2.17"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
dependencies:
@@ -5551,26 +5491,26 @@ precond@0.2:
version "0.2.3"
resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac"
-precss@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/precss/-/precss-1.4.0.tgz#8d7c3ae70f10a00a3955287f85a66e0f8b31cda3"
+precss@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/precss/-/precss-2.0.0.tgz#7f567e3318e06d44c8fdbf9e58452e8358bf4b71"
dependencies:
- postcss "^5.0.10"
+ postcss "^6.0.3"
postcss-advanced-variables "1.2.2"
- postcss-atroot "^0.1.2"
- postcss-color-function "^2.0.0"
- postcss-custom-media "^5.0.0"
- postcss-custom-properties "^5.0.0"
- postcss-custom-selectors "^3.0.0"
- postcss-extend "^1.0.1"
- postcss-media-minmax "^2.1.0"
- postcss-mixins "^2.1.0"
- postcss-nested "^1.0.0"
- postcss-nesting "^2.0.6"
- postcss-partial-import "^1.3.0"
- postcss-property-lookup "^1.1.3"
- postcss-selector-matches "^2.0.0"
- postcss-selector-not "^2.0.0"
+ postcss-atroot "^0.1.3"
+ postcss-color-function "^4.0.0"
+ postcss-custom-media "^6.0.0"
+ postcss-custom-properties "^6.1.0"
+ postcss-custom-selectors "^4.0.1"
+ postcss-extend "^1.0.5"
+ postcss-media-minmax "^3.0.0"
+ postcss-mixins "^6.0.1"
+ postcss-nested "^2.0.2"
+ postcss-nesting "^4.0.1"
+ postcss-partial-import "^4.1.0"
+ postcss-property-lookup "^1.2.1"
+ postcss-selector-matches "^3.0.1"
+ postcss-selector-not "^3.0.1"
prelude-ls@~1.1.2:
version "1.1.2"
@@ -5777,6 +5717,15 @@ react-element-to-jsx-string@^5.0.0:
stringify-object "2.4.0"
traverse "^0.6.6"
+react-event-listener@^0.4.5:
+ version "0.4.5"
+ resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.4.5.tgz#e3e895a0970cf14ee8f890113af68197abf3d0b1"
+ dependencies:
+ babel-runtime "^6.20.0"
+ fbjs "^0.8.4"
+ prop-types "^15.5.4"
+ warning "^3.0.0"
+
react-html-attributes@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/react-html-attributes/-/react-html-attributes-1.3.0.tgz#c97896e9cac47ad9c4e6618b835029a826f5d28c"
@@ -5941,11 +5890,34 @@ react-style-proptype@^3.0.0:
dependencies:
prop-types "^15.5.4"
-react-swipeable@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/react-swipeable/-/react-swipeable-4.0.1.tgz#2cb3a04a52ccebf5361881b30e233dc13ee4b115"
+react-swipeable-views-core@^0.11.1:
+ version "0.11.1"
+ resolved "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.11.1.tgz#61d046799f90725bbf91a0eb3abcab805c774cac"
dependencies:
- prop-types "^15.5.8"
+ babel-runtime "^6.23.0"
+ warning "^3.0.0"
+
+react-swipeable-views-utils@^0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.12.0.tgz#4ff11f20a8da0561f623876d9fd691116e1a6a03"
+ dependencies:
+ babel-runtime "^6.23.0"
+ fbjs "^0.8.4"
+ keycode "^2.1.7"
+ prop-types "^15.5.4"
+ react-event-listener "^0.4.5"
+ react-swipeable-views-core "^0.11.1"
+
+react-swipeable-views@^0.12.3:
+ version "0.12.3"
+ resolved "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.12.3.tgz#b0d3f417bcbcd06afda2f8437c15e8360a568744"
+ dependencies:
+ babel-runtime "^6.23.0"
+ dom-helpers "^3.2.1"
+ prop-types "^15.5.4"
+ react-swipeable-views-core "^0.11.1"
+ react-swipeable-views-utils "^0.12.0"
+ warning "^3.0.0"
react-test-renderer@^15.6.1:
version "15.6.1"
@@ -6289,7 +6261,7 @@ resolve-url@~0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-resolve@^1.1.6, resolve@^1.3.3:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
dependencies:
@@ -6745,10 +6717,6 @@ strict-uri-encode@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-string-hash@^1.1.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
-
string-width@^1.0.1, string-width@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -6854,6 +6822,10 @@ style-loader@^0.18.2:
loader-utils "^1.0.2"
schema-utils "^0.3.0"
+substring-trie@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.0.tgz#5a7ecb83aefcca7b3720f7897cf69e97023be143"
+
sugarss@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.0.tgz#65e51b3958432fb70d5451a68bb33e32d0cf1ef7"
@@ -7148,10 +7120,6 @@ url@^0.11.0:
punycode "1.3.2"
querystring "0.2.0"
-user-home@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-
user-home@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
@@ -7180,15 +7148,9 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-uws@^0.14.5:
- version "0.14.5"
- resolved "https://registry.yarnpkg.com/uws/-/uws-0.14.5.tgz#67aaf33c46b2a587a5f6666d00f7691328f149dc"
-
-v8flags@^2.0.10:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
- dependencies:
- user-home "^1.1.1"
+uws@^8.14.0:
+ version "8.14.0"
+ resolved "https://registry.yarnpkg.com/uws/-/uws-8.14.0.tgz#acc1488d13ecb23fe2f942a7eafb06681fa91431"
validate-npm-package-license@^3.0.1:
version "3.0.1"
@@ -7274,9 +7236,9 @@ webpack-dev-middleware@^1.10.2, webpack-dev-middleware@^1.11.0:
path-is-absolute "^1.0.0"
range-parser "^1.0.3"
-webpack-dev-server@lencioni/webpack-dev-server#patch-1:
- version "2.5.0"
- resolved "https://codeload.github.com/lencioni/webpack-dev-server/tar.gz/8978059d9b880c6c28908a6ed4608e27d40f2f69"
+webpack-dev-server@^2.5.1:
+ version "2.5.1"
+ resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.5.1.tgz#a02e726a87bb603db5d71abb7d6d2649bf10c769"
dependencies:
ansi-html "0.0.7"
bonjour "^3.5.0"