From d757c8a64440e15957826342dd6fcebe4b5f7ffe Mon Sep 17 00:00:00 2001 From: David Yip Date: Sun, 3 Jun 2018 03:40:27 -0500 Subject: prefs: Note that favourite confirmation applies to Glitch flavour only (#491) --- config/locales/simple_form.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 851b678e1..74c2084d5 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -55,7 +55,7 @@ en: setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot setting_display_sensitive_media: Always show media marked as sensitive - setting_favourite_modal: Show confirmation dialog before favouriting + setting_favourite_modal: Show confirmation dialog before favouriting (applies to Glitch flavour only) setting_hide_network: Hide your network setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations -- cgit From 0deb9fa6b9b8820fcb0a9ebd221178a8ec82490a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 4 Jun 2018 02:18:18 +0200 Subject: Remove trending hashtags (#7711) * Delete trends_controller.rb * Update routes.rb * Update trending_tags.rb * Update index.js * Update index.js * Update search_results.js * Update async-components.js * Update index.js * Delete trends.js * Delete trends.js * Delete trends_container.js * Delete trends.js * Update search_results.js * Update search_results_container.js --- app/controllers/api/v1/trends_controller.rb | 17 ------ app/javascript/mastodon/actions/trends.js | 32 ---------- .../features/compose/components/search_results.js | 25 +------- .../compose/containers/search_results_container.js | 8 +-- .../features/getting_started/components/trends.js | 71 ---------------------- .../getting_started/containers/trends_container.js | 18 ------ .../mastodon/features/getting_started/index.js | 3 - app/javascript/mastodon/features/ui/index.js | 2 - .../mastodon/features/ui/util/async-components.js | 4 -- app/javascript/mastodon/reducers/index.js | 2 - app/javascript/mastodon/reducers/trends.js | 23 ------- app/models/trending_tags.rb | 22 ------- config/routes.rb | 1 - 13 files changed, 2 insertions(+), 226 deletions(-) delete mode 100644 app/controllers/api/v1/trends_controller.rb delete mode 100644 app/javascript/mastodon/actions/trends.js delete mode 100644 app/javascript/mastodon/features/getting_started/components/trends.js delete mode 100644 app/javascript/mastodon/features/getting_started/containers/trends_container.js delete mode 100644 app/javascript/mastodon/reducers/trends.js (limited to 'config') diff --git a/app/controllers/api/v1/trends_controller.rb b/app/controllers/api/v1/trends_controller.rb deleted file mode 100644 index bcea9857e..000000000 --- a/app/controllers/api/v1/trends_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class Api::V1::TrendsController < Api::BaseController - before_action :set_tags - - respond_to :json - - def index - render json: @tags, each_serializer: REST::TagSerializer - end - - private - - def set_tags - @tags = TrendingTags.get(limit_param(10)) - end -end diff --git a/app/javascript/mastodon/actions/trends.js b/app/javascript/mastodon/actions/trends.js deleted file mode 100644 index 853e4f60a..000000000 --- a/app/javascript/mastodon/actions/trends.js +++ /dev/null @@ -1,32 +0,0 @@ -import api from '../api'; - -export const TRENDS_FETCH_REQUEST = 'TRENDS_FETCH_REQUEST'; -export const TRENDS_FETCH_SUCCESS = 'TRENDS_FETCH_SUCCESS'; -export const TRENDS_FETCH_FAIL = 'TRENDS_FETCH_FAIL'; - -export const fetchTrends = () => (dispatch, getState) => { - dispatch(fetchTrendsRequest()); - - api(getState) - .get('/api/v1/trends') - .then(({ data }) => dispatch(fetchTrendsSuccess(data))) - .catch(err => dispatch(fetchTrendsFail(err))); -}; - -export const fetchTrendsRequest = () => ({ - type: TRENDS_FETCH_REQUEST, - skipLoading: true, -}); - -export const fetchTrendsSuccess = trends => ({ - type: TRENDS_FETCH_SUCCESS, - trends, - skipLoading: true, -}); - -export const fetchTrendsFail = error => ({ - type: TRENDS_FETCH_FAIL, - error, - skipLoading: true, - skipAlert: true, -}); diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js index cf022362e..c351b84bb 100644 --- a/app/javascript/mastodon/features/compose/components/search_results.js +++ b/app/javascript/mastodon/features/compose/components/search_results.js @@ -1,5 +1,4 @@ import React from 'react'; -import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { FormattedMessage } from 'react-intl'; import AccountContainer from '../../../containers/account_container'; @@ -11,36 +10,14 @@ export default class SearchResults extends ImmutablePureComponent { static propTypes = { results: ImmutablePropTypes.map.isRequired, - trends: ImmutablePropTypes.list, - fetchTrends: PropTypes.func.isRequired, }; - componentDidMount () { - const { fetchTrends } = this.props; - fetchTrends(); - } - render () { - const { results, trends } = this.props; + const { results } = this.props; let accounts, statuses, hashtags; let count = 0; - if (results.isEmpty()) { - return ( -
-
-
- - -
- - {trends && trends.map(hashtag => )} -
-
- ); - } - if (results.get('accounts') && results.get('accounts').size > 0) { count += results.get('accounts').size; accounts = ( diff --git a/app/javascript/mastodon/features/compose/containers/search_results_container.js b/app/javascript/mastodon/features/compose/containers/search_results_container.js index 2f879f9d9..16d95d417 100644 --- a/app/javascript/mastodon/features/compose/containers/search_results_container.js +++ b/app/javascript/mastodon/features/compose/containers/search_results_container.js @@ -1,14 +1,8 @@ import { connect } from 'react-redux'; import SearchResults from '../components/search_results'; -import { fetchTrends } from '../../../actions/trends'; const mapStateToProps = state => ({ results: state.getIn(['search', 'results']), - trends: state.getIn(['trends', 'items']), }); -const mapDispatchToProps = dispatch => ({ - fetchTrends: () => dispatch(fetchTrends()), -}); - -export default connect(mapStateToProps, mapDispatchToProps)(SearchResults); +export default connect(mapStateToProps)(SearchResults); diff --git a/app/javascript/mastodon/features/getting_started/components/trends.js b/app/javascript/mastodon/features/getting_started/components/trends.js deleted file mode 100644 index 96a646bea..000000000 --- a/app/javascript/mastodon/features/getting_started/components/trends.js +++ /dev/null @@ -1,71 +0,0 @@ -import classNames from 'classnames'; -import React from 'react'; -import ImmutablePureComponent from 'react-immutable-pure-component'; -import PropTypes from 'prop-types'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import { FormattedMessage, defineMessages } from 'react-intl'; -import Hashtag from '../../../components/hashtag'; -import { Link } from 'react-router-dom'; - -const messages = defineMessages({ - refresh_trends: { id: 'trends.refresh', defaultMessage: 'Refresh' }, -}); - -export default class Trends extends ImmutablePureComponent { - - static defaultProps = { - loading: false, - }; - - static propTypes = { - trends: ImmutablePropTypes.list, - loading: PropTypes.bool.isRequired, - showTrends: PropTypes.bool.isRequired, - fetchTrends: PropTypes.func.isRequired, - toggleTrends: PropTypes.func.isRequired, - }; - - componentDidMount () { - setTimeout(() => this.props.fetchTrends(), 5000); - } - - handleRefreshTrends = () => { - this.props.fetchTrends(); - } - - handleToggle = () => { - this.props.toggleTrends(!this.props.showTrends); - } - - render () { - const { intl, trends, loading, showTrends } = this.props; - - if (!trends || trends.size < 1) { - return null; - } - - return ( -
-
-

- - -
- {showTrends && } - -
-

-
- - {showTrends &&
- {trends.take(3).map(hashtag => )} - -
} -
- ); - } - -} diff --git a/app/javascript/mastodon/features/getting_started/containers/trends_container.js b/app/javascript/mastodon/features/getting_started/containers/trends_container.js deleted file mode 100644 index 65faeae86..000000000 --- a/app/javascript/mastodon/features/getting_started/containers/trends_container.js +++ /dev/null @@ -1,18 +0,0 @@ -import { connect } from 'react-redux'; -import { injectIntl } from 'react-intl'; -import { fetchTrends } from '../../../actions/trends'; -import Trends from '../components/trends'; -import { changeSetting } from '../../../actions/settings'; - -const mapStateToProps = state => ({ - trends: state.getIn(['trends', 'items']), - loading: state.getIn(['trends', 'isLoading']), - showTrends: state.getIn(['settings', 'trends', 'show']), -}); - -const mapDispatchToProps = dispatch => ({ - fetchTrends: () => dispatch(fetchTrends()), - toggleTrends: show => dispatch(changeSetting(['trends', 'show'], show)), -}); - -export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Trends)); diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 67a5b282a..115dfd2b9 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -12,7 +12,6 @@ import { fetchFollowRequests } from '../../actions/accounts'; import { List as ImmutableList } from 'immutable'; import { Link } from 'react-router-dom'; import NavigationBar from '../compose/components/navigation_bar'; -import TrendsContainer from './containers/trends_container'; const messages = defineMessages({ home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' }, @@ -132,8 +131,6 @@ export default class GettingStarted extends ImmutablePureComponent { {navItems} - {multiColumn && } - {!multiColumn &&
}
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js index bfed02f98..f1409b946 100644 --- a/app/javascript/mastodon/features/ui/index.js +++ b/app/javascript/mastodon/features/ui/index.js @@ -42,7 +42,6 @@ import { Mutes, PinnedStatuses, Lists, - Trends, } from './util/async-components'; import { HotKeys } from 'react-hotkeys'; import { me } from '../../initial_state'; @@ -155,7 +154,6 @@ class SwitchingColumnsArea extends React.PureComponent { - diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js index dfc796a09..8cf2a6e7d 100644 --- a/app/javascript/mastodon/features/ui/util/async-components.js +++ b/app/javascript/mastodon/features/ui/util/async-components.js @@ -129,7 +129,3 @@ export function EmbedModal () { export function ListEditor () { return import(/* webpackChunkName: "features/list_editor" */'../../list_editor'); } - -export function Trends () { - return import(/* webpackChunkName: "features/trends" */'../../trends'); -} diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js index 019c1f466..3d9a6a132 100644 --- a/app/javascript/mastodon/reducers/index.js +++ b/app/javascript/mastodon/reducers/index.js @@ -26,7 +26,6 @@ import height_cache from './height_cache'; import custom_emojis from './custom_emojis'; import lists from './lists'; import listEditor from './list_editor'; -import trends from './trends'; const reducers = { dropdown_menu, @@ -56,7 +55,6 @@ const reducers = { custom_emojis, lists, listEditor, - trends, }; export default combineReducers(reducers); diff --git a/app/javascript/mastodon/reducers/trends.js b/app/javascript/mastodon/reducers/trends.js deleted file mode 100644 index 5cecc8fca..000000000 --- a/app/javascript/mastodon/reducers/trends.js +++ /dev/null @@ -1,23 +0,0 @@ -import { TRENDS_FETCH_REQUEST, TRENDS_FETCH_SUCCESS, TRENDS_FETCH_FAIL } from '../actions/trends'; -import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable'; - -const initialState = ImmutableMap({ - items: ImmutableList(), - isLoading: false, -}); - -export default function trendsReducer(state = initialState, action) { - switch(action.type) { - case TRENDS_FETCH_REQUEST: - return state.set('isLoading', true); - case TRENDS_FETCH_SUCCESS: - return state.withMutations(map => { - map.set('items', fromJS(action.trends)); - map.set('isLoading', false); - }); - case TRENDS_FETCH_FAIL: - return state.set('isLoading', false); - default: - return state; - } -}; diff --git a/app/models/trending_tags.rb b/app/models/trending_tags.rb index 287de2a8a..c3641d7fd 100644 --- a/app/models/trending_tags.rb +++ b/app/models/trending_tags.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true class TrendingTags - KEY = 'trending_tags' EXPIRE_HISTORY_AFTER = 7.days.seconds - THRESHOLD = 5 class << self def record_use!(tag, account, at_time = Time.now.utc) @@ -11,30 +9,10 @@ class TrendingTags increment_historical_use!(tag.id, at_time) increment_unique_use!(tag.id, account.id, at_time) - increment_vote!(tag.id, at_time) - end - - def get(limit) - tag_ids = redis.zrevrange(KEY, 0, limit).map(&:to_i) - tags = Tag.where(id: tag_ids).to_a.map { |tag| [tag.id, tag] }.to_h - tag_ids.map { |tag_id| tags[tag_id] }.compact end private - def increment_vote!(tag_id, at_time) - expected = redis.pfcount("activity:tags:#{tag_id}:#{(at_time - 1.day).beginning_of_day.to_i}:accounts").to_f - expected = 1.0 if expected.zero? - observed = redis.pfcount("activity:tags:#{tag_id}:#{at_time.beginning_of_day.to_i}:accounts").to_f - - if expected > observed || observed < THRESHOLD - redis.zrem(KEY, tag_id.to_s) - else - score = ((observed - expected)**2) / expected - redis.zadd(KEY, score, tag_id.to_s) - end - end - def increment_historical_use!(tag_id, at_time) key = "activity:tags:#{tag_id}:#{at_time.beginning_of_day.to_i}" redis.incrby(key, 1) diff --git a/config/routes.rb b/config/routes.rb index 31e90e2ff..a3cba24fc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -254,7 +254,6 @@ Rails.application.routes.draw do resources :mutes, only: [:index] resources :favourites, only: [:index] resources :reports, only: [:index, :create] - resources :trends, only: [:index] namespace :apps do get :verify_credentials, to: 'credentials#show' -- cgit From 6b2f4f8c091858a3a6efd62ae77cf7bdf1e26969 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 4 Jun 2018 03:00:36 +0200 Subject: "Show" instead of "return to" after (remote)-following (#7718) Resolve #6326 --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/en.yml b/config/locales/en.yml index 0b0110c70..d128f92f3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -424,7 +424,7 @@ en: following: 'Success! You are now following:' post_follow: close: Or, you can just close this window. - return: Return to the user's profile + return: Show the user's profile web: Go to web title: Follow %{acct} datetime: -- cgit From d8b4f3900747202bd21889eca321fcb9beaea320 Mon Sep 17 00:00:00 2001 From: "Renato \"Lond\" Cerqueira" Date: Tue, 5 Jun 2018 20:28:29 +0200 Subject: Weblate translations 20180605 (#7743) * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.4% (593 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused --- app/javascript/mastodon/locales/eu.json | 10 +++++----- config/locales/doorkeeper.eu.yml | 2 +- config/locales/eu.yml | 14 +++++++------- config/locales/simple_form.eu.yml | 10 +++++----- config/locales/sk.yml | 1 + 5 files changed, 19 insertions(+), 18 deletions(-) (limited to 'config') diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index 5a542f486..49be810e2 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -13,14 +13,14 @@ "account.follows_you": "Jarraitzen dizu", "account.hide_reblogs": "Ezkutatu @{name}(r)en bultzadak", "account.media": "Media", - "account.mention": "@{name} aipatu", + "account.mention": "Aipatu @{name}", "account.moved_to": "{name} hona lekualdatu da:", "account.mute": "Mututu @{name}", "account.mute_notifications": "Mututu @{name}(r)en jakinarazpenak", "account.muted": "Mutututa", "account.posts": "Toot-ak", "account.posts_with_replies": "Toot eta erantzunak", - "account.report": "@{name} salatu", + "account.report": "Salatu @{name}", "account.requested": "Onarpenaren zain. Klikatu jarraitzeko eskaera ezeztatzeko", "account.share": "@{name}(e)ren profila elkarbanatu", "account.show_reblogs": "Erakutsi @{name}(r)en bultzadak", @@ -67,8 +67,8 @@ "compose_form.placeholder": "Zer duzu buruan?", "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", - "compose_form.sensitive.marked": "Multimedia mingarri gisa markatu da", - "compose_form.sensitive.unmarked": "Multimedia ez da mingarri gisa markatu", + "compose_form.sensitive.marked": "Multimedia edukia hunkigarri gisa markatu da", + "compose_form.sensitive.unmarked": "Multimedia edukia ez da hunkigarri gisa markatu", "compose_form.spoiler.marked": "Testua abisu batek ezkutatzen du", "compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta", "compose_form.spoiler_placeholder": "Idatzi zure abisua hemen", @@ -271,7 +271,7 @@ "status.replyAll": "Erantzun harian", "status.report": "Salatu @{name}", "status.sensitive_toggle": "Egin klik ikusteko", - "status.sensitive_warning": "Eduki mingarria", + "status.sensitive_warning": "Eduki hunkigarria", "status.share": "Partekatu", "status.show_less": "Erakutsi gutxiago", "status.show_less_all": "Erakutsi denetarik gutxiago", diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml index 9fe6ea961..aba3166ac 100644 --- a/config/locales/doorkeeper.eu.yml +++ b/config/locales/doorkeeper.eu.yml @@ -117,4 +117,4 @@ eu: follow: jarraitu kontuak, blokeatu, utzi jarraitzeari eta desblokeatu push: jaso zure kontuaren push jakinarazpenak read: irakurri zure kontuko datuak - write: argitaratu zure izenean + write: zure izenean argitaratu diff --git a/config/locales/eu.yml b/config/locales/eu.yml index c0b824c9a..1f3588b30 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -153,14 +153,14 @@ eu: action_logs: actions: assigned_to_self_report: "%{name}(e)k %{target} salaketa bere buruari esleitu dio" - change_email_user: "%{name}(e)k %{target}(r)en helbide elektronikoa aldatu du" - confirm_user: "%{name}(e)k %{target}(r)en helbide elektronikoa berretsi du" + change_email_user: "%{name}(e)k %{target}(r)en e-mail helbidea aldatu du" + confirm_user: "%{name}(e)k %{target}(r)en e-mail helbidea berretsi du" create_custom_emoji: "%{name}(e)k emoji berria kargatu du %{target}" create_domain_block: "%{name}(e)k %{target} domeinua blokeatu du" - create_email_domain_block: "%{name}(e)k %{target} helbide elektronikoen domeinua zerrenda beltzean sartu du" + create_email_domain_block: "%{name}(e)k %{target} e-mail helbideen domeinua zerrenda beltzean sartu du" demote_user: "%{name}(e)k %{target} mailaz jaitsi du" destroy_domain_block: "%{name}(e)k %{target} domeinua desblokeatu du" - destroy_email_domain_block: "%{name}(e)k %{target} helbide elektronikoen domeinua zerrenda zurian sartu du" + destroy_email_domain_block: "%{name}(e)k %{target} e-mail helbideen domeinua zerrenda zurian sartu du" destroy_status: "%{name}(e)k %{target}(e)n egoera kendu du" disable_2fa_user: "%{name}(e)k %{target}(r)i bi faktoreetako eskaera kendu dio" disable_custom_emoji: "%{name}(e)k %{target} emoji-a desgaitu du" @@ -356,8 +356,8 @@ eu: back_to_account: Atzera kontuaren orrira batch: delete: Ezabatu - nsfw_off: Markatu ez mingarri gisa - nsfw_on: Markatu mingarri gisa + nsfw_off: Markatu ez hunkigarri gisa + nsfw_on: Markatu hunkigarri gisa failed_to_execute: Ezin izan da burutu media: title: Multimedia @@ -694,7 +694,7 @@ eu: click_to_show: Klik erakusteko pinned: Finkatutako toot-a reblogged: bultzatua - sensitive_content: Eduki mingarria + sensitive_content: Eduki hunkigarria terms: body_html: |

Pribatutasun politika

diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index a2720ac5d..364a2e118 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -37,7 +37,7 @@ eu: current_password: Oraingo pasahitza data: Datuak display_name: Pantaila-izena - email: Helbide elektronikoa + email: E-mail helbidea expires_in: Iraungitzea fields: Profilaren metadatuak filtered_languages: Iragazitako hizkuntzak @@ -49,14 +49,14 @@ eu: note: Biografia otp_attempt: Bi faktoreetako kodea password: Pasahitza - setting_auto_play_gif: Automatikoki abiatu GIF animatuak + setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik setting_default_privacy: Mezuen pribatutasuna - setting_default_sensitive: Beti markatu edukiak mingarri gisa + setting_default_sensitive: Beti markatu edukiak hunkigarri gisa setting_delete_modal: Erakutsi baieztapen elkarrizketa-koadroa toot bat ezabatu aurretik - setting_display_sensitive_media: Beti erakutsi mingarri marka duen edukia + setting_display_sensitive_media: Beti erakutsi hunkigarri gisa markatutako edukia setting_hide_network: Ezkutatu zure sarea - setting_noindex: Atera bilaketa motorraren idexaziotik + setting_noindex: Atera bilaketa motorraren indexaziotik setting_reduce_motion: Murriztu animazioen mugimenduak setting_system_font_ui: Erabili sistemako tipografia lehenetsia setting_theme: Gunearen gaia diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 2c9294804..9a35b7c7f 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -50,6 +50,7 @@ sk: reserved_username: Prihlasovacie meno je rezervované roles: admin: Administrátor + bot: Automat moderator: Moderátor unfollow: Prestať sledovať admin: -- cgit From 2304d52599bfd3a907931971a94b9b68f229ab0a Mon Sep 17 00:00:00 2001 From: Marcin Mikołajczak Date: Wed, 6 Jun 2018 21:37:43 -0700 Subject: 🌍🇵🇱 (#7753) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- app/javascript/mastodon/locales/pl.json | 6 +++--- config/locales/pl.yml | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index ea56fc73a..a597d5702 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -83,8 +83,8 @@ "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.", "confirmations.mute.confirm": "Wycisz", "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "Usuń i przeredaguj", + "confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Utracisz wszystkie odpowiedzi, podbicia i polubienia dotyczące go.", "confirmations.unfollow.confirm": "Przestań śledzić", "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać śledzić {name}?", "embed.instructions": "Osadź ten wpis na swojej stronie wklejając poniższy kod.", @@ -266,7 +266,7 @@ "status.reblog": "Podbij", "status.reblog_private": "Podbij dla odbiorców oryginalnego wpisu", "status.reblogged_by": "{name} podbił", - "status.redraft": "Delete & re-draft", + "status.redraft": "Usuń i przeredaguj", "status.reply": "Odpowiedz", "status.replyAll": "Odpowiedz na wątek", "status.report": "Zgłoś @{name}", diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 143813c0f..3e342da42 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -425,7 +425,7 @@ pl: following: 'Pomyślnie! Od teraz śledzisz:' post_follow: close: Ewentualnie, możesz po prostu zamknąć tę stronę. - return: Powróć do strony użytkownika + return: Pokaż stronę użytkownika web: Przejdź do sieci title: Śledź %{acct} datetime: @@ -773,9 +773,13 @@ pl:
-

Children's Online Privacy Protection Act Compliance

+

Korzystanie ze strony przez dzieci

-

Ta strona, produkty i usługi są przeznaczone dla osób, które ukończyły 13 lat. Jeżeli serwer znajduje się w USA, a nie ukończyłeś 13 roku życia, zgodnie z wymogami COPPA (Prawo o Ochronie Prywatności Dzieci w Internecie), nie używaj tej strony.

+

Jeżeli serwer znajduje się w UE lub w EOG: Ta strona, produkty i usługi są przeznaczone dla osób, które ukończyły 16 lat. Jeżeli nie ukończyłeś 16 roku życia, zgodnie z wymogami COPPA (Prawo o Ochronie Prywatności Dzieci w Internecie), nie używaj tej strony.

+ +

Jeżeli serwer znajduje się w USA: Ta strona, produkty i usługi są przeznaczone dla osób, które ukończyły 13 lat. Jeżeli nie ukończyłeś 13 roku życia, zgodnie z wymogami RODO (Ogólne rozporządzenie o ochronie danych), nie używaj tej strony.

+ +

Wymogi mogą być inne, jeżeli serwer znajduje się w innym kraju.

-- cgit