diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index 3288f81f8..d02a55be0 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -129,7 +129,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
// It should not be transformed when mounting because the resulting
// size will be used to determine the coordinate of the menu by
// react-overlays
-
+
{items.map(item => (
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js
index 142223f3d..66dc85742 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@@ -7,6 +7,7 @@ import DisplayName from '../../../components/display_name';
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { isRtl } from '../../../rtl';
+import AttachmentList from 'mastodon/components/attachment_list';
const messages = defineMessages({
cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
@@ -60,6 +61,13 @@ class ReplyIndicator extends ImmutablePureComponent {
+);
+
+export default withRouter(NavigationPanel);
diff --git a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
new file mode 100644
index 000000000..da553cd9f
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
@@ -0,0 +1,9 @@
+import { connect } from 'react-redux';
+import IconWithBadge from 'mastodon/components/icon_with_badge';
+
+const mapStateToProps = state => ({
+ count: state.getIn(['notifications', 'unread']),
+ id: 'bell',
+});
+
+export default connect(mapStateToProps)(IconWithBadge);
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index 1b2bb7781..29583d3d7 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -5,16 +5,15 @@ import { FormattedMessage, injectIntl } from 'react-intl';
import { debounce } from 'lodash';
import { isUserTouching } from '../../../is_mobile';
import Icon from 'mastodon/components/icon';
+import NotificationsCounterIcon from './notifications_counter_icon';
export const links = [
- ,
- ,
-
- ,
- ,
- ,
-
- ,
+ ,
+ ,
+ ,
+ ,
+ ,
+ ,
];
export function getIndex (path) {
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 1fcea779d..791133afd 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -7,7 +7,6 @@ import { Redirect, withRouter } from 'react-router-dom';
import PropTypes from 'prop-types';
import NotificationsContainer from './containers/notifications_container';
import LoadingBarContainer from './containers/loading_bar_container';
-import TabsBar from './components/tabs_bar';
import ModalContainer from './containers/modal_container';
import { isMobile } from '../../is_mobile';
import { debounce } from 'lodash';
@@ -45,8 +44,9 @@ import {
Mutes,
PinnedStatuses,
Lists,
+ Search,
} from './util/async-components';
-import { me } from '../../initial_state';
+import { me, forceSingleColumn } from '../../initial_state';
import { previewState as previewMediaState } from './components/media_modal';
import { previewState as previewVideoState } from './components/video_modal';
@@ -93,6 +93,7 @@ const keyMap = {
goToMuted: 'g m',
goToRequests: 'g r',
toggleHidden: 'x',
+ toggleSensitive: 'h',
};
class SwitchingColumnsArea extends React.PureComponent {
@@ -141,10 +142,11 @@ class SwitchingColumnsArea extends React.PureComponent {
render () {
const { children } = this.props;
const { mobile } = this.state;
- const redirect = mobile ? : ;
+ const singleColumn = forceSingleColumn || mobile;
+ const redirect = singleColumn ? : ;
return (
-
+
{redirect}
@@ -160,7 +162,7 @@ class SwitchingColumnsArea extends React.PureComponent {
-
+
@@ -479,8 +481,6 @@ class UI extends React.PureComponent {
return (
-
-
{children}
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 235fd2a07..6e8ed163a 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -129,3 +129,7 @@ export function ListEditor () {
export function ListAdder () {
return import(/*webpackChunkName: "features/list_adder" */'../../list_adder');
}
+
+export function Search () {
+ return import(/*webpackChunkName: "features/search" */'../../search');
+}
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 00a63a3d9..b0c408527 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { fromJS } from 'immutable';
+import { fromJS, is } from 'immutable';
import { throttle } from 'lodash';
import classNames from 'classnames';
import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
@@ -102,6 +102,8 @@ class Video extends React.PureComponent {
detailed: PropTypes.bool,
inline: PropTypes.bool,
cacheWidth: PropTypes.func,
+ visible: PropTypes.bool,
+ onToggleVisibility: PropTypes.func,
intl: PropTypes.object.isRequired,
blurhash: PropTypes.string,
link: PropTypes.node,
@@ -117,7 +119,7 @@ class Video extends React.PureComponent {
fullscreen: false,
hovered: false,
muted: false,
- revealed: displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all',
+ revealed: this.props.visible !== undefined ? this.props.visible : (displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all'),
};
// hard coded in components.scss
@@ -280,7 +282,16 @@ class Video extends React.PureComponent {
document.removeEventListener('MSFullscreenChange', this.handleFullscreenChange, true);
}
- componentDidUpdate (prevProps) {
+ componentWillReceiveProps (nextProps) {
+ if (!is(nextProps.visible, this.props.visible) && nextProps.visible !== undefined) {
+ this.setState({ revealed: nextProps.visible });
+ }
+ }
+
+ componentDidUpdate (prevProps, prevState) {
+ if (prevState.revealed && !this.state.revealed && this.video) {
+ this.video.pause();
+ }
if (prevProps.blurhash !== this.props.blurhash && this.props.blurhash) {
this._decode();
}
@@ -316,11 +327,11 @@ class Video extends React.PureComponent {
}
toggleReveal = () => {
- if (this.state.revealed) {
- this.video.pause();
+ if (this.props.onToggleVisibility) {
+ this.props.onToggleVisibility();
+ } else {
+ this.setState({ revealed: !this.state.revealed });
}
-
- this.setState({ revealed: !this.state.revealed });
}
handleLoadedData = () => {
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 74bcfee58..125508c23 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -19,5 +19,6 @@ export const version = getMeta('version');
export const mascot = getMeta('mascot');
export const profile_directory = getMeta('profile_directory');
export const isStaff = getMeta('is_staff');
+export const forceSingleColumn = !getMeta('advanced_layout');
export default initialState;
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index e815d54d5..d05c61f98 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -1,8 +1,8 @@
{
- "account.add_or_remove_from_list": "أضيف/ي أو أحذف/ي من القائمة",
+ "account.add_or_remove_from_list": "أضفه أو أزله من القائمة",
"account.badges.bot": "روبوت",
"account.block": "حظر @{name}",
- "account.block_domain": "إخفاء كل شيئ قادم من إسم النطاق {domain}",
+ "account.block_domain": "إخفاء كل شيئ قادم من اسم النطاق {domain}",
"account.blocked": "محظور",
"account.direct": "رسالة خاصة إلى @{name}",
"account.domain_blocked": "النطاق مخفي",
@@ -19,7 +19,7 @@
"account.locked_info": "تم تأمين خصوصية هذا الحساب عبر قفل. صاحب الحساب يُراجِع يدويا طلبات المتابَعة و الاشتراك بحسابه.",
"account.media": "وسائط",
"account.mention": "أُذكُر/ي @{name}",
- "account.moved_to": "{name} إنتقل إلى :",
+ "account.moved_to": "{name} انتقل إلى:",
"account.mute": "كتم @{name}",
"account.mute_notifications": "كتم الإخطارات من @{name}",
"account.muted": "مكتوم",
@@ -36,7 +36,7 @@
"account.unmute": "إلغاء الكتم عن @{name}",
"account.unmute_notifications": "إلغاء كتم إخطارات @{name}",
"alert.unexpected.message": "لقد طرأ هناك خطأ غير متوقّع.",
- "alert.unexpected.title": "المعذرة !",
+ "alert.unexpected.title": "المعذرة!",
"boost_modal.combo": "يمكنك/ي ضغط {combo} لتخطّي هذه في المرّة القادمة",
"bundle_column_error.body": "لقد وقع هناك خطأ أثناء عملية تحميل هذا العنصر.",
"bundle_column_error.retry": "إعادة المحاولة",
@@ -45,7 +45,7 @@
"bundle_modal_error.message": "لقد وقع هناك خطأ أثناء عملية تحميل هذا العنصر.",
"bundle_modal_error.retry": "إعادة المحاولة",
"column.blocks": "الحسابات المحجوبة",
- "column.community": "التَسَلْسُل الزَمني المحلي",
+ "column.community": "الخيط العام المحلي",
"column.direct": "الرسائل المباشرة",
"column.domain_blocks": "النطاقات المخفية",
"column.favourites": "المفضلة",
@@ -66,7 +66,7 @@
"column_subheading.settings": "الإعدادات",
"community.column_settings.media_only": "الوسائط فقط",
"compose_form.direct_message_warning": "لن يَظهر هذا التبويق إلا للمستخدمين المذكورين.",
- "compose_form.direct_message_warning_learn_more": "إقرأ المزيد",
+ "compose_form.direct_message_warning_learn_more": "اقرأ المزيد",
"compose_form.hashtag_warning": "هذا التبويق لن يُدرَج تحت أي وسم كان بما أنه غير مُدرَج. لا يُسمح بالبحث إلّا عن التبويقات العمومية عن طريق الوسوم.",
"compose_form.lock_disclaimer": "حسابك ليس {locked}. يمكن لأي شخص متابعتك و عرض المنشورات.",
"compose_form.lock_disclaimer.lock": "مقفل",
@@ -77,21 +77,22 @@
"compose_form.poll.remove_option": "إزالة هذا الخيار",
"compose_form.publish": "بوّق",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "تحديد الوسائط كحساسة",
"compose_form.sensitive.marked": "لقد تم تحديد هذه الصورة كحساسة",
"compose_form.sensitive.unmarked": "لم يتم تحديد الصورة كحساسة",
"compose_form.spoiler.marked": "إنّ النص مخفي وراء تحذير",
"compose_form.spoiler.unmarked": "النص غير مخفي",
"compose_form.spoiler_placeholder": "تنبيه عن المحتوى",
"confirmation_modal.cancel": "إلغاء",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "احجبه وابلغ عنه",
"confirmations.block.confirm": "حجب",
"confirmations.block.message": "هل أنت متأكد أنك تريد حجب {name} ؟",
"confirmations.delete.confirm": "حذف",
"confirmations.delete.message": "هل أنت متأكد أنك تريد حذف هذا المنشور ؟",
- "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.confirm": "احذف",
"confirmations.delete_list.message": "هل تود حقا حذف هذه القائمة ؟",
- "confirmations.domain_block.confirm": "إخفاء إسم النطاق كاملا",
- "confirmations.domain_block.message": "متأكد من أنك تود حظر إسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
+ "confirmations.domain_block.confirm": "إخفاء اسم النطاق كاملا",
+ "confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
"confirmations.mute.confirm": "أكتم",
"confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
"confirmations.redraft.confirm": "إزالة و إعادة الصياغة",
@@ -101,17 +102,17 @@
"confirmations.unfollow.confirm": "إلغاء المتابعة",
"confirmations.unfollow.message": "متأكد من أنك تريد إلغاء متابعة {name} ؟",
"embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
- "embed.preview": "هكذا ما سوف يبدو عليه :",
+ "embed.preview": "هكذا ما سوف يبدو عليه:",
"emoji_button.activity": "الأنشطة",
"emoji_button.custom": "مخصص",
"emoji_button.flags": "الأعلام",
"emoji_button.food": "الطعام والشراب",
"emoji_button.label": "أدرج إيموجي",
"emoji_button.nature": "الطبيعة",
- "emoji_button.not_found": "لا إيموجو !! (╯°□°)╯︵ ┻━┻",
+ "emoji_button.not_found": "لا إيموجو!! (╯°□°)╯︵ ┻━┻",
"emoji_button.objects": "أشياء",
"emoji_button.people": "الناس",
- "emoji_button.recent": "الشائعة الإستخدام",
+ "emoji_button.recent": "الشائعة الاستخدام",
"emoji_button.search": "ابحث...",
"emoji_button.search_results": "نتائج البحث",
"emoji_button.symbols": "رموز",
@@ -119,7 +120,7 @@
"empty_column.account_timeline": "ليس هناك تبويقات!",
"empty_column.account_unavailable": "الملف الشخصي غير متوفر",
"empty_column.blocks": "لم تقم بحظر أي مستخدِم بعد.",
- "empty_column.community": "الخط الزمني المحلي فارغ. أكتب شيئا ما للعامة كبداية !",
+ "empty_column.community": "الخط العام المحلي فارغ. أكتب شيئا ما للعامة كبداية!",
"empty_column.direct": "لم تتلق أية رسالة خاصة مباشِرة بعد. سوف يتم عرض الرسائل المباشرة هنا إن قمت بإرسال واحدة أو تلقيت البعض منها.",
"empty_column.domain_blocks": "ليس هناك نطاقات مخفية بعد.",
"empty_column.favourited_statuses": "ليس لديك أية تبويقات مفضلة بعد. عندما ستقوم بالإعجاب بواحد، سيظهر هنا.",
@@ -132,13 +133,13 @@
"empty_column.lists": "ليس عندك أية قائمة بعد. سوف تظهر قائمتك هنا إن قمت بإنشاء واحدة.",
"empty_column.mutes": "لم تقم بكتم أي مستخدم بعد.",
"empty_column.notifications": "لم تتلق أي إشعار بعدُ. تفاعل مع المستخدمين الآخرين لإنشاء محادثة.",
- "empty_column.public": "لا يوجد أي شيء هنا ! قم بنشر شيء ما للعامة، أو إتبع المستخدمين الآخرين المتواجدين على الخوادم الأخرى لملء خيط المحادثات",
+ "empty_column.public": "لا يوجد أي شيء هنا! قم بنشر شيء ما للعامة، أو اتبع المستخدمين الآخرين المتواجدين على الخوادم الأخرى لملء خيط المحادثات",
"follow_request.authorize": "ترخيص",
"follow_request.reject": "رفض",
"getting_started.developers": "المُطوِّرون",
"getting_started.directory": "دليل المستخدِمين والمستخدِمات",
"getting_started.documentation": "الدليل",
- "getting_started.heading": "إستعدّ للبدء",
+ "getting_started.heading": "استعدّ للبدء",
"getting_started.invite": "دعوة أشخاص",
"getting_started.open_source_notice": "ماستدون برنامج مفتوح المصدر. يمكنك المساهمة، أو الإبلاغ عن تقارير الأخطاء، على جيت هب {github}.",
"getting_started.security": "الأمان",
@@ -155,16 +156,16 @@
"home.column_settings.basic": "أساسية",
"home.column_settings.show_reblogs": "عرض الترقيات",
"home.column_settings.show_replies": "عرض الردود",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+ "intervals.full.days": "{number, plural, one {# يوم} other {# أيام}}",
+ "intervals.full.hours": "{number, plural, one {# ساعة} other {# ساعات}}",
+ "intervals.full.minutes": "{number, plural, one {# دقيقة} other {# دقائق}}",
"introduction.federation.action": "التالي",
- "introduction.federation.federated.headline": "Federated",
+ "introduction.federation.federated.headline": "الفديرالي",
"introduction.federation.federated.text": "كافة المنشورات التي نُشِرت إلى العامة على الخوادم الأخرى للفديفرس سوف يتم عرضها على الخيط المُوحَّد.",
- "introduction.federation.home.headline": "Home",
+ "introduction.federation.home.headline": "الرئيسي",
"introduction.federation.home.text": "سوف تُعرَض منشورات الأشخاص الذين تُتابِعهم على الخيط الرئيسي. بإمكانك متابعة أي حساب أيا كان الخادم الذي هو عليه!",
- "introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "المنشورات المُوجّهة للعامة على نفس الخادم الذي أنتم عليه ستظهر على الخيط الزمني المحلي.",
+ "introduction.federation.local.headline": "الخيط العام المحلي",
+ "introduction.federation.local.text": "المنشورات المُوجّهة للعامة على نفس الخادم الذي أنتم عليه ستظهر على الخيط العام المحلي.",
"introduction.interactions.action": "إنهاء العرض التوضيحي!",
"introduction.interactions.favourite.headline": "الإضافة إلى المفضلة",
"introduction.interactions.favourite.text": "يمكِنك إضافة أي تبويق إلى المفضلة و إعلام صاحبه أنك أعجِبت بذاك التبويق.",
@@ -174,24 +175,24 @@
"introduction.interactions.reply.text": "يمكنكم الرد على تبويقاتكم و تبويقات الآخرين على شكل سلسلة محادثة.",
"introduction.welcome.action": "هيا بنا!",
"introduction.welcome.headline": "الخطوات الأولى",
- "introduction.welcome.text": "مرحبا بكم على الفيديفيرس! بعد لحظات قليلة ، سيكون بمقدوركم بث رسائل والتحدث إلى أصدقائكم عبر تشكيلة واسعة من الخوادم المختلفة. هذا الخادم ، {domain} ، يستضيف ملفكم الشخصي ، لذا يجب تذكر اسمه جيدا.",
+ "introduction.welcome.text": "مرحبا بكم على الفديفرس! بعد لحظات قليلة ، سيكون بمقدوركم بث رسائل والتحدث إلى أصدقائكم عبر تشكيلة واسعة من الخوادم المختلفة. هذا الخادم ، {domain} ، يستضيف ملفكم الشخصي ، لذا يجب تذكر اسمه جيدا.",
"keyboard_shortcuts.back": "للعودة",
"keyboard_shortcuts.blocked": "لفتح قائمة المستخدمين المحظورين",
"keyboard_shortcuts.boost": "للترقية",
"keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
"keyboard_shortcuts.compose": "للتركيز على نافذة تحرير النصوص",
- "keyboard_shortcuts.description": "Description",
+ "keyboard_shortcuts.description": "الوصف",
"keyboard_shortcuts.direct": "لفتح عمود الرسائل المباشرة",
- "keyboard_shortcuts.down": "للإنتقال إلى أسفل القائمة",
- "keyboard_shortcuts.enter": "to open status",
+ "keyboard_shortcuts.down": "للانتقال إلى أسفل القائمة",
+ "keyboard_shortcuts.enter": "لفتح المنشور",
"keyboard_shortcuts.favourite": "للإضافة إلى المفضلة",
"keyboard_shortcuts.favourites": "لفتح قائمة المفضلات",
"keyboard_shortcuts.federated": "لفتح الخيط الزمني الفديرالي",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
"keyboard_shortcuts.home": "لفتح الخيط الرئيسي",
- "keyboard_shortcuts.hotkey": "مفتاح الإختصار",
+ "keyboard_shortcuts.hotkey": "مفتاح الاختصار",
"keyboard_shortcuts.legend": "لعرض هذا المفتاح",
- "keyboard_shortcuts.local": "لفتح الخيط الزمني المحلي",
+ "keyboard_shortcuts.local": "لفتح الخيط العام المحلي",
"keyboard_shortcuts.mention": "لذِكر الناشر",
"keyboard_shortcuts.muted": "لفتح قائمة المستخدِمين المكتومين",
"keyboard_shortcuts.my_profile": "لفتح ملفك الشخصي",
@@ -203,22 +204,24 @@
"keyboard_shortcuts.search": "للتركيز على البحث",
"keyboard_shortcuts.start": "لفتح عمود \"هيا نبدأ\"",
"keyboard_shortcuts.toggle_hidden": "لعرض أو إخفاء النص مِن وراء التحذير",
+ "keyboard_shortcuts.toggle_sensitivity": "لعرض/إخفاء الوسائط",
"keyboard_shortcuts.toot": "لتحرير تبويق جديد",
"keyboard_shortcuts.unfocus": "لإلغاء التركيز على حقل النص أو نافذة البحث",
- "keyboard_shortcuts.up": "للإنتقال إلى أعلى القائمة",
+ "keyboard_shortcuts.up": "للانتقال إلى أعلى القائمة",
"lightbox.close": "إغلاق",
"lightbox.next": "التالي",
"lightbox.previous": "العودة",
+ "lightbox.view_context": "اعرض السياق",
"lists.account.add": "أضف إلى القائمة",
- "lists.account.remove": "إحذف من القائمة",
- "lists.delete": "Delete list",
+ "lists.account.remove": "احذف من القائمة",
+ "lists.delete": "احذف القائمة",
"lists.edit": "تعديل القائمة",
"lists.edit.submit": "تعديل العنوان",
"lists.new.create": "إنشاء قائمة",
"lists.new.title_placeholder": "عنوان القائمة الجديدة",
"lists.search": "إبحث في قائمة الحسابات التي تُتابِعها",
"lists.subheading": "قوائمك",
- "loading_indicator.label": "تحميل ...",
+ "loading_indicator.label": "تحميل...",
"media_gallery.toggle_visible": "عرض / إخفاء",
"missing_indicator.label": "تعذر العثور عليه",
"missing_indicator.sublabel": "تعذر العثور على هذا المورد",
@@ -228,20 +231,22 @@
"navigation_bar.community_timeline": "الخيط العام المحلي",
"navigation_bar.compose": "تحرير تبويق جديد",
"navigation_bar.direct": "الرسائل المباشِرة",
- "navigation_bar.discover": "إكتشف",
+ "navigation_bar.discover": "اكتشف",
"navigation_bar.domain_blocks": "النطاقات المخفية",
"navigation_bar.edit_profile": "تعديل الملف الشخصي",
"navigation_bar.favourites": "المفضلة",
"navigation_bar.filters": "الكلمات المكتومة",
"navigation_bar.follow_requests": "طلبات المتابعة",
+ "navigation_bar.follows_and_followers": "المتابِعين والمتابَعون",
"navigation_bar.info": "عن هذا الخادم",
- "navigation_bar.keyboard_shortcuts": "إختصارات لوحة المفاتيح",
+ "navigation_bar.keyboard_shortcuts": "اختصارات لوحة المفاتيح",
"navigation_bar.lists": "القوائم",
"navigation_bar.logout": "خروج",
"navigation_bar.mutes": "الحسابات المكتومة",
- "navigation_bar.personal": "Personal",
+ "navigation_bar.personal": "شخصي",
"navigation_bar.pins": "التبويقات المثبتة",
"navigation_bar.preferences": "التفضيلات",
+ "navigation_bar.profile_directory": "دليل المستخدِمين",
"navigation_bar.public_timeline": "الخيط العام الموحد",
"navigation_bar.security": "الأمان",
"notification.favourite": "أُعجِب {name} بمنشورك",
@@ -249,19 +254,19 @@
"notification.mention": "{name} ذكرك",
"notification.poll": "A poll you have voted in has ended",
"notification.reblog": "{name} قام بترقية تبويقك",
- "notifications.clear": "إمسح الإخطارات",
+ "notifications.clear": "امسح الإخطارات",
"notifications.clear_confirmation": "أمتأكد من أنك تود مسح جل الإخطارات الخاصة بك و المتلقاة إلى حد الآن ؟",
"notifications.column_settings.alert": "إشعارات سطح المكتب",
- "notifications.column_settings.favourite": "المُفَضَّلة :",
+ "notifications.column_settings.favourite": "المُفَضَّلة:",
"notifications.column_settings.filter_bar.advanced": "عرض كافة الفئات",
"notifications.column_settings.filter_bar.category": "شريط الفلترة السريعة",
"notifications.column_settings.filter_bar.show": "عرض",
- "notifications.column_settings.follow": "متابعُون جُدُد :",
- "notifications.column_settings.mention": "الإشارات :",
+ "notifications.column_settings.follow": "متابعُون جُدُد:",
+ "notifications.column_settings.mention": "الإشارات:",
"notifications.column_settings.poll": "نتائج استطلاع الرأي:",
"notifications.column_settings.push": "الإخطارات المدفوعة",
"notifications.column_settings.reblog": "الترقيّات:",
- "notifications.column_settings.show": "إعرِضها في عمود",
+ "notifications.column_settings.show": "اعرِضها في عمود",
"notifications.column_settings.sound": "أصدر صوتا",
"notifications.filter.all": "الكل",
"notifications.filter.boosts": "الترقيات",
@@ -272,11 +277,11 @@
"notifications.group": "{count} إشعارات",
"poll.closed": "انتهى",
"poll.refresh": "تحديث",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+ "poll.total_votes": "{count, plural, one {# صوت} other {# أصوات}}",
"poll.vote": "صَوّت",
"poll_button.add_poll": "إضافة استطلاع للرأي",
"poll_button.remove_poll": "إزالة استطلاع الرأي",
- "privacy.change": "إضبط خصوصية المنشور",
+ "privacy.change": "اضبط خصوصية المنشور",
"privacy.direct.long": "أنشر إلى المستخدمين المشار إليهم فقط",
"privacy.direct.short": "مباشر",
"privacy.private.long": "أنشر لمتابعيك فقط",
@@ -285,20 +290,20 @@
"privacy.public.short": "للعامة",
"privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
"privacy.unlisted.short": "غير مدرج",
- "regeneration_indicator.label": "جارٍ التحميل …",
- "regeneration_indicator.sublabel": "جارٍ تجهيز تغذية صفحتك الرئيسية !",
- "relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
+ "regeneration_indicator.label": "جارٍ التحميل…",
+ "regeneration_indicator.sublabel": "جارٍ تجهيز تغذية صفحتك الرئيسية!",
+ "relative_time.days": "{number}ي",
+ "relative_time.hours": "{number}سا",
"relative_time.just_now": "الآن",
- "relative_time.minutes": "{number}m",
- "relative_time.seconds": "{number}s",
+ "relative_time.minutes": "{number}د",
+ "relative_time.seconds": "{number}ثا",
"reply_indicator.cancel": "إلغاء",
"report.forward": "التحويل إلى {target}",
- "report.forward_hint": "هذا الحساب ينتمي إلى خادوم آخَر. هل تودّ إرسال نسخة مجهولة مِن التقرير إلى هنالك أيضًا ؟",
+ "report.forward_hint": "هذا الحساب ينتمي إلى خادوم آخَر. هل تودّ إرسال نسخة مجهولة مِن التقرير إلى هنالك أيضًا؟",
"report.hint": "سوف يتم إرسال التقرير إلى المُشرِفين على خادومكم. بإمكانكم الإدلاء بشرح عن سبب الإبلاغ عن الحساب أسفله:",
"report.placeholder": "تعليقات إضافية",
"report.submit": "إرسال",
- "report.target": "إبلاغ",
+ "report.target": "ابلغ عن {target}",
"search.placeholder": "ابحث",
"search_popout.search_format": "نمط البحث المتقدم",
"search_popout.tips.full_text": "النص البسيط يقوم بعرض المنشورات التي كتبتها أو قمت بإرسالها أو ترقيتها أو تمت الإشارة إليك فيها من طرف آخرين ، بالإضافة إلى مطابقة أسماء المستخدمين وأسماء العرض وعلامات التصنيف.",
@@ -312,11 +317,11 @@
"search_results.total": "{count, number} {count, plural, one {result} و {results}}",
"status.admin_account": "افتح الواجهة الإدارية لـ @{name}",
"status.admin_status": "افتح هذا المنشور على واجهة الإشراف",
- "status.block": "Block @{name}",
+ "status.block": "احجب @{name}",
"status.cancel_reblog_private": "إلغاء الترقية",
"status.cannot_reblog": "تعذرت ترقية هذا المنشور",
"status.copy": "نسخ رابط المنشور",
- "status.delete": "إحذف",
+ "status.delete": "احذف",
"status.detailed_status": "تفاصيل المحادثة",
"status.direct": "رسالة خاصة إلى @{name}",
"status.embed": "إدماج",
@@ -339,33 +344,32 @@
"status.redraft": "إزالة و إعادة الصياغة",
"status.reply": "ردّ",
"status.replyAll": "رُد على الخيط",
- "status.report": "إبلِغ عن @{name}",
- "status.sensitive_toggle": "اضغط للعرض",
+ "status.report": "ابلِغ عن @{name}",
"status.sensitive_warning": "محتوى حساس",
"status.share": "مشاركة",
- "status.show_less": "إعرض أقلّ",
+ "status.show_less": "اعرض أقلّ",
"status.show_less_all": "طي الكل",
"status.show_more": "أظهر المزيد",
"status.show_more_all": "توسيع الكل",
"status.show_thread": "الكشف عن المحادثة",
"status.unmute_conversation": "فك الكتم عن المحادثة",
"status.unpin": "فك التدبيس من الملف الشخصي",
- "suggestions.dismiss": "إلغاء الإقتراح",
+ "suggestions.dismiss": "إلغاء الاقتراح",
"suggestions.header": "يمكن أن يهمك…",
"tabs_bar.federated_timeline": "الموحَّد",
"tabs_bar.home": "الرئيسية",
- "tabs_bar.local_timeline": "المحلي",
+ "tabs_bar.local_timeline": "الخيط العام المحلي",
"tabs_bar.notifications": "الإخطارات",
"tabs_bar.search": "البحث",
- "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+ "time_remaining.days": "{number, plural, one {# يوم} other {# أيام}} متبقية",
"time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
"time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
+ "time_remaining.moments": "لحظات متبقية",
"time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} آخرون {people}} يتحدثون",
"ui.beforeunload": "سوف تفقد مسودتك إن تركت ماستدون.",
- "upload_area.title": "إسحب ثم أفلت للرفع",
- "upload_button.label": "إضافة وسائط (JPEG، PNG، GIF، WebM، MP4، MOV)",
+ "upload_area.title": "اسحب ثم أفلت للرفع",
+ "upload_button.label": "إضافة وسائط ({formats})",
"upload_error.limit": "لقد تم بلوغ الحد الأقصى المسموح به لإرسال الملفات.",
"upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
"upload_form.description": "وصف للمعاقين بصريا",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index a983f63a4..b911848ee 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "El testu nun va anubrise darrera d'una alvertencia",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "p'abrir la columna «entamar»",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "p'apenzar un toot nuevu",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "pa xubir na llista",
"lightbox.close": "Close",
"lightbox.next": "Siguiente",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Amestar a la llista",
"lists.account.remove": "Desaniciar de la llista",
"lists.delete": "Desaniciar la llista",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Pallabres silenciaes",
"navigation_bar.follow_requests": "Solicitúes de siguimientu",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Tocante a esta instancia",
"navigation_bar.keyboard_shortcuts": "Atayos",
"navigation_bar.lists": "Llistes",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Toots fixaos",
"navigation_bar.preferences": "Preferencies",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Llinia temporal federada",
"navigation_bar.security": "Seguranza",
"notification.favourite": "{name} favourited your status",
@@ -340,7 +345,6 @@
"status.reply": "Responder",
"status.replyAll": "Reply to thread",
"status.report": "Report @{name}",
- "status.sensitive_toggle": "Fai clic pa velu",
"status.sensitive_warning": "Conteníu sensible",
"status.share": "Share",
"status.show_less": "Amosar menos",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 36a08b264..783f9eb68 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Раздумай",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
"lightbox.close": "Затвори",
"lightbox.next": "Next",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favourites",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Extended information",
"navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Pinned toots",
"navigation_bar.preferences": "Предпочитания",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Публичен канал",
"navigation_bar.security": "Security",
"notification.favourite": "{name} хареса твоята публикация",
@@ -340,7 +345,6 @@
"status.reply": "Отговор",
"status.replyAll": "Reply to thread",
"status.report": "Report @{name}",
- "status.sensitive_toggle": "Покажи",
"status.sensitive_warning": "Деликатно съдържание",
"status.share": "Share",
"status.show_less": "Show less",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 338e49f81..5b7162ec1 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -1,384 +1,388 @@
{
- "account.add_or_remove_from_list": "লিস্টে আরো যুক্ত বা মুছে ফেলুন",
+ "account.add_or_remove_from_list": "তালিকাতে আরো যুক্ত বা মুছে ফেলুন",
"account.badges.bot": "রোবট",
- "account.block": "@{name} কে বন্ধ করুন",
+ "account.block": "@{name} বন্ধ করুন",
"account.block_domain": "{domain} থেকে সব সরিয়ে ফেলুন",
"account.blocked": "বন্ধ করা হয়েছে",
- "account.direct": "@{name}কে সরকারি পাঠান",
- "account.domain_blocked": "বেবিসিটটি সরানো আছে",
- "account.edit_profile": "Edit profile",
- "account.endorse": "Feature on profile",
- "account.follow": "Follow",
- "account.followers": "Followers",
- "account.followers.empty": "No one follows this user yet.",
- "account.follows": "Follows",
- "account.follows.empty": "This user doesn't follow anyone yet.",
- "account.follows_you": "Follows you",
- "account.hide_reblogs": "Hide boosts from @{name}",
- "account.link_verified_on": "Ownership of this link was checked on {date}",
- "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
- "account.media": "Media",
- "account.mention": "Mention @{name}",
- "account.moved_to": "{name} has moved to:",
- "account.mute": "Mute @{name}",
- "account.mute_notifications": "Mute notifications from @{name}",
- "account.muted": "Muted",
- "account.posts": "Toots",
- "account.posts_with_replies": "Toots and replies",
- "account.report": "Report @{name}",
- "account.requested": "Awaiting approval. Click to cancel follow request",
- "account.share": "Share @{name}'s profile",
- "account.show_reblogs": "Show boosts from @{name}",
- "account.unblock": "Unblock @{name}",
- "account.unblock_domain": "Unhide {domain}",
- "account.unendorse": "Don't feature on profile",
- "account.unfollow": "Unfollow",
- "account.unmute": "Unmute @{name}",
- "account.unmute_notifications": "Unmute notifications from @{name}",
- "alert.unexpected.message": "An unexpected error occurred.",
- "alert.unexpected.title": "Oops!",
- "boost_modal.combo": "You can press {combo} to skip this next time",
- "bundle_column_error.body": "Something went wrong while loading this component.",
- "bundle_column_error.retry": "Try again",
- "bundle_column_error.title": "Network error",
- "bundle_modal_error.close": "Close",
- "bundle_modal_error.message": "Something went wrong while loading this component.",
- "bundle_modal_error.retry": "Try again",
- "column.blocks": "Blocked users",
- "column.community": "Local timeline",
- "column.direct": "Direct messages",
- "column.domain_blocks": "Hidden domains",
- "column.favourites": "Favourites",
- "column.follow_requests": "Follow requests",
- "column.home": "Home",
- "column.lists": "Lists",
- "column.mutes": "Muted users",
- "column.notifications": "Notifications",
- "column.pins": "Pinned toot",
- "column.public": "Federated timeline",
- "column_back_button.label": "Back",
- "column_header.hide_settings": "Hide settings",
- "column_header.moveLeft_settings": "Move column to the left",
- "column_header.moveRight_settings": "Move column to the right",
- "column_header.pin": "Pin",
- "column_header.show_settings": "Show settings",
- "column_header.unpin": "Unpin",
- "column_subheading.settings": "Settings",
- "community.column_settings.media_only": "Media Only",
- "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
- "compose_form.direct_message_warning_learn_more": "Learn more",
- "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
- "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
- "compose_form.lock_disclaimer.lock": "locked",
- "compose_form.placeholder": "What is on your mind?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
- "compose_form.publish": "Toot",
+ "account.direct": "@{name}কে সরকারি লিখুন",
+ "account.domain_blocked": "ওয়েবসাইট সরিয়ে ফেলা হয়েছে",
+ "account.edit_profile": "নিজের পাতা সম্পাদনা করুন",
+ "account.endorse": "নিজের পাতায় দেখান",
+ "account.follow": "অনুসরণ করুন",
+ "account.followers": "অনুসরণকারক",
+ "account.followers.empty": "এই ব্যবহারকারীকে কেও এখনো অনুসরণ করে না।",
+ "account.follows": "যাদেরকে অনুসরণ করেন",
+ "account.follows.empty": "এই ব্যবহারকারী কাওকে এখনো অনুসরণ করেন না।",
+ "account.follows_you": "আপনাকে অনুসরণ করে",
+ "account.hide_reblogs": "@{name}র সমর্থনগুলি সরিয়ে ফেলুন",
+ "account.link_verified_on": "এই লিংকের মালিকানা চেক করা হয়েছে {date} তারিকে",
+ "account.locked_info": "এই নিবন্ধনের গোপনীয়তার ক্ষেত্র তালা দেওয়া আছে। নিবন্ধনকারী অনুসরণ করার অনুমতি যাদেরকে দেবেন, শুধু তারাই অনুসরণ করতে পারবেন।",
+ "account.media": "ছবি বা ভিডিও",
+ "account.mention": "@{name} কে উল্লেখ করুন",
+ "account.moved_to": "{name} চলে গেছে এখানে:",
+ "account.mute": "@{name}র কার্যক্রম সরিয়ে ফেলুন",
+ "account.mute_notifications": "@{name}র প্রজ্ঞাপন আপনার কাছ থেকে সরিয়ে ফেলুন",
+ "account.muted": "সরানো আছে",
+ "account.posts": "টুট",
+ "account.posts_with_replies": "টুট এবং মতামত",
+ "account.report": "@{name}কে রিপোর্ট করে দিন",
+ "account.requested": "অনুমতির অপেক্ষায় আছে। অনুসরণ করার অনুরোধ বাতিল করতে এখানে ক্লিক করুন",
+ "account.share": "@{name}র পাতা অন্যদের দেখান",
+ "account.show_reblogs": "@{name}র সমর্থনগুলো দেখুন",
+ "account.unblock": "@{name}র কার্যকলাপ আবার দেখুন",
+ "account.unblock_domain": "{domain}থেকে আবার দেখুন",
+ "account.unendorse": "নিজের পাতায় এটা দেখতে চান না",
+ "account.unfollow": "অনুসরণ বন্ধ করুন",
+ "account.unmute": "@{name}র কার্যকলাপ আবার দেখুন",
+ "account.unmute_notifications": "@{name}র প্রজ্ঞাপন দেওয়ার অনুমতি দিন",
+ "alert.unexpected.message": "অপ্রত্যাশিত একটি সমস্যা হয়েছে।",
+ "alert.unexpected.title": "ওহো!",
+ "boost_modal.combo": "পরেরবার আপনি {combo} চাপ দিলে এটার শেষে চলে যেতে পারবেন",
+ "bundle_column_error.body": "এই অংশটি দেখতে যেয়ে কোনো সমস্যা হয়েছে।",
+ "bundle_column_error.retry": "আবার চেষ্টা করুন",
+ "bundle_column_error.title": "নেটওয়ার্কের সমস্যা হচ্ছে",
+ "bundle_modal_error.close": "বন্ধ করুন",
+ "bundle_modal_error.message": "এই অংশটি দেখতে যেয়ে কোনো সমস্যা হয়েছে।",
+ "bundle_modal_error.retry": "আবার চেষ্টা করুন",
+ "column.blocks": "যাদের বন্ধ করে রাখা হয়েছে",
+ "column.community": "স্থানীয় সময়সারি",
+ "column.direct": "সরাসরি লেখা",
+ "column.domain_blocks": "সরিয়ে ফেলা ওয়েবসাইট",
+ "column.favourites": "পছন্দের গুলো",
+ "column.follow_requests": "অনুসরণের অনুমতি চেয়েছে যারা",
+ "column.home": "বাড়ি",
+ "column.lists": "তালিকাগুলো",
+ "column.mutes": "যাদের কার্যক্রম দেখা বন্ধ আছে",
+ "column.notifications": "প্রজ্ঞাপনগুলো",
+ "column.pins": "পিন করা টুট",
+ "column.public": "যুক্ত সময়রেখা",
+ "column_back_button.label": "পেছনে",
+ "column_header.hide_settings": "সেটিংগুলো সরান",
+ "column_header.moveLeft_settings": "কলমটা বামে সরান",
+ "column_header.moveRight_settings": "কলমটা ডানে সরান",
+ "column_header.pin": "পিন দিয়ে রাখুন",
+ "column_header.show_settings": "সেটিং দেখান",
+ "column_header.unpin": "পিন খুলুন",
+ "column_subheading.settings": "সেটিং",
+ "community.column_settings.media_only": "শুধুমাত্র ছবি বা ভিডিও",
+ "compose_form.direct_message_warning": "শুধুমাত্র যাদেরকে উল্লেখ করা হয়েছে তাদেরকেই এই টুটটি পাঠানো হবে ।",
+ "compose_form.direct_message_warning_learn_more": "আরো জানুন",
+ "compose_form.hashtag_warning": "কোনো হ্যাশট্যাগের ভেতরে এই টুটটি থাকবেনা কারণ এটি তালিকাবহির্ভূত। শুধুমাত্র প্রকাশ্য ঠোটগুলো হ্যাশট্যাগের ভেতরে খুঁজে পাওয়া যাবে।",
+ "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
+ "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
+ "compose_form.placeholder": "আপনি কি ভাবছেন ?",
+ "compose_form.poll.add_option": "আরেকটি বিকল্প যোগ করুন",
+ "compose_form.poll.duration": "ভোটগ্রহনের সময়",
+ "compose_form.poll.option_placeholder": "বিকল্প {number}",
+ "compose_form.poll.remove_option": "এই বিকল্পটি মুছে ফেলুন",
+ "compose_form.publish": "টুট",
"compose_form.publish_loud": "{publish}!",
- "compose_form.sensitive.marked": "Media is marked as sensitive",
- "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
- "compose_form.spoiler.marked": "Text is hidden behind warning",
- "compose_form.spoiler.unmarked": "Text is not hidden",
- "compose_form.spoiler_placeholder": "Write your warning here",
- "confirmation_modal.cancel": "Cancel",
- "confirmations.block.block_and_report": "Block & Report",
- "confirmations.block.confirm": "Block",
- "confirmations.block.message": "Are you sure you want to block {name}?",
- "confirmations.delete.confirm": "Delete",
- "confirmations.delete.message": "Are you sure you want to delete this status?",
- "confirmations.delete_list.confirm": "Delete",
- "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
- "confirmations.domain_block.confirm": "Hide entire domain",
- "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
- "confirmations.mute.confirm": "Mute",
- "confirmations.mute.message": "Are you sure you want to mute {name}?",
- "confirmations.redraft.confirm": "Delete & redraft",
- "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
- "confirmations.reply.confirm": "Reply",
- "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
- "confirmations.unfollow.confirm": "Unfollow",
- "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
- "embed.instructions": "Embed this status on your website by copying the code below.",
- "embed.preview": "Here is what it will look like:",
- "emoji_button.activity": "Activity",
- "emoji_button.custom": "Custom",
- "emoji_button.flags": "Flags",
- "emoji_button.food": "Food & Drink",
- "emoji_button.label": "Insert emoji",
- "emoji_button.nature": "Nature",
- "emoji_button.not_found": "No emojos!! (╯°□°)╯︵ ┻━┻",
- "emoji_button.objects": "Objects",
- "emoji_button.people": "People",
- "emoji_button.recent": "Frequently used",
- "emoji_button.search": "Search...",
- "emoji_button.search_results": "Search results",
- "emoji_button.symbols": "Symbols",
- "emoji_button.travel": "Travel & Places",
- "empty_column.account_timeline": "No toots here!",
- "empty_column.account_unavailable": "Profile unavailable",
- "empty_column.blocks": "You haven't blocked any users yet.",
- "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
- "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
- "empty_column.domain_blocks": "There are no hidden domains yet.",
- "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
- "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
- "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
- "empty_column.hashtag": "There is nothing in this hashtag yet.",
- "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
- "empty_column.home.public_timeline": "the public timeline",
- "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
- "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
- "empty_column.mutes": "You haven't muted any users yet.",
- "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
- "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
- "follow_request.authorize": "Authorize",
- "follow_request.reject": "Reject",
- "getting_started.developers": "Developers",
- "getting_started.directory": "Profile directory",
- "getting_started.documentation": "Documentation",
- "getting_started.heading": "Getting started",
- "getting_started.invite": "Invite people",
- "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
- "getting_started.security": "Security",
- "getting_started.terms": "Terms of service",
- "hashtag.column_header.tag_mode.all": "and {additional}",
- "hashtag.column_header.tag_mode.any": "or {additional}",
- "hashtag.column_header.tag_mode.none": "without {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
- "hashtag.column_settings.tag_mode.all": "All of these",
- "hashtag.column_settings.tag_mode.any": "Any of these",
- "hashtag.column_settings.tag_mode.none": "None of these",
- "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
- "home.column_settings.basic": "Basic",
- "home.column_settings.show_reblogs": "Show boosts",
- "home.column_settings.show_replies": "Show replies",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
+ "compose_form.sensitive.marked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়েছে",
+ "compose_form.sensitive.unmarked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়নি",
+ "compose_form.spoiler.marked": "লেখাটি সাবধানতার পেছনে লুকানো আছে",
+ "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
+ "compose_form.spoiler_placeholder": "আপনার সাবধানতা এখানে লিখুন",
+ "confirmation_modal.cancel": "বাতিল করুন",
+ "confirmations.block.block_and_report": "বন্ধ করুন এবং রিপোর্ট করুন",
+ "confirmations.block.confirm": "বন্ধ করুন",
+ "confirmations.block.message": "আপনি কি নিশ্চিত {name} কে বন্ধ করতে চান ?",
+ "confirmations.delete.confirm": "মুছে ফেলুন",
+ "confirmations.delete.message": "আপনি কি নিশ্চিত যে এই লেখাটি মুছে ফেলতে চান ?",
+ "confirmations.delete_list.confirm": "মুছে ফেলুন",
+ "confirmations.delete_list.message": "আপনি কি নিশ্চিত যে আপনি এই তালিকাটি স্থায়িভাবে মুছে ফেলতে চান ?",
+ "confirmations.domain_block.confirm": "এই ওয়েবসাইট থেকে সব সরান",
+ "confirmations.domain_block.message": "আপনি কি সত্যি সত্যি নিশ্চিত যে {domain} ওয়েবসাইট থেকে সব সরাতে চান ? সাধারণত কিছু লক্ষ্যবস্তু বন্ধ এবং সরানোযা যথেষ্ট। নিশ্চিত করলে ওই ওয়েবসাইট থেকে কোনোকিছু কোনখানে দেখবেন না। যারা আপনাকে অনুসরণ করে ওই ওয়েবসাইট থেকে তাদেরকেও মুছে ফেলা হবে।",
+ "confirmations.mute.confirm": "সরিয়ে ফেলুন",
+ "confirmations.mute.message": "আপনি কি নিশ্চিত {name} সরিয়ে ফেলতে চান ?",
+ "confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন",
+ "confirmations.redraft.message": "আপনি কি নিশ্চিত এটি মুছে ফেলে এবং আবার সম্পাদন করতে চান ? এটাতে যা পছন্দিত, সমর্থন বা মতামত আছে সেগুলো নতুন লেখার সাথে যুক্ত থাকবে না।",
+ "confirmations.reply.confirm": "মতামত",
+ "confirmations.reply.message": "এখন মতামত লিখতে গেলে আপনার এখন যেটা লিখছেন সেটা মুছে যাবে। আপনি নি নিশ্চিত এটা করতে চান ?",
+ "confirmations.unfollow.confirm": "অনুসরণ বন্ধ করুন",
+ "confirmations.unfollow.message": "আপনি কি নিশ্চিত {name} কে আর অনুসরণ করতে চান না ?",
+ "embed.instructions": "এই লেখাটি আপনার ওয়েবসাইটে যুক্ত করতে নিচের কোডটি বেবহার করুন।",
+ "embed.preview": "সেটা দেখতে এরকম হবে:",
+ "emoji_button.activity": "কার্যকলাপ",
+ "emoji_button.custom": "প্রথা",
+ "emoji_button.flags": "পতাকা",
+ "emoji_button.food": "খাদ্য ও পানীয়",
+ "emoji_button.label": "এমজি যুক্ত করুন",
+ "emoji_button.nature": "প্রকৃতি",
+ "emoji_button.not_found": "ইমোজি পাওয়া যায়নি !! (╯°□°)╯︵ ┻━┻",
+ "emoji_button.objects": "বস্তূ",
+ "emoji_button.people": "মানুষ",
+ "emoji_button.recent": "ঘন ব্যাবহৃত",
+ "emoji_button.search": "খুজুন...",
+ "emoji_button.search_results": "খোঁজার ফলাফল",
+ "emoji_button.symbols": "প্রতীক",
+ "emoji_button.travel": "ভ্রমণ এবং স্থান",
+ "empty_column.account_timeline": "এখানে কোনো টুট নেই!",
+ "empty_column.account_unavailable": "নিজস্ব পাতা নেই",
+ "empty_column.blocks": "আপনি কোনো ব্যবহারকারীদের বন্ধ করেন নি।",
+ "empty_column.community": "স্থানীয় সময়রেখাতে কিছু নেই। প্রকাশ্যভাবে কিছু লিখে লেখালেখির উদ্বোধন করে ফেলুন!",
+ "empty_column.direct": "আপনার কাছে সরাসরি পাঠানো কোনো লেখা নেই। যদি কেও পাঠায়, সেটা এখানে দেখা যাবে।",
+ "empty_column.domain_blocks": "এখনো কোনো সরানো ওয়েবসাইট নেই।",
+ "empty_column.favourited_statuses": "আপনার পছন্দের কোনো টুট এখনো নেই। আপনি কোনো লেখা পছন্দের হিসেবে চিহ্নিত করলে এখানে পাওয়া যাবে।",
+ "empty_column.favourites": "কেও এখনো এটাকে পছন্দের টুট হিসেবে চিহ্নিত করেনি। যদি করে, তখন তাদের এখানে পাওয়া যাবে।",
+ "empty_column.follow_requests": "আপনার এখনো কোনো অনুসরণের আবেদন পাঠানো নেই। যদি পাঠায়, এখানে পাওয়া যাবে।",
+ "empty_column.hashtag": "এই হেসটাগে এখনো কিছু নেই।",
+ "empty_column.home": "আপনার বাড়ির সময়রেখা এখনো খালি! {public}এ ঘুরে আসুন অথবা অনুসন্ধান বেবহার করে শুরু করতে পারেন এবং অন্য ব্যবহারকারীদের সাথে সাক্ষাৎ করতে পারেন।",
+ "empty_column.home.public_timeline": "প্রকাশ্য সময়রেখা",
+ "empty_column.list": "এই তালিকাতে এখনো কিছু নেই. যখন এই তালিকায় থাকা ব্যবহারকারী নতুন কিছু লিখবে, সেগুলো এখানে পাওয়া যাবে।",
+ "empty_column.lists": "আপনার এখনো কোনো তালিকা তৈরী নেই। যদি বা যখন তৈরী করেন, সেগুলো এখানে পাওয়া যাবে।",
+ "empty_column.mutes": "আপনি এখনো কোনো ব্যবহারকারীকে সরাননি।",
+ "empty_column.notifications": "আপনার এখনো কোনো প্রজ্ঞাপন নেই। কথোপকথন শুরু করতে, অন্যদের সাথে মেলামেশা করতে পারেন।",
+ "empty_column.public": "এখানে এখনো কিছু নেই! প্রকাশ্য ভাবে কিছু লিখুন বা অন্য সার্ভার থেকে কাওকে অনুসরণ করে এই জায়গা ভরে ফেলুন",
+ "follow_request.authorize": "অনুমতি দিন",
+ "follow_request.reject": "প্রত্যাখ্যান করুন",
+ "getting_started.developers": "তৈরিকারকদের জন্য",
+ "getting_started.directory": "নিজস্ব পাতার তালিকা",
+ "getting_started.documentation": "নথিপত্র",
+ "getting_started.heading": "শুরু করা",
+ "getting_started.invite": "অন্যদের আমন্ত্রণ করুন",
+ "getting_started.open_source_notice": "মাস্টাডন একটি মুক্ত সফটওয়্যার। আপনি তৈরিতে সাহায্য করতে পারেন অথবা সমস্যা রিপোর্ট করতে পারেন গিটহাবে {github}।",
+ "getting_started.security": "নিরাপত্তা",
+ "getting_started.terms": "ব্যবহারের নিয়মাবলী",
+ "hashtag.column_header.tag_mode.all": "এবং {additional}",
+ "hashtag.column_header.tag_mode.any": "অথবা {additional}",
+ "hashtag.column_header.tag_mode.none": "বাদ দিয়ে {additional}",
+ "hashtag.column_settings.select.no_options_message": "কোনটা পাওয়া যায় নি",
+ "hashtag.column_settings.select.placeholder": "হ্যাশট্যাগের ভেতরে ঢুকুন…",
+ "hashtag.column_settings.tag_mode.all": "এগুলো সব",
+ "hashtag.column_settings.tag_mode.any": "এর ভেতরে যেকোনোটা",
+ "hashtag.column_settings.tag_mode.none": "এগুলোর একটাও না",
+ "hashtag.column_settings.tag_toggle": "আরো ট্যাগ এই কলামে যুক্ত করুন",
+ "home.column_settings.basic": "সাধারণ",
+ "home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
+ "home.column_settings.show_replies": "মতামত দেখান",
"intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+ "intervals.full.hours": "{number, plural, one {# ঘটা} other {# ঘটা}}",
"intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
- "introduction.federation.action": "Next",
- "introduction.federation.federated.headline": "Federated",
- "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
- "introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
- "introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish toot-orial!",
- "introduction.interactions.favourite.headline": "Favourite",
- "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
- "introduction.interactions.reblog.headline": "Boost",
- "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
- "introduction.interactions.reply.headline": "Reply",
- "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
- "introduction.welcome.action": "Let's go!",
- "introduction.welcome.headline": "First steps",
- "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
- "keyboard_shortcuts.back": "to navigate back",
- "keyboard_shortcuts.blocked": "to open blocked users list",
- "keyboard_shortcuts.boost": "to boost",
- "keyboard_shortcuts.column": "to focus a status in one of the columns",
- "keyboard_shortcuts.compose": "to focus the compose textarea",
- "keyboard_shortcuts.description": "Description",
- "keyboard_shortcuts.direct": "to open direct messages column",
- "keyboard_shortcuts.down": "to move down in the list",
- "keyboard_shortcuts.enter": "to open status",
- "keyboard_shortcuts.favourite": "to favourite",
- "keyboard_shortcuts.favourites": "to open favourites list",
- "keyboard_shortcuts.federated": "to open federated timeline",
- "keyboard_shortcuts.heading": "Keyboard Shortcuts",
- "keyboard_shortcuts.home": "to open home timeline",
- "keyboard_shortcuts.hotkey": "Hotkey",
- "keyboard_shortcuts.legend": "to display this legend",
- "keyboard_shortcuts.local": "to open local timeline",
- "keyboard_shortcuts.mention": "to mention author",
- "keyboard_shortcuts.muted": "to open muted users list",
- "keyboard_shortcuts.my_profile": "to open your profile",
- "keyboard_shortcuts.notifications": "to open notifications column",
- "keyboard_shortcuts.pinned": "to open pinned toots list",
- "keyboard_shortcuts.profile": "to open author's profile",
- "keyboard_shortcuts.reply": "to reply",
- "keyboard_shortcuts.requests": "to open follow requests list",
- "keyboard_shortcuts.search": "to focus search",
- "keyboard_shortcuts.start": "to open \"get started\" column",
- "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
- "keyboard_shortcuts.toot": "to start a brand new toot",
- "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
- "keyboard_shortcuts.up": "to move up in the list",
- "lightbox.close": "Close",
- "lightbox.next": "Next",
- "lightbox.previous": "Previous",
- "lists.account.add": "Add to list",
- "lists.account.remove": "Remove from list",
- "lists.delete": "Delete list",
- "lists.edit": "Edit list",
- "lists.edit.submit": "Change title",
- "lists.new.create": "Add list",
- "lists.new.title_placeholder": "New list title",
- "lists.search": "Search among people you follow",
- "lists.subheading": "Your lists",
- "loading_indicator.label": "Loading...",
- "media_gallery.toggle_visible": "Toggle visibility",
- "missing_indicator.label": "Not found",
- "missing_indicator.sublabel": "This resource could not be found",
- "mute_modal.hide_notifications": "Hide notifications from this user?",
- "navigation_bar.apps": "Mobile apps",
- "navigation_bar.blocks": "Blocked users",
- "navigation_bar.community_timeline": "Local timeline",
- "navigation_bar.compose": "Compose new toot",
- "navigation_bar.direct": "Direct messages",
- "navigation_bar.discover": "Discover",
- "navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "Edit profile",
- "navigation_bar.favourites": "Favourites",
- "navigation_bar.filters": "Muted words",
- "navigation_bar.follow_requests": "Follow requests",
- "navigation_bar.info": "About this server",
- "navigation_bar.keyboard_shortcuts": "Hotkeys",
- "navigation_bar.lists": "Lists",
- "navigation_bar.logout": "Logout",
- "navigation_bar.mutes": "Muted users",
- "navigation_bar.personal": "Personal",
- "navigation_bar.pins": "Pinned toots",
- "navigation_bar.preferences": "Preferences",
- "navigation_bar.public_timeline": "Federated timeline",
- "navigation_bar.security": "Security",
- "notification.favourite": "{name} favourited your status",
- "notification.follow": "{name} followed you",
- "notification.mention": "{name} mentioned you",
- "notification.poll": "A poll you have voted in has ended",
- "notification.reblog": "{name} boosted your status",
- "notifications.clear": "Clear notifications",
- "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
- "notifications.column_settings.alert": "Desktop notifications",
- "notifications.column_settings.favourite": "Favourites:",
- "notifications.column_settings.filter_bar.advanced": "Display all categories",
- "notifications.column_settings.filter_bar.category": "Quick filter bar",
- "notifications.column_settings.filter_bar.show": "Show",
- "notifications.column_settings.follow": "New followers:",
- "notifications.column_settings.mention": "Mentions:",
- "notifications.column_settings.poll": "Poll results:",
- "notifications.column_settings.push": "Push notifications",
- "notifications.column_settings.reblog": "Boosts:",
- "notifications.column_settings.show": "Show in column",
- "notifications.column_settings.sound": "Play sound",
- "notifications.filter.all": "All",
- "notifications.filter.boosts": "Boosts",
- "notifications.filter.favourites": "Favourites",
- "notifications.filter.follows": "Follows",
- "notifications.filter.mentions": "Mentions",
- "notifications.filter.polls": "Poll results",
- "notifications.group": "{count} notifications",
- "poll.closed": "Closed",
- "poll.refresh": "Refresh",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
- "poll.vote": "Vote",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
- "privacy.change": "Adjust status privacy",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "Post to public timelines",
- "privacy.public.short": "Public",
- "privacy.unlisted.long": "Do not show in public timelines",
- "privacy.unlisted.short": "Unlisted",
- "regeneration_indicator.label": "Loading…",
- "regeneration_indicator.sublabel": "Your home feed is being prepared!",
- "relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
- "relative_time.just_now": "now",
- "relative_time.minutes": "{number}m",
- "relative_time.seconds": "{number}s",
- "reply_indicator.cancel": "Cancel",
- "report.forward": "Forward to {target}",
- "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
- "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
- "report.placeholder": "Additional comments",
- "report.submit": "Submit",
- "report.target": "Report {target}",
- "search.placeholder": "Search",
- "search_popout.search_format": "Advanced search format",
- "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
- "search_popout.tips.hashtag": "hashtag",
- "search_popout.tips.status": "status",
- "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
- "search_popout.tips.user": "user",
- "search_results.accounts": "People",
- "search_results.hashtags": "Hashtags",
- "search_results.statuses": "Toots",
- "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
- "status.admin_account": "Open moderation interface for @{name}",
- "status.admin_status": "Open this status in the moderation interface",
- "status.block": "Block @{name}",
- "status.cancel_reblog_private": "Unboost",
- "status.cannot_reblog": "This post cannot be boosted",
- "status.copy": "Copy link to status",
- "status.delete": "Delete",
- "status.detailed_status": "Detailed conversation view",
- "status.direct": "Direct message @{name}",
- "status.embed": "Embed",
- "status.favourite": "Favourite",
- "status.filtered": "Filtered",
- "status.load_more": "Load more",
- "status.media_hidden": "Media hidden",
- "status.mention": "Mention @{name}",
- "status.more": "More",
- "status.mute": "Mute @{name}",
- "status.mute_conversation": "Mute conversation",
- "status.open": "Expand this status",
- "status.pin": "Pin on profile",
- "status.pinned": "Pinned toot",
- "status.read_more": "Read more",
- "status.reblog": "Boost",
- "status.reblog_private": "Boost to original audience",
- "status.reblogged_by": "{name} boosted",
- "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
- "status.redraft": "Delete & re-draft",
- "status.reply": "Reply",
- "status.replyAll": "Reply to thread",
- "status.report": "Report @{name}",
- "status.sensitive_toggle": "Click to view",
- "status.sensitive_warning": "Sensitive content",
- "status.share": "Share",
- "status.show_less": "Show less",
- "status.show_less_all": "Show less for all",
- "status.show_more": "Show more",
- "status.show_more_all": "Show more for all",
- "status.show_thread": "Show thread",
- "status.unmute_conversation": "Unmute conversation",
- "status.unpin": "Unpin from profile",
- "suggestions.dismiss": "Dismiss suggestion",
- "suggestions.header": "You might be interested in…",
- "tabs_bar.federated_timeline": "Federated",
- "tabs_bar.home": "Home",
- "tabs_bar.local_timeline": "Local",
- "tabs_bar.notifications": "Notifications",
- "tabs_bar.search": "Search",
- "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
- "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
- "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
- "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
- "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
- "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
- "upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
- "upload_error.limit": "File upload limit exceeded.",
- "upload_error.poll": "File upload not allowed with polls.",
- "upload_form.description": "Describe for the visually impaired",
- "upload_form.focus": "Crop",
- "upload_form.undo": "Delete",
- "upload_progress.label": "Uploading...",
- "video.close": "Close video",
- "video.exit_fullscreen": "Exit full screen",
- "video.expand": "Expand video",
- "video.fullscreen": "Full screen",
- "video.hide": "Hide video",
- "video.mute": "Mute sound",
- "video.pause": "Pause",
- "video.play": "Play",
- "video.unmute": "Unmute sound"
+ "introduction.federation.action": "পরবর্তী",
+ "introduction.federation.federated.headline": "যুক্তবিশ্ব",
+ "introduction.federation.federated.text": "অন্যান্য যুক্তবিশ্বের সার্ভারের লেখাগুলি যুক্তবিশ্বের সময়রেখাতে আসবে ।",
+ "introduction.federation.home.headline": "বাড়ি",
+ "introduction.federation.home.text": "যাদেরকে অনুসরণ করেন তাদের লেখাগুলো আপনার বাড়ি-সময়রেখাতে আসবে। আপনি এখান থেকে যুক্তবিশ্বে যেকোনো সার্ভারের যে কাওকে অনুসরণ করতে পারেন!",
+ "introduction.federation.local.headline": "স্থানীয়",
+ "introduction.federation.local.text": "আপনি যে সার্ভারে আছেন সেখানকার মানুষের প্রকাশ্য লেখাগুলো স্থানীয় সময়রেখাতে আসবে।",
+ "introduction.interactions.action": "ব্যবহার জানার অংশটি শেষ করুন!",
+ "introduction.interactions.favourite.headline": "পছন্দের",
+ "introduction.interactions.favourite.text": "পরে পড়ার জন্য বা লেখা পছন্ধ হয়েছে সেটা লেখককে জানাতে, কোনো লেখা পছন্দের হিসেবে চিহ্নিত করতে পারেন।",
+ "introduction.interactions.reblog.headline": "সমর্থন",
+ "introduction.interactions.reblog.text": "কারোর লেখা সমর্থন দিয়ে চিহ্নিত করে সেটা আপনার অনুসরণকারীদের দেখতে পারেন।",
+ "introduction.interactions.reply.headline": "মতামত",
+ "introduction.interactions.reply.text": "আপনি অন্যদের এবং নিজের লেখায় মতামত টুট করতে পারেন, যেগুলো লেখার সাথে কথোপকথন হিসেবে যুক্ত থাকবে।",
+ "introduction.welcome.action": "শুরু করা যাক!",
+ "introduction.welcome.headline": "প্রথম ধাপ",
+ "introduction.welcome.text": "যুক্তবিশ্বে স্বাগতম! কিছুক্ষনের মধ্যেই আপনি আপনার লেখা বিভিন্ন সার্ভারে সম্প্রচার করতে পারবেন। কিন্তু মনে রাখবে যে এটা একটা বিশেষ সার্ভার, {domain} কারণ এখানে আপনার নিজেস্ব পাতা রাখা হচ্ছে।",
+ "keyboard_shortcuts.back": "পেছনে যেতে",
+ "keyboard_shortcuts.blocked": "বন্ধ করা ব্যবহারকারীদের তালিকা দেখতে",
+ "keyboard_shortcuts.boost": "সমর্থন করতে",
+ "keyboard_shortcuts.column": "কোনো কলামএ কোনো লেখা ফোকাস করতে",
+ "keyboard_shortcuts.compose": "লেখা সম্পদনার জায়গায় ফোকাস করতে",
+ "keyboard_shortcuts.description": "বিবরণ",
+ "keyboard_shortcuts.direct": "সরাসরি পাঠানো লেখা দেখতে",
+ "keyboard_shortcuts.down": "তালিকার ভেতরে নিচে যেতে",
+ "keyboard_shortcuts.enter": "অবস্থা দেখতে",
+ "keyboard_shortcuts.favourite": "পছন্দের দেখতে",
+ "keyboard_shortcuts.favourites": "পছন্দের তালিকা বের করতে",
+ "keyboard_shortcuts.federated": "যুক্তবিশ্বের সময়রেখাতে যেতে",
+ "keyboard_shortcuts.heading": "কিবোর্ডের দ্রুতকারক (শর্টকাট)",
+ "keyboard_shortcuts.home": "বাড়ির সময়রেখা খুলতে",
+ "keyboard_shortcuts.hotkey": "দ্রুতকারক ছবিগুলো",
+ "keyboard_shortcuts.legend": "এই প্রদর্শনঅর্থ(legend) দেখতে",
+ "keyboard_shortcuts.local": "স্থানীয় সময়রেখাতে যেতে",
+ "keyboard_shortcuts.mention": "লেখককে উল্লেখ করতে",
+ "keyboard_shortcuts.muted": "বন্ধ করা ব্যবহারকারীদের তালিকা খুলতে",
+ "keyboard_shortcuts.my_profile": "নিজের পাতা দেখতে",
+ "keyboard_shortcuts.notifications": "প্রজ্ঞাপনের কলাম খুলতে",
+ "keyboard_shortcuts.pinned": "পিন দেওয়া টুটের তালিকা খুলতে",
+ "keyboard_shortcuts.profile": "লেখকের পাতা দেখতে",
+ "keyboard_shortcuts.reply": "মতামত দিতে",
+ "keyboard_shortcuts.requests": "অনুসরণ অনুরোধের তালিকা দেখতে",
+ "keyboard_shortcuts.search": "খোঁজার অংশে ফোকাস করতে",
+ "keyboard_shortcuts.start": "\"প্রথম শুরুর\" কলাম বের করতে",
+ "keyboard_shortcuts.toggle_hidden": "CW লেখা দেখতে বা লুকাতে",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+ "keyboard_shortcuts.toot": "নতুন একটা টুট লেখা শুরু করতে",
+ "keyboard_shortcuts.unfocus": "লেখা বা খোঁজার জায়গায় ফোকাস না করতে",
+ "keyboard_shortcuts.up": "তালিকার উপরের দিকে যেতে",
+ "lightbox.close": "বন্ধ",
+ "lightbox.next": "পরবর্তী",
+ "lightbox.previous": "পূর্ববর্তী",
+ "lightbox.view_context": "View context",
+ "lists.account.add": "তালিকাতে যুক্ত করতে",
+ "lists.account.remove": "তালিকা থেকে বাদ দিতে",
+ "lists.delete": "তালিকা মুছে ফেলতে",
+ "lists.edit": "তালিকা সম্পাদনা করতে",
+ "lists.edit.submit": "শিরোনাম সম্পাদনা করতে",
+ "lists.new.create": "তালিকাতে যুক্ত করতে",
+ "lists.new.title_placeholder": "তালিকার নতুন শিরোনাম দিতে",
+ "lists.search": "যাদের অনুসরণ করেন তাদের ভেতরে খুঁজুন",
+ "lists.subheading": "আপনার তালিকা",
+ "loading_indicator.label": "আসছে...",
+ "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
+ "missing_indicator.label": "খুঁজে পাওয়া যায়নি",
+ "missing_indicator.sublabel": "জিনিসটা খুঁজে পাওয়া যায়নি",
+ "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
+ "navigation_bar.apps": "মোবাইলের আপ্প",
+ "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
+ "navigation_bar.community_timeline": "স্থানীয় সময়রেখা",
+ "navigation_bar.compose": "নতুন টুট লিখুন",
+ "navigation_bar.direct": "সরাসরি লেখা",
+ "navigation_bar.discover": "ঘুরে দেখুন",
+ "navigation_bar.domain_blocks": "বন্ধ করা ওয়েবসাইট",
+ "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করুন",
+ "navigation_bar.favourites": "পছন্দের",
+ "navigation_bar.filters": "বন্ধ করা শব্দ",
+ "navigation_bar.follow_requests": "অনুসরণের অনুরোধগুলি",
+ "navigation_bar.follows_and_followers": "Follows and followers",
+ "navigation_bar.info": "এই সার্ভার সম্পর্কে",
+ "navigation_bar.keyboard_shortcuts": "হটকীগুলি",
+ "navigation_bar.lists": "তালিকাগুলো",
+ "navigation_bar.logout": "বাইরে যান",
+ "navigation_bar.mutes": "যেসব বেভহারকারীদের কার্যক্রম বন্ধ করা আছে",
+ "navigation_bar.personal": "নিজস্ব",
+ "navigation_bar.pins": "পিন দেওয়া টুট",
+ "navigation_bar.preferences": "পছন্দসমূহ",
+ "navigation_bar.profile_directory": "Profile directory",
+ "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা",
+ "navigation_bar.security": "নিরাপত্তা",
+ "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন",
+ "notification.follow": "{name} আপনাকে অনুসরণ করেছেন",
+ "notification.mention": "{name} আপনাকে উল্লেখ করেছেন",
+ "notification.poll": "আপনি ভোট দিয়েছিলেন এমন এক নির্বাচনের ভোটের সময় শেষ হয়েছে",
+ "notification.reblog": "{name} আপনার কার্যক্রমে সমর্থন দেখিয়েছেন",
+ "notifications.clear": "প্রজ্ঞাপনগুলো মুছে ফেলতে",
+ "notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",
+ "notifications.column_settings.alert": "কম্পিউটারে প্রজ্ঞাপন",
+ "notifications.column_settings.favourite": "পছন্দের:",
+ "notifications.column_settings.filter_bar.advanced": "সব শ্রেণীগুলো দেখতে",
+ "notifications.column_settings.filter_bar.category": "দ্রুত ছাঁকনি বার",
+ "notifications.column_settings.filter_bar.show": "দেখতে",
+ "notifications.column_settings.follow": "নতুন অনুসরণকারীরা:",
+ "notifications.column_settings.mention": "প্রজ্ঞাপনগুলো:",
+ "notifications.column_settings.poll": "নির্বাচনের ফলাফল:",
+ "notifications.column_settings.push": "পুশ প্রজ্ঞাপন",
+ "notifications.column_settings.reblog": "সমর্থনগুলো:",
+ "notifications.column_settings.show": "কলামে দেখান",
+ "notifications.column_settings.sound": "শব্দ বাজাতে",
+ "notifications.filter.all": "সব",
+ "notifications.filter.boosts": "সমর্থনগুলো",
+ "notifications.filter.favourites": "পছন্দের গুলো",
+ "notifications.filter.follows": "অনুসরণের",
+ "notifications.filter.mentions": "উল্লেখিত",
+ "notifications.filter.polls": "নির্বাচনের ফলাফল",
+ "notifications.group": "{count} প্রজ্ঞাপন",
+ "poll.closed": "বন্ধ",
+ "poll.refresh": "আবার সতেজ করতে",
+ "poll.total_votes": "{count, plural, one {# ভোট} other {# ভোট}}",
+ "poll.vote": "ভোট",
+ "poll_button.add_poll": "একটা নির্বাচন যোগ করতে",
+ "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
+ "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
+ "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
+ "privacy.direct.short": "সরাসরি",
+ "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
+ "privacy.private.short": "শুধুমাত্র অনুসরণকারীদের জন্য",
+ "privacy.public.long": "সর্বজনীন প্রকাশ্য সময়রেখাতে লিখতে",
+ "privacy.public.short": "সর্বজনীন প্রকাশ্য",
+ "privacy.unlisted.long": "সর্বজনীন প্রকাশ্য সময়রেখাতে না দেখাতে",
+ "privacy.unlisted.short": "প্রকাশ্য নয়",
+ "regeneration_indicator.label": "আসছে…",
+ "regeneration_indicator.sublabel": "আপনার বাড়ির-সময়রেখা প্রস্তূত করা হচ্ছে!",
+ "relative_time.days": "{number} দিন",
+ "relative_time.hours": "{number} ঘন্টা",
+ "relative_time.just_now": "এখন",
+ "relative_time.minutes": "{number}ম",
+ "relative_time.seconds": "{number} সেকেন্ড",
+ "reply_indicator.cancel": "বাতিল করতে",
+ "report.forward": "এটা আরো পাঠান {target} তে",
+ "report.forward_hint": "এই নিবন্ধনটি অন্য একটি সার্ভারে। অপ্রকাশিতনামাভাবে রিপোর্টের কপি সেখানেও কি পাঠাতে চান ?",
+ "report.hint": "রিপোর্টটি আপনার সার্ভারের পরিচালকের কাছে পাঠানো হবে। রিপোর্ট পাঠানোর কারণ নিচে বিস্তারিত লিখতে পারেন:",
+ "report.placeholder": "অন্য কোনো মন্তব্য",
+ "report.submit": "জমা দিন",
+ "report.target": "{target} রিপোর্ট করুন",
+ "search.placeholder": "খুঁজতে",
+ "search_popout.search_format": "বিস্তারিতভাবে খোঁজার পদ্ধতি",
+ "search_popout.tips.full_text": "সাধারণ লেখা দিয়ে খুঁজলে বের হবে সেরকম আপনার লেখা, পছন্দের লেখা, সমর্থন করা লেখা, আপনাকে উল্লেখকরা কোনো লেখা, যা খুঁজছেন সেরকম কোনো ব্যবহারকারীর নাম বা কোনো হ্যাশট্যাগগুলো।",
+ "search_popout.tips.hashtag": "হ্যাশট্যাগ",
+ "search_popout.tips.status": "লেখা",
+ "search_popout.tips.text": "সাধারণ লেখা দিয়ে খুঁজলে বের হবে সেরকম ব্যবহারকারীর নাম বা কোনো হ্যাশট্যাগগুলো",
+ "search_popout.tips.user": "ব্যবহারকারী",
+ "search_results.accounts": "মানুষ",
+ "search_results.hashtags": "হ্যাশট্যাগগুলি",
+ "search_results.statuses": "টুট",
+ "search_results.total": "{count, number} {count, plural, one {ফলাফল} other {ফলাফল}}",
+ "status.admin_account": "@{name} র জন্য পরিচালনার ইন্টারফেসে ঢুকুন",
+ "status.admin_status": "যায় লেখাটি পরিচালনার ইন্টারফেসে খুলুন",
+ "status.block": "@{name}কে বন্ধ করুন",
+ "status.cancel_reblog_private": "সমর্থন বাতিল করতে",
+ "status.cannot_reblog": "এটিতে সমর্থন দেওয়া যাবেনা",
+ "status.copy": "লেখাটির লিংক কপি করতে",
+ "status.delete": "মুছে ফেলতে",
+ "status.detailed_status": "বিস্তারিত কথোপকথনের হিসেবে দেখতে",
+ "status.direct": "@{name} কে সরাসরি পাঠান",
+ "status.embed": "এমবেড করতে",
+ "status.favourite": "পছন্দের করতে",
+ "status.filtered": "ছাঁকনিদিত",
+ "status.load_more": "আরো দেখুন",
+ "status.media_hidden": "ছবি বা ভিডিও পেছনে",
+ "status.mention": "@{name}কে উল্লেখ করতে",
+ "status.more": "আরো",
+ "status.mute": "@{name}র কার্যক্রম সরিয়ে ফেলতে",
+ "status.mute_conversation": "কথোপকথননের প্রজ্ঞাপন সরিয়ে ফেলতে",
+ "status.open": "এটার সম্পূর্ণটা দেখতে",
+ "status.pin": "নিজের পাতায় এটা পিন করতে",
+ "status.pinned": "পিন করা টুট",
+ "status.read_more": "আরো পড়ুন",
+ "status.reblog": "সমর্থন দিতে",
+ "status.reblog_private": "আপনার অনুসরণকারীদের কাছে এটার সমর্থন দেখাতে",
+ "status.reblogged_by": "{name} সমর্থন দিয়েছে",
+ "status.reblogs.empty": "এখনো কেও এটাতে সমর্থন দেয়নি। যখন কেও দেয়, সেটা তখন এখানে দেখা যাবে।",
+ "status.redraft": "মুছে আবার নতুন করে লিখতে",
+ "status.reply": "মতামত জানাতে",
+ "status.replyAll": "লেখাযুক্ত সবার কাছে মতামত জানাতে",
+ "status.report": "@{name}কে রিপোর্ট করতে",
+ "status.sensitive_warning": "সংবেদনশীল কিছু",
+ "status.share": "অন্যদের জানান",
+ "status.show_less": "কম দেখতে",
+ "status.show_less_all": "সবগুলোতে কম দেখতে",
+ "status.show_more": "আরো দেখাতে",
+ "status.show_more_all": "সবগুলোতে আরো দেখতে",
+ "status.show_thread": "আলোচনা দেখতে",
+ "status.unmute_conversation": "আলোচনার প্রজ্ঞাপন চালু করতে",
+ "status.unpin": "নিজের পাতা থেকে পিন করে রাখাটির পিন খুলতে",
+ "suggestions.dismiss": "সাহায্যের জন্য পরামর্শগুলো সরাতে",
+ "suggestions.header": "আপনি হয়তোবা এগুলোতে আগ্রহী হতে পারেন…",
+ "tabs_bar.federated_timeline": "যুক্তবিশ্ব",
+ "tabs_bar.home": "বাড়ি",
+ "tabs_bar.local_timeline": "স্থানীয়",
+ "tabs_bar.notifications": "প্রজ্ঞাপনগুলো",
+ "tabs_bar.search": "খুঁজতে",
+ "time_remaining.days": "{number, plural, one {# day} other {# days}} বাকি আছে",
+ "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} বাকি আছে",
+ "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} বাকি আছে",
+ "time_remaining.moments": "সময় বাকি আছে",
+ "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} বাকি আছে",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} কথা বলছে",
+ "ui.beforeunload": "যে পর্যন্ত এটা লেখা হয়েছে, মাস্টাডন থেকে চলে গেলে এটা মুছে যাবে।",
+ "upload_area.title": "টেনে এখানে ছেড়ে দিলে এখানে যুক্ত করা যাবে",
+ "upload_button.label": "ছবি বা ভিডিও যুক্ত করতে (এসব ধরণের JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_error.limit": "যা যুক্ত করতে চাচ্ছেন সেটি বেশি বড়, এখানকার সর্বাধিকের মেমোরির উপরে চলে গেছে।",
+ "upload_error.poll": "নির্বাচনক্ষেত্রে কোনো ফাইল যুক্ত করা যাবেনা।",
+ "upload_form.description": "যারা দেখতে পায়না তাদের জন্য এটা বর্ণনা করতে",
+ "upload_form.focus": "সাধারণ দেখাটি পরিবর্তন করতে",
+ "upload_form.undo": "মুছে ফেলতে",
+ "upload_progress.label": "যুক্ত করতে পাঠানো হচ্ছে...",
+ "video.close": "ভিডিওটি বন্ধ করতে",
+ "video.exit_fullscreen": "পূর্ণ পর্দা থেকে বাইরে বের হতে",
+ "video.expand": "ভিডিওটি বড়ো করতে",
+ "video.fullscreen": "পূর্ণ পর্দা করতে",
+ "video.hide": "ভিডিওটি লুকাতে",
+ "video.mute": "শব্দ বন্ধ করতে",
+ "video.pause": "থামাতে",
+ "video.play": "শুরু করতে",
+ "video.unmute": "শব্দ চালু করতে"
}
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 18dd56d0d..bb73b2a41 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -1,7 +1,7 @@
{
"account.add_or_remove_from_list": "Afegir o Treure de les llistes",
"account.badges.bot": "Bot",
- "account.block": "Bloca @{name}",
+ "account.block": "Bloqueja @{name}",
"account.block_domain": "Amaga-ho tot de {domain}",
"account.blocked": "Bloquejat",
"account.direct": "Missatge directe @{name}",
@@ -11,13 +11,13 @@
"account.follow": "Segueix",
"account.followers": "Seguidors",
"account.followers.empty": "Encara ningú no segueix aquest usuari.",
- "account.follows": "Seguint",
+ "account.follows": "Seguiments",
"account.follows.empty": "Aquest usuari encara no segueix a ningú.",
"account.follows_you": "Et segueix",
"account.hide_reblogs": "Amaga els impulsos de @{name}",
"account.link_verified_on": "La propietat d'aquest enllaç es va verificar el dia {date}",
"account.locked_info": "Aquest estat de privadesa del compte està definit com a bloquejat. El propietari revisa manualment qui pot seguir-lo.",
- "account.media": "Media",
+ "account.media": "Mèdia",
"account.mention": "Esmentar @{name}",
"account.moved_to": "{name} s'ha mogut a:",
"account.mute": "Silencia @{name}",
@@ -44,7 +44,7 @@
"bundle_modal_error.close": "Tanca",
"bundle_modal_error.message": "S'ha produït un error en carregar aquest component.",
"bundle_modal_error.retry": "Torna-ho a provar",
- "column.blocks": "Usuaris blocats",
+ "column.blocks": "Usuaris bloquejats",
"column.community": "Línia de temps local",
"column.direct": "Missatges directes",
"column.domain_blocks": "Dominis ocults",
@@ -54,7 +54,7 @@
"column.lists": "Llistes",
"column.mutes": "Usuaris silenciats",
"column.notifications": "Notificacions",
- "column.pins": "Toot fixat",
+ "column.pins": "Toots fixats",
"column.public": "Línia de temps federada",
"column_back_button.label": "Enrere",
"column_header.hide_settings": "Amaga la configuració",
@@ -65,29 +65,30 @@
"column_header.unpin": "No fixis",
"column_subheading.settings": "Configuració",
"community.column_settings.media_only": "Només multimèdia",
- "compose_form.direct_message_warning": "Aquest toot només serà enviat als usuaris esmentats. De totes maneres, els operadors de la teva o de qualsevol de les instàncies receptores poden inspeccionar aquest missatge.",
+ "compose_form.direct_message_warning": "Aquest toot només serà enviat als usuaris esmentats.",
"compose_form.direct_message_warning_learn_more": "Aprèn més",
"compose_form.hashtag_warning": "Aquest toot no es mostrarà en cap etiqueta ja que no està llistat. Només els toots públics poden ser cercats per etiqueta.",
"compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges a seguidors.",
- "compose_form.lock_disclaimer.lock": "blocat",
- "compose_form.placeholder": "En què estàs pensant?",
+ "compose_form.lock_disclaimer.lock": "bloquejat",
+ "compose_form.placeholder": "En què penses?",
"compose_form.poll.add_option": "Afegeix una opció",
"compose_form.poll.duration": "Durada de l'enquesta",
"compose_form.poll.option_placeholder": "Opció {number}",
"compose_form.poll.remove_option": "Elimina aquesta opció",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Marcar mèdia com a sensible",
"compose_form.sensitive.marked": "Mèdia marcat com a sensible",
"compose_form.sensitive.unmarked": "Mèdia no està marcat com a sensible",
"compose_form.spoiler.marked": "Text es ocult sota l'avís",
"compose_form.spoiler.unmarked": "Text no ocult",
"compose_form.spoiler_placeholder": "Escriu l'avís aquí",
"confirmation_modal.cancel": "Cancel·la",
- "confirmations.block.block_and_report": "Block & Report",
- "confirmations.block.confirm": "Bloca",
- "confirmations.block.message": "Estàs segur que vols blocar {name}?",
+ "confirmations.block.block_and_report": "Bloquejar i informar",
+ "confirmations.block.confirm": "Bloqueja",
+ "confirmations.block.message": "Estàs segur que vols bloquejar a {name}?",
"confirmations.delete.confirm": "Suprimeix",
- "confirmations.delete.message": "Estàs segur que vols suprimir aquest estat?",
+ "confirmations.delete.message": "Estàs segur que vols suprimir aquest toot?",
"confirmations.delete_list.confirm": "Suprimeix",
"confirmations.delete_list.message": "Estàs segur que vols suprimir permanentment aquesta llista?",
"confirmations.domain_block.confirm": "Amaga tot el domini",
@@ -95,12 +96,12 @@
"confirmations.mute.confirm": "Silencia",
"confirmations.mute.message": "Estàs segur que vols silenciar {name}?",
"confirmations.redraft.confirm": "Esborrar i refer",
- "confirmations.redraft.message": "Estàs segur que vols esborrar aquesta publicació i tornar a redactar-la? Perderàs totes els impulsos i favorits, i les respostes a la publicació original es quedaran orfes.",
+ "confirmations.redraft.message": "Estàs segur que vols esborrar aquest toot i tornar a redactar-lo? Perderàs totes els impulsos i favorits, i les respostes al toot original es quedaran orfes.",
"confirmations.reply.confirm": "Respon",
"confirmations.reply.message": "Responen ara es sobreescriurà el missatge que estàs editant. Estàs segur que vols continuar?",
"confirmations.unfollow.confirm": "Deixa de seguir",
"confirmations.unfollow.message": "Estàs segur que vols deixar de seguir {name}?",
- "embed.instructions": "Incrusta aquest estat al lloc web copiant el codi a continuació.",
+ "embed.instructions": "Incrusta aquest toot al lloc web copiant el codi a continuació.",
"embed.preview": "Aquí tenim quin aspecte tindrá:",
"emoji_button.activity": "Activitat",
"emoji_button.custom": "Personalitzat",
@@ -117,18 +118,18 @@
"emoji_button.symbols": "Símbols",
"emoji_button.travel": "Viatges i Llocs",
"empty_column.account_timeline": "No hi ha toots aquí!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_unavailable": "Perfil no disponible",
"empty_column.blocks": "Encara no has bloquejat cap usuari.",
- "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per fer rodar la pilota!",
+ "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per a fer rodar la pilota!",
"empty_column.direct": "Encara no tens missatges directes. Quan enviïs o rebis un, es mostrarà aquí.",
"empty_column.domain_blocks": "Encara no hi ha dominis ocults.",
"empty_column.favourited_statuses": "Encara no tens cap toot favorit. Quan en tinguis, apareixerà aquí.",
"empty_column.favourites": "Encara ningú ha marcat aquest toot com a favorit. Quan algú ho faci, apareixera aquí.",
- "empty_column.follow_requests": "Encara no teniu cap petició de seguiment. Quan rebeu una, apareixerà aquí.",
- "empty_column.hashtag": "Encara no hi ha res amb aquesta etiqueta.",
+ "empty_column.follow_requests": "Encara no teniu cap petició de seguiment. Quan rebis una, apareixerà aquí.",
+ "empty_column.hashtag": "Encara no hi ha res en aquesta etiqueta.",
"empty_column.home": "Encara no segueixes ningú. Visita {public} o fes cerca per començar i conèixer altres usuaris.",
"empty_column.home.public_timeline": "la línia de temps pública",
- "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres d'aquesta llista publiquin nous estats, apareixeran aquí.",
+ "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres d'aquesta llista publiquin nous toots, apareixeran aquí.",
"empty_column.lists": "Encara no tens cap llista. Quan en facis una, apareixerà aquí.",
"empty_column.mutes": "Encara no has silenciat cap usuari.",
"empty_column.notifications": "Encara no tens notificacions. Interactua amb altres per iniciar la conversa.",
@@ -178,40 +179,42 @@
"keyboard_shortcuts.back": "navegar enrera",
"keyboard_shortcuts.blocked": "per obrir la llista d'usuaris bloquejats",
"keyboard_shortcuts.boost": "impulsar",
- "keyboard_shortcuts.column": "per centrar un estat en una de les columnes",
+ "keyboard_shortcuts.column": "per a centrar un toot en una de les columnes",
"keyboard_shortcuts.compose": "per centrar l'area de composició de text",
"keyboard_shortcuts.description": "Descripció",
"keyboard_shortcuts.direct": "per obrir la columna de missatges directes",
"keyboard_shortcuts.down": "per baixar en la llista",
- "keyboard_shortcuts.enter": "ampliar estat",
+ "keyboard_shortcuts.enter": "ampliar el toot",
"keyboard_shortcuts.favourite": "afavorir",
"keyboard_shortcuts.favourites": "per obrir la llista de favorits",
"keyboard_shortcuts.federated": "per obrir la línia de temps federada",
"keyboard_shortcuts.heading": "Dreçeres de teclat",
- "keyboard_shortcuts.home": "per obrir la línia de temps Inici",
+ "keyboard_shortcuts.home": "per a obrir la línia de temps Inici",
"keyboard_shortcuts.hotkey": "Tecla d'accés directe",
"keyboard_shortcuts.legend": "per a mostrar aquesta llegenda",
- "keyboard_shortcuts.local": "per obrir la línia de temps local",
- "keyboard_shortcuts.mention": "per esmentar l'autor",
- "keyboard_shortcuts.muted": "per obrir la llista d'usuaris silenciats",
- "keyboard_shortcuts.my_profile": "per obrir el teu perfil",
- "keyboard_shortcuts.notifications": "per obrir la columna de notificacions",
- "keyboard_shortcuts.pinned": "per obrir la llista de toots fixats",
- "keyboard_shortcuts.profile": "per obrir el perfil de l'autor",
+ "keyboard_shortcuts.local": "per a obrir la línia de temps local",
+ "keyboard_shortcuts.mention": "per a esmentar l'autor",
+ "keyboard_shortcuts.muted": "per a obrir la llista d'usuaris silenciats",
+ "keyboard_shortcuts.my_profile": "per a obrir el teu perfil",
+ "keyboard_shortcuts.notifications": "per a obrir la columna de notificacions",
+ "keyboard_shortcuts.pinned": "per a obrir la llista de toots fixats",
+ "keyboard_shortcuts.profile": "per a obrir el perfil de l'autor",
"keyboard_shortcuts.reply": "respondre",
- "keyboard_shortcuts.requests": "per obrir la llista de sol·licituds de seguiment",
- "keyboard_shortcuts.search": "per centrar la cerca",
- "keyboard_shortcuts.start": "per obrir la columna \"Començar\"",
+ "keyboard_shortcuts.requests": "per a obrir la llista de sol·licituds de seguiment",
+ "keyboard_shortcuts.search": "per a centrar la cerca",
+ "keyboard_shortcuts.start": "per a obrir la columna \"Començar\"",
"keyboard_shortcuts.toggle_hidden": "per a mostrar/amagar text sota CW",
+ "keyboard_shortcuts.toggle_sensitivity": "per a mostrar/amagar mèdia",
"keyboard_shortcuts.toot": "per a començar un toot nou de trinca",
"keyboard_shortcuts.unfocus": "descentrar l'area de composició de text/cerca",
"keyboard_shortcuts.up": "moure amunt en la llista",
"lightbox.close": "Tancar",
"lightbox.next": "Següent",
"lightbox.previous": "Anterior",
+ "lightbox.view_context": "Veure el context",
"lists.account.add": "Afegir a la llista",
"lists.account.remove": "Treure de la llista",
- "lists.delete": "Delete list",
+ "lists.delete": "Esborrar llista",
"lists.edit": "Editar llista",
"lists.edit.submit": "Canvi de títol",
"lists.new.create": "Afegir llista",
@@ -223,7 +226,7 @@
"missing_indicator.label": "No trobat",
"missing_indicator.sublabel": "Aquest recurs no pot ser trobat",
"mute_modal.hide_notifications": "Amagar notificacions d'aquest usuari?",
- "navigation_bar.apps": "Apps Mòbils",
+ "navigation_bar.apps": "Apps mòbils",
"navigation_bar.blocks": "Usuaris bloquejats",
"navigation_bar.community_timeline": "Línia de temps Local",
"navigation_bar.compose": "Redacta nou toot",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favorits",
"navigation_bar.filters": "Paraules silenciades",
"navigation_bar.follow_requests": "Sol·licituds de seguiment",
+ "navigation_bar.follows_and_followers": "Seguits i seguidors",
"navigation_bar.info": "Sobre aquest servidor",
"navigation_bar.keyboard_shortcuts": "Dreceres de teclat",
"navigation_bar.lists": "Llistes",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Toots fixats",
"navigation_bar.preferences": "Preferències",
+ "navigation_bar.profile_directory": "Directori de perfils",
"navigation_bar.public_timeline": "Línia de temps federada",
"navigation_bar.security": "Seguretat",
"notification.favourite": "{name} ha afavorit el teu estat",
@@ -298,24 +303,24 @@
"report.hint": "El informe s'enviarà als moderadors del teu servidor. Pots explicar perquè vols informar d'aquest compte aquí:",
"report.placeholder": "Comentaris addicionals",
"report.submit": "Enviar",
- "report.target": "Informes",
+ "report.target": "Informes {target}",
"search.placeholder": "Cercar",
"search_popout.search_format": "Format de cerca avançada",
"search_popout.tips.full_text": "Text simple recupera publicacions que has escrit, les marcades com a favorites, les impulsades o en les que has estat esmentat, així com usuaris, noms d'usuari i etiquetes.",
"search_popout.tips.hashtag": "etiqueta",
- "search_popout.tips.status": "status",
+ "search_popout.tips.status": "estat",
"search_popout.tips.text": "El text simple retorna coincidències amb els noms de visualització, els noms d'usuari i les etiquetes",
"search_popout.tips.user": "usuari",
"search_results.accounts": "Gent",
"search_results.hashtags": "Etiquetes",
"search_results.statuses": "Toots",
- "search_results.total": "{count, number} {count, plural, un {result} altres {results}}",
+ "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
"status.admin_account": "Obre l'interfície de moderació per a @{name}",
- "status.admin_status": "Obre aquest estat a la interfície de moderació",
+ "status.admin_status": "Obre aquest toot a la interfície de moderació",
"status.block": "Bloqueja @{name}",
"status.cancel_reblog_private": "Desfer l'impuls",
"status.cannot_reblog": "Aquesta publicació no pot ser impulsada",
- "status.copy": "Copia l'enllaç a l'estat",
+ "status.copy": "Copia l'enllaç al toot",
"status.delete": "Esborrar",
"status.detailed_status": "Visualització detallada de la conversa",
"status.direct": "Missatge directe @{name}",
@@ -340,7 +345,6 @@
"status.reply": "Respondre",
"status.replyAll": "Respondre al tema",
"status.report": "Informar sobre @{name}",
- "status.sensitive_toggle": "Clic per veure",
"status.sensitive_warning": "Contingut sensible",
"status.share": "Compartir",
"status.show_less": "Mostra menys",
@@ -362,12 +366,12 @@
"time_remaining.minutes": "{number, plural, one {# minut} other {# minuts}} restants",
"time_remaining.moments": "Moments restants",
"time_remaining.seconds": "{number, plural, one {# segon} other {# segons}} restants",
- "trends.count_by_accounts": "{count} {rawCount, plural, una {person} altres {people}} parlant",
- "ui.beforeunload": "El vostre esborrany es perdrà si sortiu de Mastodon.",
- "upload_area.title": "Arrossega i deixa anar per carregar",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {persona} other {gent}} talking",
+ "ui.beforeunload": "El teu esborrany es perdrà si surts de Mastodon.",
+ "upload_area.title": "Arrossega i deixa anar per a carregar",
"upload_button.label": "Afegir multimèdia (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_error.limit": "S'ha superat el límit de càrrega d'arxius.",
- "upload_error.poll": "No es permet l'enviament de fitxers amb les enquestes.",
+ "upload_error.poll": "No es permet l'enviament de fitxers en les enquestes.",
"upload_form.description": "Descriure els problemes visuals",
"upload_form.focus": "Modificar la previsualització",
"upload_form.undo": "Esborra",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 016be39b3..fb8ffdd51 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Toglie sta scelta",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Indicà u media cum'è sensibile",
"compose_form.sensitive.marked": "Media indicatu cum'è sensibile",
"compose_form.sensitive.unmarked": "Media micca indicatu cum'è sensibile",
"compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
@@ -160,7 +161,7 @@
"intervals.full.minutes": "{number, plural, one {# minuta} other {# minute}}",
"introduction.federation.action": "Cuntinuà",
"introduction.federation.federated.headline": "Federata",
- "introduction.federation.federated.text": "I statuti pubblichi da l'altri servori di u fediverse saranu mustrati nant'à a linea pubblica federata.",
+ "introduction.federation.federated.text": "I statuti pubblichi da l'altri servori di u fediverse saranu mustrati nant'à a linea pubblica glubale.",
"introduction.federation.home.headline": "Accolta",
"introduction.federation.home.text": "I statuti da a ghjente che vo siguitate saranu affissati nant'à a linea d'accolta. Pudete seguità qualvogliasia nant'à tutti i servori!",
"introduction.federation.local.headline": "Lucale",
@@ -186,7 +187,7 @@
"keyboard_shortcuts.enter": "apre u statutu",
"keyboard_shortcuts.favourite": "aghjunghje à i favuriti",
"keyboard_shortcuts.favourites": "per apre a lista di i favuriti",
- "keyboard_shortcuts.federated": "per apre a linea pubblica federata",
+ "keyboard_shortcuts.federated": "per apre a linea pubblica glubale",
"keyboard_shortcuts.heading": "Accorte cù a tastera",
"keyboard_shortcuts.home": "per apre a linea d'accolta",
"keyboard_shortcuts.hotkey": "Accorta",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "fucalizà nant'à l'area di circata",
"keyboard_shortcuts.start": "per apre a culonna \"per principià\"",
"keyboard_shortcuts.toggle_hidden": "vede/piattà u testu daretu à l'avertimentu CW",
+ "keyboard_shortcuts.toggle_sensitivity": "vede/piattà i media",
"keyboard_shortcuts.toot": "scrive un novu statutu",
"keyboard_shortcuts.unfocus": "ùn fucalizà più l'area di testu",
"keyboard_shortcuts.up": "cullà indè a lista",
"lightbox.close": "Chjudà",
"lightbox.next": "Siguente",
"lightbox.previous": "Pricidente",
+ "lightbox.view_context": "Vede u cuntestu",
"lists.account.add": "Aghjunghje à a lista",
"lists.account.remove": "Toglie di a lista",
"lists.delete": "Supprime a lista",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favuriti",
"navigation_bar.filters": "Parolle silenzate",
"navigation_bar.follow_requests": "Dumande d'abbunamentu",
+ "navigation_bar.follows_and_followers": "Abbunati è abbunamenti",
"navigation_bar.info": "À prupositu di u servore",
"navigation_bar.keyboard_shortcuts": "Accorte cù a tastera",
"navigation_bar.lists": "Liste",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Persunale",
"navigation_bar.pins": "Statuti puntarulati",
"navigation_bar.preferences": "Preferenze",
+ "navigation_bar.profile_directory": "Annuariu di i prufili",
"navigation_bar.public_timeline": "Linea pubblica glubale",
"navigation_bar.security": "Sicurità",
"notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti",
@@ -281,14 +286,14 @@
"privacy.direct.short": "Direttu",
"privacy.private.long": "Mustrà solu à l'abbunati",
"privacy.private.short": "Privatu",
- "privacy.public.long": "Mustrà à tuttu u mondu nant'a linea pubblica",
+ "privacy.public.long": "Mustrà à tuttu u mondu nant'à e linee pubbliche",
"privacy.public.short": "Pubblicu",
- "privacy.unlisted.long": "Ùn mette micca nant'a linea pubblica (ma tutt'u mondu pò vede u statutu nant'à u vostru prufile)",
+ "privacy.unlisted.long": "Ùn mette micca nant'à e linee pubbliche",
"privacy.unlisted.short": "Micca listatu",
"regeneration_indicator.label": "Caricamentu…",
"regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta!",
- "relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
+ "relative_time.days": "{number}ghj",
+ "relative_time.hours": "{number}o",
"relative_time.just_now": "avà",
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
@@ -340,7 +345,6 @@
"status.reply": "Risponde",
"status.replyAll": "Risponde à tutti",
"status.report": "Palisà @{name}",
- "status.sensitive_toggle": "Cliccate per vede",
"status.sensitive_warning": "Cuntinutu sensibile",
"status.share": "Sparte",
"status.show_less": "Ripiegà",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index cbf303f3c..f10a3f38b 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -204,6 +204,7 @@
"keyboard_shortcuts.search": "k zaměření na hledání",
"keyboard_shortcuts.start": "k otevření sloupce „začínáme“",
"keyboard_shortcuts.toggle_hidden": "k zobrazení/skrytí textu za varováním o obsahu",
+ "keyboard_shortcuts.toggle_sensitivity": "k zobrazení/skrytí médií",
"keyboard_shortcuts.toot": "k napsání úplně nového tootu",
"keyboard_shortcuts.unfocus": "ke zrušení zaměření na psací prostor/hledání",
"keyboard_shortcuts.up": "k posunutí nahoru v seznamu",
@@ -236,6 +237,7 @@
"navigation_bar.favourites": "Oblíbené",
"navigation_bar.filters": "Skrytá slova",
"navigation_bar.follow_requests": "Požadavky o sledování",
+ "navigation_bar.follows_and_followers": "Sledovaní a sledující",
"navigation_bar.info": "O tomto serveru",
"navigation_bar.keyboard_shortcuts": "Klávesové zkratky",
"navigation_bar.lists": "Seznamy",
@@ -244,6 +246,7 @@
"navigation_bar.personal": "Osobní",
"navigation_bar.pins": "Připnuté tooty",
"navigation_bar.preferences": "Předvolby",
+ "navigation_bar.profile_directory": "Adresář profilů",
"navigation_bar.public_timeline": "Federovaná časová osa",
"navigation_bar.security": "Zabezpečení",
"notification.favourite": "{name} si oblíbil/a váš toot",
@@ -297,7 +300,7 @@
"reply_indicator.cancel": "Zrušit",
"report.forward": "Přeposlat na {target}",
"report.forward_hint": "Tento účet je z jiného serveru. Chcete na něj také poslat anonymizovanou kopii?",
- "report.hint": "Toto nahlášení bude zasláno moderátorům vašeho serveru. Níže můžete uvést, proč tento účet nahlašujete:",
+ "report.hint": "Nahlášení bude zasláno moderátorům vašeho serveru. Níže můžete uvést, proč tento účet nahlašujete:",
"report.placeholder": "Dodatečné komentáře",
"report.submit": "Odeslat",
"report.target": "Nahlášení uživatele {target}",
@@ -342,7 +345,6 @@
"status.reply": "Odpovědět",
"status.replyAll": "Odpovědět na vlákno",
"status.report": "Nahlásit uživatele @{name}",
- "status.sensitive_toggle": "Klikněte pro zobrazení",
"status.sensitive_warning": "Citlivý obsah",
"status.share": "Sdílet",
"status.show_less": "Zobrazit méně",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d886b2b54..4ce5d7ad9 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -45,7 +45,7 @@
"bundle_modal_error.message": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
"bundle_modal_error.retry": "Ceiswich eto",
"column.blocks": "Defnyddwyr a flociwyd",
- "column.community": "Llinell amser lleol",
+ "column.community": "Ffrwd lleol",
"column.direct": "Negeseuon preifat",
"column.domain_blocks": "Parthau cuddiedig",
"column.favourites": "Ffefrynnau",
@@ -71,19 +71,20 @@
"compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich tŵtiau dilynwyr-yn-unig.",
"compose_form.lock_disclaimer.lock": "wedi ei gloi",
"compose_form.placeholder": "Beth sydd ar eich meddwl?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "Ychwanegu Dewisiad",
+ "compose_form.poll.duration": "Cyfnod pleidlais",
+ "compose_form.poll.option_placeholder": "Dewisiad {number}",
+ "compose_form.poll.remove_option": "Tynnu'r dewisiad",
"compose_form.publish": "Tŵt",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Marcio cyfryngau fel eu bod yn sensitif",
"compose_form.sensitive.marked": "Cyfryngau wedi'u marcio'n sensitif",
"compose_form.sensitive.unmarked": "Nid yw'r cyfryngau wedi'u marcio'n sensitif",
"compose_form.spoiler.marked": "Testun wedi ei guddio gan rybudd",
"compose_form.spoiler.unmarked": "Nid yw'r testun wedi ei guddio",
"compose_form.spoiler_placeholder": "Ysgrifenwch eich rhybudd yma",
"confirmation_modal.cancel": "Canslo",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
"confirmations.block.confirm": "Blocio",
"confirmations.block.message": "Ydych chi'n sicr eich bod eisiau blocio {name}?",
"confirmations.delete.confirm": "Dileu",
@@ -108,7 +109,7 @@
"emoji_button.food": "Bwyd a Diod",
"emoji_button.label": "Mewnosodwch emoji",
"emoji_button.nature": "Natur",
- "emoji_button.not_found": "Dim emojo!! (╯°□°)╯︵ ┻━┻",
+ "emoji_button.not_found": "Dim emojau!! (╯°□°)╯︵ ┻━┻",
"emoji_button.objects": "Gwrthrychau",
"emoji_button.people": "Pobl",
"emoji_button.recent": "Defnyddir yn aml",
@@ -116,8 +117,8 @@
"emoji_button.search_results": "Canlyniadau chwilio",
"emoji_button.symbols": "Symbolau",
"emoji_button.travel": "Teithio & Llefydd",
- "empty_column.account_timeline": "No toots here!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_timeline": "Dim tŵtiau fama!",
+ "empty_column.account_unavailable": "Proffil ddim ar gael",
"empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
"empty_column.community": "Mae'r ffrwd lleol yn wag. Ysgrifenwch rhywbeth yn gyhoeddus i gael dechrau arni!",
"empty_column.direct": "Nid oes gennych unrhyw negeseuon preifat eto. Pan y byddwch yn anfon neu derbyn un, mi fydd yn ymddangos yma.",
@@ -146,8 +147,8 @@
"hashtag.column_header.tag_mode.all": "a {additional}",
"hashtag.column_header.tag_mode.any": "neu {additional}",
"hashtag.column_header.tag_mode.none": "heb {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+ "hashtag.column_settings.select.no_options_message": "Dim awgrymiadau i'w weld",
+ "hashtag.column_settings.select.placeholder": "Mewnbynnu hashnodau…",
"hashtag.column_settings.tag_mode.all": "Pob un o'r rhain",
"hashtag.column_settings.tag_mode.any": "Unrhyw un o'r rhain",
"hashtag.column_settings.tag_mode.none": "Dim o'r rhain",
@@ -155,26 +156,26 @@
"home.column_settings.basic": "Syml",
"home.column_settings.show_reblogs": "Dangos bŵstiau",
"home.column_settings.show_replies": "Dangos ymatebion",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+ "intervals.full.days": "{number, plural, one {# ddydd} other {# o ddyddiau}}",
+ "intervals.full.hours": "{number, plural, one {# awr} other {# o oriau}}",
+ "intervals.full.minutes": "{number, plural, one {# funud} other {# o funudau}}",
"introduction.federation.action": "Nesaf",
"introduction.federation.federated.headline": "Ffederasiwn",
- "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
- "introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
- "introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+ "introduction.federation.federated.text": "Bydd pyst cyhoeddus o gweinyddion arall yn y Ffedysawd yn cael ai arddangos yn ffrwd y ffederasiwn.",
+ "introduction.federation.home.headline": "Hafan",
+ "introduction.federation.home.text": "Bydd pyst o bobl rydych yn ei ddilyn yn dangos yn eich ffrwd gatref. Gallwch dilyn unrhyw un ar unrhyw gweinydd!",
+ "introduction.federation.local.headline": "Lleol",
+ "introduction.federation.local.text": "Bydd pyst gyhoeddus o bobl ar yr un gweinydd a chi yn cael ei arddangos yn y ffrwd lleol.",
"introduction.interactions.action": "Gorffen tiwtorial!",
"introduction.interactions.favourite.headline": "Ffefryn",
- "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+ "introduction.interactions.favourite.text": "Gallwch cadw tŵt am hwyrach, a gadael i'r awdur gwybod roeddech yn ei hoffi, trwy ei hoffi.",
"introduction.interactions.reblog.headline": "Hwb",
- "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+ "introduction.interactions.reblog.text": "Gallwch rhannu tŵtiau pobl eraill gyda'ch dilynwyr trwy eu bŵstio.",
"introduction.interactions.reply.headline": "Ateb",
- "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+ "introduction.interactions.reply.text": "Gallwch ateb i dŵtiau pobl eraill a thŵtiau eich hun, a fydd yn eu cadwyno at ei gilydd mewn sgwrs.",
"introduction.welcome.action": "Awn ni!",
"introduction.welcome.headline": "Camau cyntaf",
- "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+ "introduction.welcome.text": "Croeso i'r ffedysawd! Mewn ychydig o funudau, byddwch yn gallu darlledu negeseuon a siarad i'ch ffrindiau ar draws amrywiaeth eang o weinyddion. Ond mae'r gweinydd hyn, {domain}, yn arbennig - mae o'n gweinyddu eich proffil, fellu cofiwch ei enw.",
"keyboard_shortcuts.back": "i lywio nôl",
"keyboard_shortcuts.blocked": "i agor rhestr defnyddwyr a flociwyd",
"keyboard_shortcuts.boost": "i fŵstio",
@@ -189,7 +190,7 @@
"keyboard_shortcuts.federated": "i agor ffrwd y ffederasiwn",
"keyboard_shortcuts.heading": "Llwybrau byr allweddell",
"keyboard_shortcuts.home": "i agor ffrwd cartref",
- "keyboard_shortcuts.hotkey": "Hotkey",
+ "keyboard_shortcuts.hotkey": "Bysell brys",
"keyboard_shortcuts.legend": "i ddangos yr arwr yma",
"keyboard_shortcuts.local": "i agor ffrwd lleol",
"keyboard_shortcuts.mention": "i grybwyll yr awdur",
@@ -203,17 +204,19 @@
"keyboard_shortcuts.search": "i ffocysu chwilio",
"keyboard_shortcuts.start": "i agor colofn \"dechrau arni\"",
"keyboard_shortcuts.toggle_hidden": "i ddangos/cuddio testun tu ôl i CW",
+ "keyboard_shortcuts.toggle_sensitivity": "i ddangos/gyddio cyfryngau",
"keyboard_shortcuts.toot": "i ddechrau tŵt newydd sbon",
"keyboard_shortcuts.unfocus": "i ddad-ffocysu ardal cyfansoddi testun/chwilio",
"keyboard_shortcuts.up": "i symud yn uwch yn y rhestr",
"lightbox.close": "Cau",
"lightbox.next": "Nesaf",
"lightbox.previous": "Blaenorol",
+ "lightbox.view_context": "Gweld cyd-destyn",
"lists.account.add": "Ychwanegwch at restr",
"lists.account.remove": "Dileu o'r rhestr",
"lists.delete": "Dileu rhestr",
"lists.edit": "Golygwch rhestr",
- "lists.edit.submit": "Change title",
+ "lists.edit.submit": "Newid teitl",
"lists.new.create": "Ychwanegu rhestr",
"lists.new.title_placeholder": "Teitl rhestr newydd",
"lists.search": "Chwilio ymysg pobl yr ydych yn ei ddilyn",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Ffefrynnau",
"navigation_bar.filters": "Geiriau a dawelwyd",
"navigation_bar.follow_requests": "Ceisiadau dilyn",
+ "navigation_bar.follows_and_followers": "Dilynion a ddilynwyr",
"navigation_bar.info": "Ynghylch yr achos hwn",
"navigation_bar.keyboard_shortcuts": "Bysellau brys",
"navigation_bar.lists": "Rhestrau",
@@ -242,12 +246,13 @@
"navigation_bar.personal": "Personol",
"navigation_bar.pins": "Tŵtiau wedi eu pinio",
"navigation_bar.preferences": "Dewisiadau",
+ "navigation_bar.profile_directory": "Cyfeiriadur Proffil",
"navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
"navigation_bar.security": "Diogelwch",
"notification.favourite": "hoffodd {name} eich tŵt",
"notification.follow": "dilynodd {name} chi",
"notification.mention": "Soniodd {name} amdanoch chi",
- "notification.poll": "A poll you have voted in has ended",
+ "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
"notification.reblog": "Hysbysebodd {name} eich tŵt",
"notifications.clear": "Clirio hysbysiadau",
"notifications.clear_confirmation": "Ydych chi'n sicr eich bod am glirio'ch holl hysbysiadau am byth?",
@@ -258,8 +263,8 @@
"notifications.column_settings.filter_bar.show": "Dangos",
"notifications.column_settings.follow": "Dilynwyr newydd:",
"notifications.column_settings.mention": "Crybwylliadau:",
- "notifications.column_settings.poll": "Poll results:",
- "notifications.column_settings.push": "Hysbysiadau push",
+ "notifications.column_settings.poll": "Canlyniadau pleidlais:",
+ "notifications.column_settings.push": "Hysbysiadau gwthiadwy",
"notifications.column_settings.reblog": "Hybiadau:",
"notifications.column_settings.show": "Dangos yn y golofn",
"notifications.column_settings.sound": "Chwarae sain",
@@ -268,14 +273,14 @@
"notifications.filter.favourites": "Ffefrynnau",
"notifications.filter.follows": "Yn dilyn",
"notifications.filter.mentions": "Crybwylliadau",
- "notifications.filter.polls": "Poll results",
+ "notifications.filter.polls": "Canlyniadau pleidlais",
"notifications.group": "{count} o hysbysiadau",
- "poll.closed": "Closed",
- "poll.refresh": "Refresh",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
- "poll.vote": "Vote",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
+ "poll.closed": "Ar gau",
+ "poll.refresh": "Adnewyddu",
+ "poll.total_votes": "{count, plural, one {# bleidlais} other {# o bleidleisiau}}",
+ "poll.vote": "Pleidleisio",
+ "poll_button.add_poll": "Ychwanegu pleidlais",
+ "poll_button.remove_poll": "Tynnu pleidlais",
"privacy.change": "Addasu preifatrwdd y tŵt",
"privacy.direct.long": "Cyhoeddi i'r defnyddwyr sy'n cael eu crybwyll yn unig",
"privacy.direct.short": "Uniongyrchol",
@@ -287,11 +292,11 @@
"privacy.unlisted.short": "Heb ei restru",
"regeneration_indicator.label": "Llwytho…",
"regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
- "relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
+ "relative_time.days": "{number}dydd",
+ "relative_time.hours": "{number}awr",
"relative_time.just_now": "nawr",
- "relative_time.minutes": "{number}m",
- "relative_time.seconds": "{number}s",
+ "relative_time.minutes": "{number}munud",
+ "relative_time.seconds": "{number}eiliad",
"reply_indicator.cancel": "Canslo",
"report.forward": "Ymlaen i {target}",
"report.forward_hint": "Mae'r cyfrif o weinydd arall. Anfon copi anhysbys o'r adroddiad yno hefyd?",
@@ -309,13 +314,13 @@
"search_results.accounts": "Pobl",
"search_results.hashtags": "Hanshnodau",
"search_results.statuses": "Tŵtiau",
- "search_results.total": "{count, number} {count, plural, one {result} arall {results}}",
- "status.admin_account": "Open moderation interface for @{name}",
- "status.admin_status": "Open this tŵt in the moderation interface",
+ "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+ "status.admin_account": "Agor rhyngwyneb goruwchwylio ar gyfer @{name}",
+ "status.admin_status": "Agor y tŵt yn y rhyngwyneb goruwchwylio",
"status.block": "Blocio @{name}",
"status.cancel_reblog_private": "Dadfŵstio",
"status.cannot_reblog": "Ni ellir sbarduno'r tŵt hwn",
- "status.copy": "Copy link to status",
+ "status.copy": "Copïo cysylltiad i'r tŵt",
"status.delete": "Dileu",
"status.detailed_status": "Golwg manwl o'r sgwrs",
"status.direct": "Neges breifat @{name}",
@@ -340,7 +345,6 @@
"status.reply": "Ateb",
"status.replyAll": "Ateb i edefyn",
"status.report": "Adrodd @{name}",
- "status.sensitive_toggle": "Clicio i weld",
"status.sensitive_warning": "Cynnwys sensitif",
"status.share": "Rhannu",
"status.show_less": "Dangos llai",
@@ -357,17 +361,17 @@
"tabs_bar.local_timeline": "Lleol",
"tabs_bar.notifications": "Hysbysiadau",
"tabs_bar.search": "Chwilio",
- "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
- "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
- "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
- "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+ "time_remaining.days": "{number, plural, one {# ddydd} other {# o ddyddiau}} ar ôl",
+ "time_remaining.hours": "{number, plural, one {# awr} other {# o oriau}} ar ôl",
+ "time_remaining.minutes": "{number, plural, one {# funud} other {# o funudau}} ar ôl",
+ "time_remaining.moments": "Munudau ar ôl",
+ "time_remaining.seconds": "{number, plural, one {# eiliad} other {# o eiliadau}} ar ôl",
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} yn siarad",
"ui.beforeunload": "Mi fyddwch yn colli eich drafft os gadewch Mastodon.",
"upload_area.title": "Llusgwch & gollwing i uwchlwytho",
"upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
- "upload_error.limit": "File upload limit exceeded.",
- "upload_error.poll": "File upload not allowed with polls.",
+ "upload_error.limit": "Wedi mynd heibio'r uchafswm terfyn uwchlwytho.",
+ "upload_error.poll": "Nid oes modd uwchlwytho ffeiliau â phleidleisiau.",
"upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
"upload_form.focus": "Newid rhagolwg",
"upload_form.undo": "Dileu",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 89096b29b..ba8ba7a28 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Trut",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Medie er markeret som værende følsomt",
"compose_form.sensitive.unmarked": "Mediet er ikke markeret som værende følsomt",
"compose_form.spoiler.marked": "Teksten er skjult bag en advarsel",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "for at fokusere søgningen",
"keyboard_shortcuts.start": "for at åbne \"kom igen\" kolonnen",
"keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "for at påbegynde et helt nyt trut",
"keyboard_shortcuts.unfocus": "for at fjerne fokus fra skriveområde/søgning",
"keyboard_shortcuts.up": "for at bevæge dig op ad listen",
"lightbox.close": "Luk",
"lightbox.next": "Næste",
"lightbox.previous": "Forrige",
+ "lightbox.view_context": "View context",
"lists.account.add": "Tilføj til liste",
"lists.account.remove": "Fjern fra liste",
"lists.delete": "Slet liste",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoritter",
"navigation_bar.filters": "Dæmpede ord",
"navigation_bar.follow_requests": "Følgeanmodninger",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Om denne instans",
"navigation_bar.keyboard_shortcuts": "Hurtigtast",
"navigation_bar.lists": "Lister",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personligt",
"navigation_bar.pins": "Fastgjorte trut",
"navigation_bar.preferences": "Præferencer",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Fælles tidslinje",
"navigation_bar.security": "Sikkerhed",
"notification.favourite": "{name} favoriserede din status",
@@ -340,7 +345,6 @@
"status.reply": "Svar",
"status.replyAll": "Svar samtale",
"status.report": "Anmeld @{name}",
- "status.sensitive_toggle": "Tryk for at se",
"status.sensitive_warning": "Følsomt indhold",
"status.share": "Del",
"status.show_less": "Vis mindre",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 13b8ccafa..ac8bc9b9f 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -9,7 +9,7 @@
"account.edit_profile": "Profil bearbeiten",
"account.endorse": "Auf Profil hervorheben",
"account.follow": "Folgen",
- "account.followers": "Folgende",
+ "account.followers": "Folger_innen",
"account.followers.empty": "Diesem Profil folgt noch niemand.",
"account.follows": "Folgt",
"account.follows.empty": "Dieses Profil folgt noch niemandem.",
@@ -37,7 +37,7 @@
"account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
"alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
"alert.unexpected.title": "Hoppla!",
- "boost_modal.combo": "Du kannst {combo} drücken, um dies beim nächsten Mal zu überspringen",
+ "boost_modal.combo": "Drücke {combo}, um dieses Fenster zu überspringen",
"bundle_column_error.body": "Etwas ist beim Laden schiefgelaufen.",
"bundle_column_error.retry": "Erneut versuchen",
"bundle_column_error.title": "Netzwerkfehler",
@@ -55,7 +55,7 @@
"column.mutes": "Stummgeschaltete Profile",
"column.notifications": "Mitteilungen",
"column.pins": "Angeheftete Beiträge",
- "column.public": "Gesamtes bekanntes Netz",
+ "column.public": "Föderierte Zeitleiste",
"column_back_button.label": "Zurück",
"column_header.hide_settings": "Einstellungen verbergen",
"column_header.moveLeft_settings": "Spalte nach links verschieben",
@@ -67,35 +67,36 @@
"community.column_settings.media_only": "Nur Medien",
"compose_form.direct_message_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
"compose_form.direct_message_warning_learn_more": "Mehr erfahren",
- "compose_form.hashtag_warning": "Dieser Beitrag wird nicht unter einen dieser Hashtags sichtbar sein, solange er ungelistet ist. Bei einer Suche kann er nicht gefunden werden.",
+ "compose_form.hashtag_warning": "Dieser Beitrag wird nicht durch Hashtags entdeckbar sein, weil er ungelistet ist. Nur öffentliche Beiträge tauchen in Hashtag-Zeitleisten auf.",
"compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
"compose_form.lock_disclaimer.lock": "gesperrt",
"compose_form.placeholder": "Was gibt's Neues?",
- "compose_form.poll.add_option": "Eine Auswahl hinzufügen",
+ "compose_form.poll.add_option": "Eine Wahl hinzufügen",
"compose_form.poll.duration": "Umfragedauer",
- "compose_form.poll.option_placeholder": "Auswahl {number}",
- "compose_form.poll.remove_option": "Auswahl entfernen",
+ "compose_form.poll.option_placeholder": "Wahl {number}",
+ "compose_form.poll.remove_option": "Wahl entfernen",
"compose_form.publish": "Tröt",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Medien als heikel markieren",
"compose_form.sensitive.marked": "Medien sind als heikel markiert",
"compose_form.sensitive.unmarked": "Medien sind nicht als heikel markiert",
"compose_form.spoiler.marked": "Text ist hinter einer Warnung versteckt",
"compose_form.spoiler.unmarked": "Text ist nicht versteckt",
"compose_form.spoiler_placeholder": "Inhaltswarnung",
"confirmation_modal.cancel": "Abbrechen",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Blockieren und melden",
"confirmations.block.confirm": "Blockieren",
"confirmations.block.message": "Bist du dir sicher, dass du {name} blockieren möchtest?",
"confirmations.delete.confirm": "Löschen",
"confirmations.delete.message": "Bist du dir sicher, dass du diesen Beitrag löschen möchtest?",
- "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.confirm": "Löschen",
"confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste permanent löschen möchtest?",
"confirmations.domain_block.confirm": "Die ganze Domain verbergen",
- "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} blockieren willst? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Deine Follower von dieser Domain werden entfernt.",
+ "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} blockieren willst? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Nach der Blockierung wirst du nichts mehr von dieser Domain in öffentlichen Zeitleisten oder Benachrichtigungen sehen. Deine Folger_innen von dieser Domain werden auch entfernt.",
"confirmations.mute.confirm": "Stummschalten",
"confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?",
"confirmations.redraft.confirm": "Löschen und neu erstellen",
- "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und neu machen möchtest? Favoriten und Boosts werden verloren gehen und Antworten zu diesem Beitrag werden verwaist sein.",
+ "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest? Favorisierungen, geteilte Beiträge und Antworten werden verloren gehen.",
"confirmations.reply.confirm": "Antworten",
"confirmations.reply.message": "Wenn du jetzt antwortest wird es die gesamte Nachricht verwerfen, die du gerade schreibst. Möchtest du wirklich fortfahren?",
"confirmations.unfollow.confirm": "Entfolgen",
@@ -149,9 +150,9 @@
"hashtag.column_settings.select.no_options_message": "Keine Vorschläge gefunden",
"hashtag.column_settings.select.placeholder": "Hashtags eintragen…",
"hashtag.column_settings.tag_mode.all": "All diese",
- "hashtag.column_settings.tag_mode.any": "Eine von diesen",
- "hashtag.column_settings.tag_mode.none": "Keine von diesen",
- "hashtag.column_settings.tag_toggle": "Zusätzliche Tags für diese Spalte einfügen",
+ "hashtag.column_settings.tag_mode.any": "Eins von diesen",
+ "hashtag.column_settings.tag_mode.none": "Keins von diesen",
+ "hashtag.column_settings.tag_toggle": "Zusätzliche Hashtags für diese Spalte einfügen",
"home.column_settings.basic": "Einfach",
"home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
"home.column_settings.show_replies": "Antworten anzeigen",
@@ -160,33 +161,33 @@
"intervals.full.minutes": "{number, plural, one {# Minute} other {# Minuten}}",
"introduction.federation.action": "Weiter",
"introduction.federation.federated.headline": "Föderiert",
- "introduction.federation.federated.text": "Öffentliche Beiträge von anderen Servern im Fediverse erscheinen in der föderierten Zeitleiste.",
- "introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Beiträge von Leuten, denen du folgst, erscheinen in deiner Start-Zeitleiste. Du kannst Menschen auf beliebigen Servern folgen!",
+ "introduction.federation.federated.text": "Öffentliche Beiträge von anderen Servern im Fediversum erscheinen in der föderierten Zeitleiste.",
+ "introduction.federation.home.headline": "Startseite",
+ "introduction.federation.home.text": "Beiträge von Leuten, denen du folgst, erscheinen auf deiner Startseite. Du kannst Menschen auf beliebigen Servern folgen!",
"introduction.federation.local.headline": "Lokal",
"introduction.federation.local.text": "Öffentliche Beiträge von Leuten auf demselben Server wie du erscheinen in der lokalen Zeitleiste.",
"introduction.interactions.action": "Tutorial beenden!",
"introduction.interactions.favourite.headline": "Favorisieren",
- "introduction.interactions.favourite.text": "Du kannst Beitrage für später speichern und ihre AutorInnen wissen lassen, dass sie dir gefallen haben, indem du sie favorisierst.",
+ "introduction.interactions.favourite.text": "Du kannst Beitrage für später speichern und ihre Autor_innen wissen lassen, dass sie dir gefallen haben, indem du sie favorisierst.",
"introduction.interactions.reblog.headline": "Teilen",
- "introduction.interactions.reblog.text": "Du kannst Beiträge anderer mit deinen Followern teilen, indem du sie boostest.",
+ "introduction.interactions.reblog.text": "Du kannst Beiträge anderer mit deinen Followern teilen, indem du sie teilst.",
"introduction.interactions.reply.headline": "Antworten",
- "introduction.interactions.reply.text": "Du kannst auf die Beiträge anderer antworten und die Beiträge werden dann in einer Unterhaltung zusammengefasst.",
+ "introduction.interactions.reply.text": "Du kannst auf die Beiträge anderer antworten. Diese Beiträge werden dann in einer Konversation zusammengefasst.",
"introduction.welcome.action": "Lass uns loslegen!",
"introduction.welcome.headline": "Erste Schritte",
- "introduction.welcome.text": "Willkommen im Fediverse! In wenigen Momenten wirst du in der Lage sein Nachrichten zu versenden und mit deinen Freunden über Server hinweg in Kontakt zu treten. Aber dieser Server, {domain}, ist sehr speziell — er hostet dein Profil, also merke dir den Namen.",
+ "introduction.welcome.text": "Willkommen im Fediversum! In wenigen Momenten wirst du in der Lage sein Nachrichten zu versenden und mit deinen Freunden von anderen Servern in Kontakt zu treten. Aber dieser Server, {domain}, ist für dich sehr speziell — er hostet dein Profil, also merke dir die Domain.",
"keyboard_shortcuts.back": "zurück navigieren",
"keyboard_shortcuts.blocked": "Liste blockierter Profile öffnen",
"keyboard_shortcuts.boost": "teilen",
- "keyboard_shortcuts.column": "einen Status in einer der Spalten fokussieren",
+ "keyboard_shortcuts.column": "einen Beitrag in einer der Spalten fokussieren",
"keyboard_shortcuts.compose": "fokussiere das Eingabefeld",
"keyboard_shortcuts.description": "Beschreibung",
"keyboard_shortcuts.direct": "Direct-Message-Spalte öffnen",
"keyboard_shortcuts.down": "sich in der Liste hinunter bewegen",
- "keyboard_shortcuts.enter": "Status öffnen",
+ "keyboard_shortcuts.enter": "Beitrag öffnen",
"keyboard_shortcuts.favourite": "um zu favorisieren",
"keyboard_shortcuts.favourites": "Favoriten-Liste öffnen",
- "keyboard_shortcuts.federated": "Förderierte Zeitleiste öffnen",
+ "keyboard_shortcuts.federated": "Föderierte Zeitleiste öffnen",
"keyboard_shortcuts.heading": "Tastenkombinationen",
"keyboard_shortcuts.home": "Startseite öffnen",
"keyboard_shortcuts.hotkey": "Tastenkürzel",
@@ -199,19 +200,21 @@
"keyboard_shortcuts.pinned": "Liste angehefteter Beiträge öffnen",
"keyboard_shortcuts.profile": "Profil des Autors öffnen",
"keyboard_shortcuts.reply": "antworten",
- "keyboard_shortcuts.requests": "Liste der Folge-Anfragen öffnen",
+ "keyboard_shortcuts.requests": "Liste der Folge-Anfragen öffnen",
"keyboard_shortcuts.search": "Suche fokussieren",
- "keyboard_shortcuts.start": "\"Erste Schritte-Spalte öffnen",
+ "keyboard_shortcuts.start": "\"Erste Schritte\"-Spalte öffnen",
"keyboard_shortcuts.toggle_hidden": "Text hinter einer Inhaltswarnung verstecken/anzeigen",
- "keyboard_shortcuts.toot": "einen neuen Toot beginnen",
+ "keyboard_shortcuts.toggle_sensitivity": "Medien hinter einer Inhaltswarnung verstecken/anzeigen",
+ "keyboard_shortcuts.toot": "einen neuen Beitrag beginnen",
"keyboard_shortcuts.unfocus": "Textfeld/die Suche nicht mehr fokussieren",
"keyboard_shortcuts.up": "sich in der Liste hinauf bewegen",
"lightbox.close": "Schließen",
"lightbox.next": "Weiter",
"lightbox.previous": "Zurück",
+ "lightbox.view_context": "Beitrag sehen",
"lists.account.add": "Zur Liste hinzufügen",
"lists.account.remove": "Von der Liste entfernen",
- "lists.delete": "Delete list",
+ "lists.delete": "Liste löschen",
"lists.edit": "Liste bearbeiten",
"lists.edit.submit": "Titel ändern",
"lists.new.create": "Liste hinzufügen",
@@ -234,14 +237,16 @@
"navigation_bar.favourites": "Favoriten",
"navigation_bar.filters": "Stummgeschaltene Wörter",
"navigation_bar.follow_requests": "Folgeanfragen",
+ "navigation_bar.follows_and_followers": "Folger_innen und Gefolgte",
"navigation_bar.info": "Über diesen Server",
"navigation_bar.keyboard_shortcuts": "Tastenkombinationen",
"navigation_bar.lists": "Listen",
"navigation_bar.logout": "Abmelden",
"navigation_bar.mutes": "Stummgeschaltete Profile",
- "navigation_bar.personal": "Personal",
+ "navigation_bar.personal": "Persönlich",
"navigation_bar.pins": "Angeheftete Beiträge",
"navigation_bar.preferences": "Einstellungen",
+ "navigation_bar.profile_directory": "Profilverzeichnis",
"navigation_bar.public_timeline": "Föderierte Zeitleiste",
"navigation_bar.security": "Sicherheit",
"notification.favourite": "{name} hat deinen Beitrag favorisiert",
@@ -256,17 +261,17 @@
"notifications.column_settings.filter_bar.advanced": "Zeige alle Kategorien an",
"notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
"notifications.column_settings.filter_bar.show": "Anzeigen",
- "notifications.column_settings.follow": "Neue Folgende:",
+ "notifications.column_settings.follow": "Neue Folger_innen:",
"notifications.column_settings.mention": "Erwähnungen:",
- "notifications.column_settings.poll": "Ergebnisse der Umfrage:",
+ "notifications.column_settings.poll": "Ergebnisse von Umfragen:",
"notifications.column_settings.push": "Push-Benachrichtigungen",
"notifications.column_settings.reblog": "Geteilte Beiträge:",
"notifications.column_settings.show": "In der Spalte anzeigen",
"notifications.column_settings.sound": "Ton abspielen",
"notifications.filter.all": "Alle",
- "notifications.filter.boosts": "Erneut geteilte Beiträge",
- "notifications.filter.favourites": "Favoriten",
- "notifications.filter.follows": "Folgende",
+ "notifications.filter.boosts": "Geteilte Beiträge",
+ "notifications.filter.favourites": "Favorisierungen",
+ "notifications.filter.follows": "Folger_innen",
"notifications.filter.mentions": "Erwähnungen",
"notifications.filter.polls": "Ergebnisse der Umfrage",
"notifications.group": "{count} Benachrichtigungen",
@@ -277,16 +282,16 @@
"poll_button.add_poll": "Eine Umfrage erstellen",
"poll_button.remove_poll": "Umfrage entfernen",
"privacy.change": "Sichtbarkeit des Beitrags anpassen",
- "privacy.direct.long": "Beitrag nur an erwähnte Profile",
- "privacy.direct.short": "Direkt",
- "privacy.private.long": "Beitrag nur an Folgende",
- "privacy.private.short": "Nur Folgende",
- "privacy.public.long": "Beitrag an öffentliche Zeitleisten",
+ "privacy.direct.long": "Wird an erwähnte Profile gesendet",
+ "privacy.direct.short": "Direktnachricht",
+ "privacy.private.long": "Wird nur für deine Folger_innen sichtbar sein",
+ "privacy.private.short": "Nur für Folger_innen",
+ "privacy.public.long": "Wird in öffentlichen Zeitleisten erscheinen",
"privacy.public.short": "Öffentlich",
- "privacy.unlisted.long": "Nicht in öffentlichen Zeitleisten anzeigen",
+ "privacy.unlisted.long": "Wird in öffentlichen Zeitleisten nicht gezeigt",
"privacy.unlisted.short": "Nicht gelistet",
"regeneration_indicator.label": "Laden…",
- "regeneration_indicator.sublabel": "Deine Heimzeitleiste wird gerade vorbereitet!",
+ "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!",
"relative_time.days": "{number}d",
"relative_time.hours": "{number}h",
"relative_time.just_now": "jetzt",
@@ -301,21 +306,21 @@
"report.target": "{target} melden",
"search.placeholder": "Suche",
"search_popout.search_format": "Fortgeschrittenes Suchformat",
- "search_popout.tips.full_text": "Simpler Text gibt Beiträge, die du geschrieben, favorisiert und geteilt hast zurück. Außerdem auch Beiträge in denen du erwähnt wurdest, als auch passende Nutzernamen, Anzeigenamen oder Hashtags.",
+ "search_popout.tips.full_text": "Einfache Texteingabe gibt Beiträge, die du geschrieben, favorisiert und geteilt hast zurück. Außerdem auch Beiträge in denen du erwähnt wurdest, aber auch passende Nutzernamen, Anzeigenamen oder Hashtags.",
"search_popout.tips.hashtag": "Hashtag",
- "search_popout.tips.status": "status",
- "search_popout.tips.text": "Einfacher Text gibt Anzeigenamen, Benutzernamen und Hashtags zurück",
+ "search_popout.tips.status": "Beitrag",
+ "search_popout.tips.text": "Einfache Texteingabe gibt Anzeigenamen, Benutzernamen und Hashtags zurück",
"search_popout.tips.user": "Nutzer",
"search_results.accounts": "Personen",
"search_results.hashtags": "Hashtags",
"search_results.statuses": "Beiträge",
"search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}",
"status.admin_account": "Öffne Moderationsoberfläche für @{name}",
- "status.admin_status": "Öffne diesen Status in der Moderationsoberfläche",
+ "status.admin_status": "Öffne Beitrag in der Moderationsoberfläche",
"status.block": "Blockiere @{name}",
"status.cancel_reblog_private": "Nicht mehr teilen",
"status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
- "status.copy": "Kopiere Link zum Status",
+ "status.copy": "Kopiere Link zum Beitrag",
"status.delete": "Löschen",
"status.detailed_status": "Detaillierte Ansicht der Konversation",
"status.direct": "Direktnachricht @{name}",
@@ -327,49 +332,48 @@
"status.mention": "@{name} erwähnen",
"status.more": "Mehr",
"status.mute": "@{name} stummschalten",
- "status.mute_conversation": "Thread stummschalten",
+ "status.mute_conversation": "Konversation stummschalten",
"status.open": "Diesen Beitrag öffnen",
"status.pin": "Im Profil anheften",
"status.pinned": "Angehefteter Beitrag",
"status.read_more": "Mehr lesen",
"status.reblog": "Teilen",
- "status.reblog_private": "An das eigentliche Publikum teilen",
+ "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
"status.reblogged_by": "{name} teilte",
- "status.reblogs.empty": "Diesen Beitrag hat noch niemand geteilt. Sobald es jemand tut, wird die Person hier angezeigt.",
+ "status.reblogs.empty": "Diesen Beitrag hat noch niemand geteilt. Sobald es jemand tut, wird diese Person hier angezeigt.",
"status.redraft": "Löschen und neu erstellen",
"status.reply": "Antworten",
- "status.replyAll": "Auf Thread antworten",
+ "status.replyAll": "Allen antworten",
"status.report": "@{name} melden",
- "status.sensitive_toggle": "Zum Ansehen klicken",
"status.sensitive_warning": "Heikle Inhalte",
"status.share": "Teilen",
"status.show_less": "Weniger anzeigen",
- "status.show_less_all": "Zeige weniger für alles",
+ "status.show_less_all": "Alle Inhaltswarnungen zuklappen",
"status.show_more": "Mehr anzeigen",
- "status.show_more_all": "Zeige mehr für alles",
- "status.show_thread": "Zeige Thread",
- "status.unmute_conversation": "Stummschaltung von Thread aufheben",
+ "status.show_more_all": "Alle Inhaltswarnungen aufklappen",
+ "status.show_thread": "Zeige Konversation",
+ "status.unmute_conversation": "Stummschaltung von Konversation aufheben",
"status.unpin": "Vom Profil lösen",
- "suggestions.dismiss": "Hinweis ausblenden",
- "suggestions.header": "Du bist vielleicht interessiert in…",
+ "suggestions.dismiss": "Empfehlung ausblenden",
+ "suggestions.header": "Du bist vielleicht interessiert an…",
"tabs_bar.federated_timeline": "Föderation",
"tabs_bar.home": "Startseite",
"tabs_bar.local_timeline": "Lokal",
"tabs_bar.notifications": "Mitteilungen",
- "tabs_bar.search": "Suchen",
+ "tabs_bar.search": "Suche",
"time_remaining.days": "{number, plural, one {# Tag} other {# Tage}} verbleibend",
"time_remaining.hours": "{number, plural, one {# Stunde} other {# Stunden}} verbleibend",
"time_remaining.minutes": "{number, plural, one {# Minute} other {# Minuten}} verbleibend",
- "time_remaining.moments": "Momente verbleibend",
+ "time_remaining.moments": "Schließt in Kürze",
"time_remaining.seconds": "{number, plural, one {# Sekunde} other {# Sekunden}} verbleibend",
"trends.count_by_accounts": "{count} {rawCount, plural, eine {Person} other {Personen}} reden darüber",
"ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",
"upload_area.title": "Zum Hochladen hereinziehen",
- "upload_button.label": "Mediendatei hinzufügen (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_button.label": "Mediendatei hinzufügen ({formats})",
"upload_error.limit": "Dateiupload-Limit erreicht.",
"upload_error.poll": "Dateiuploads sind in Kombination mit Umfragen nicht erlaubt.",
"upload_form.description": "Für Menschen mit Sehbehinderung beschreiben",
- "upload_form.focus": "Thumbnail bearbeiten",
+ "upload_form.focus": "Vorschaubild bearbeiten",
"upload_form.undo": "Löschen",
"upload_progress.label": "Wird hochgeladen …",
"video.close": "Video schließen",
@@ -378,7 +382,7 @@
"video.fullscreen": "Vollbild",
"video.hide": "Video verbergen",
"video.mute": "Stummschalten",
- "video.pause": "Pause",
+ "video.pause": "Pausieren",
"video.play": "Abspielen",
"video.unmute": "Ton einschalten"
}
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index e7b4b479a..4df299d84 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -180,10 +180,6 @@
{
"defaultMessage": "Media hidden",
"id": "status.media_hidden"
- },
- {
- "defaultMessage": "Click to view",
- "id": "status.sensitive_toggle"
}
],
"path": "app/javascript/mastodon/components/media_gallery.json"
@@ -1055,7 +1051,7 @@
{
"descriptors": [
{
- "defaultMessage": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "defaultMessage": "Add media ({formats})",
"id": "upload_button.label"
}
],
@@ -1096,6 +1092,10 @@
{
"defaultMessage": "Media is not marked as sensitive",
"id": "compose_form.sensitive.unmarked"
+ },
+ {
+ "defaultMessage": "Mark media as sensitive",
+ "id": "compose_form.sensitive.hide"
}
],
"path": "app/javascript/mastodon/features/compose/containers/sensitive_button_container.json"
@@ -1356,46 +1356,6 @@
{
"defaultMessage": "Profile directory",
"id": "getting_started.directory"
- },
- {
- "defaultMessage": "Invite people",
- "id": "getting_started.invite"
- },
- {
- "defaultMessage": "Hotkeys",
- "id": "navigation_bar.keyboard_shortcuts"
- },
- {
- "defaultMessage": "Security",
- "id": "getting_started.security"
- },
- {
- "defaultMessage": "About this server",
- "id": "navigation_bar.info"
- },
- {
- "defaultMessage": "Mobile apps",
- "id": "navigation_bar.apps"
- },
- {
- "defaultMessage": "Terms of service",
- "id": "getting_started.terms"
- },
- {
- "defaultMessage": "Developers",
- "id": "getting_started.developers"
- },
- {
- "defaultMessage": "Documentation",
- "id": "getting_started.documentation"
- },
- {
- "defaultMessage": "Logout",
- "id": "navigation_bar.logout"
- },
- {
- "defaultMessage": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
- "id": "getting_started.open_source_notice"
}
],
"path": "app/javascript/mastodon/features/getting_started/index.json"
@@ -1599,6 +1559,10 @@
"defaultMessage": "to show/hide text behind CW",
"id": "keyboard_shortcuts.toggle_hidden"
},
+ {
+ "defaultMessage": "to show/hide media",
+ "id": "keyboard_shortcuts.toggle_sensitivity"
+ },
{
"defaultMessage": "to move up in the list",
"id": "keyboard_shortcuts.up"
@@ -2156,6 +2120,10 @@
},
{
"descriptors": [
+ {
+ "defaultMessage": "Unboost",
+ "id": "status.cancel_reblog_private"
+ },
{
"defaultMessage": "Boost",
"id": "status.reblog"
@@ -2236,6 +2204,60 @@
],
"path": "app/javascript/mastodon/features/ui/components/embed_modal.json"
},
+ {
+ "descriptors": [
+ {
+ "defaultMessage": "Follow requests",
+ "id": "navigation_bar.follow_requests"
+ }
+ ],
+ "path": "app/javascript/mastodon/features/ui/components/follow_requests_nav_link.json"
+ },
+ {
+ "descriptors": [
+ {
+ "defaultMessage": "Invite people",
+ "id": "getting_started.invite"
+ },
+ {
+ "defaultMessage": "Hotkeys",
+ "id": "navigation_bar.keyboard_shortcuts"
+ },
+ {
+ "defaultMessage": "Security",
+ "id": "getting_started.security"
+ },
+ {
+ "defaultMessage": "About this server",
+ "id": "navigation_bar.info"
+ },
+ {
+ "defaultMessage": "Mobile apps",
+ "id": "navigation_bar.apps"
+ },
+ {
+ "defaultMessage": "Terms of service",
+ "id": "getting_started.terms"
+ },
+ {
+ "defaultMessage": "Developers",
+ "id": "getting_started.developers"
+ },
+ {
+ "defaultMessage": "Documentation",
+ "id": "getting_started.documentation"
+ },
+ {
+ "defaultMessage": "Logout",
+ "id": "navigation_bar.logout"
+ },
+ {
+ "defaultMessage": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+ "id": "getting_started.open_source_notice"
+ }
+ ],
+ "path": "app/javascript/mastodon/features/ui/components/link_footer.json"
+ },
{
"descriptors": [
{
@@ -2249,6 +2271,10 @@
{
"defaultMessage": "Next",
"id": "lightbox.next"
+ },
+ {
+ "defaultMessage": "View context",
+ "id": "lightbox.view_context"
}
],
"path": "app/javascript/mastodon/features/ui/components/media_modal.json"
@@ -2274,6 +2300,51 @@
],
"path": "app/javascript/mastodon/features/ui/components/mute_modal.json"
},
+ {
+ "descriptors": [
+ {
+ "defaultMessage": "Home",
+ "id": "tabs_bar.home"
+ },
+ {
+ "defaultMessage": "Notifications",
+ "id": "tabs_bar.notifications"
+ },
+ {
+ "defaultMessage": "Local",
+ "id": "tabs_bar.local_timeline"
+ },
+ {
+ "defaultMessage": "Federated",
+ "id": "tabs_bar.federated_timeline"
+ },
+ {
+ "defaultMessage": "Direct messages",
+ "id": "navigation_bar.direct"
+ },
+ {
+ "defaultMessage": "Favourites",
+ "id": "navigation_bar.favourites"
+ },
+ {
+ "defaultMessage": "Lists",
+ "id": "navigation_bar.lists"
+ },
+ {
+ "defaultMessage": "Preferences",
+ "id": "navigation_bar.preferences"
+ },
+ {
+ "defaultMessage": "Follows and followers",
+ "id": "navigation_bar.follows_and_followers"
+ },
+ {
+ "defaultMessage": "Profile directory",
+ "id": "navigation_bar.profile_directory"
+ }
+ ],
+ "path": "app/javascript/mastodon/features/ui/components/navigation_panel.json"
+ },
{
"descriptors": [
{
@@ -2341,6 +2412,15 @@
],
"path": "app/javascript/mastodon/features/ui/components/upload_area.json"
},
+ {
+ "descriptors": [
+ {
+ "defaultMessage": "View context",
+ "id": "lightbox.view_context"
+ }
+ ],
+ "path": "app/javascript/mastodon/features/ui/components/video_modal.json"
+ },
{
"descriptors": [
{
@@ -2395,10 +2475,6 @@
{
"defaultMessage": "Media hidden",
"id": "status.media_hidden"
- },
- {
- "defaultMessage": "Click to view",
- "id": "status.sensitive_toggle"
}
],
"path": "app/javascript/mastodon/features/video/index.json"
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 69c0dcbad..e118e427b 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -1,7 +1,7 @@
{
- "account.add_or_remove_from_list": "Προσθήκη ή αφαίρεση από λίστες",
+ "account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
"account.badges.bot": "Μποτ",
- "account.block": "Απόκλεισε τον/την @{name}",
+ "account.block": "Αποκλισμός @{name}",
"account.block_domain": "Απόκρυψε τα πάντα από το {domain}",
"account.blocked": "Αποκλεισμένος/η",
"account.direct": "Προσωπικό μήνυμα προς @{name}",
@@ -15,25 +15,25 @@
"account.follows.empty": "Αυτός ο χρήστης δεν ακολουθεί κανέναν ακόμα.",
"account.follows_you": "Σε ακολουθεί",
"account.hide_reblogs": "Απόκρυψη προωθήσεων από @{name}",
- "account.link_verified_on": "Η ιδιοκτησία αυτού του συνδέσμου εκλέχθηκε την {date}",
+ "account.link_verified_on": "Η ιδιοκτησία αυτού του συνδέσμου ελέχθηκε την {date}",
"account.locked_info": "Η κατάσταση απορρήτου αυτού του λογαριασμού είναι κλειδωμένη. Ο ιδιοκτήτης επιβεβαιώνει χειροκίνητα ποιος μπορεί να τον ακολουθήσει.",
"account.media": "Πολυμέσα",
"account.mention": "Ανάφερε @{name}",
"account.moved_to": "{name} μεταφέρθηκε στο:",
- "account.mute": "Σώπασε τον/την @{name}",
- "account.mute_notifications": "Σώπασε τις ειδοποιήσεις από τον/την @{name}",
+ "account.mute": "Σώπασε @{name}",
+ "account.mute_notifications": "Σώπασε τις ειδοποιήσεις από @{name}",
"account.muted": "Αποσιωπημένος/η",
"account.posts": "Τουτ",
"account.posts_with_replies": "Τουτ και απαντήσεις",
- "account.report": "Κατάγγειλε τον/την @{name}",
+ "account.report": "Κατάγγειλε @{name}",
"account.requested": "Εκκρεμεί έγκριση. Κάνε κλικ για να ακυρώσεις το αίτημα παρακολούθησης",
- "account.share": "Μοιράσου το προφίλ του/της @{name}",
- "account.show_reblogs": "Δείξε τις προωθήσεις του/της @{name}",
- "account.unblock": "Ξεμπλόκαρε τον/την @{name}",
+ "account.share": "Μοίρασμα του προφίλ @{name}",
+ "account.show_reblogs": "Εμφάνιση προωθήσεων από @{name}",
+ "account.unblock": "Ξεμπλόκαρε @{name}",
"account.unblock_domain": "Αποκάλυψε το {domain}",
"account.unendorse": "Άνευ προβολής στο προφίλ",
"account.unfollow": "Διακοπή παρακολούθησης",
- "account.unmute": "Διακοπή αποσιώπησης του/της @{name}",
+ "account.unmute": "Διακοπή αποσιώπησης @{name}",
"account.unmute_notifications": "Διακοπή αποσιώπησης ειδοποιήσεων του/της @{name}",
"alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
"alert.unexpected.title": "Εεπ!",
@@ -41,8 +41,8 @@
"bundle_column_error.body": "Κάτι πήγε στραβά ενώ φορτωνόταν αυτό το στοιχείο.",
"bundle_column_error.retry": "Δοκίμασε ξανά",
"bundle_column_error.title": "Σφάλμα δικτύου",
- "bundle_modal_error.close": "Κλείσε",
- "bundle_modal_error.message": "Κάτι πήγε στραβά ενώ φορτωνόταν αυτό το στοιχείο.",
+ "bundle_modal_error.close": "Κλείσιμο",
+ "bundle_modal_error.message": "Κάτι πήγε στραβά κατά τη φόρτωση του στοιχείου.",
"bundle_modal_error.retry": "Δοκίμασε ξανά",
"column.blocks": "Αποκλεισμένοι χρήστες",
"column.community": "Τοπική ροή",
@@ -69,7 +69,7 @@
"compose_form.direct_message_warning_learn_more": "Μάθετε περισσότερα",
"compose_form.hashtag_warning": "Αυτό το τουτ δεν θα εμφανίζεται κάτω από κανένα hashtag καθώς είναι αφανές. Μόνο τα δημόσια τουτ μπορούν να αναζητηθούν ανά hashtag.",
"compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σας προς τους ακολούθους σας.",
- "compose_form.lock_disclaimer.lock": "κλειδωμένος",
+ "compose_form.lock_disclaimer.lock": "κλειδωμένο",
"compose_form.placeholder": "Τι σκέφτεσαι;",
"compose_form.poll.add_option": "Προσθήκη επιλογής",
"compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
@@ -77,23 +77,24 @@
"compose_form.poll.remove_option": "Αφαίρεση επιλογής",
"compose_form.publish": "Τουτ",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Σημείωσε τα πολυμέσα ως ευαίσθητα",
"compose_form.sensitive.marked": "Το πολυμέσο έχει σημειωθεί ως ευαίσθητο",
"compose_form.sensitive.unmarked": "Το πολυμέσο δεν έχει σημειωθεί ως ευαίσθητο",
"compose_form.spoiler.marked": "Κείμενο κρυμμένο πίσω από προειδοποίηση",
"compose_form.spoiler.unmarked": "Μη κρυμμένο κείμενο",
"compose_form.spoiler_placeholder": "Γράψε την προειδοποίησή σου εδώ",
"confirmation_modal.cancel": "Άκυρο",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Αποκλεισμός & Καταγγελία",
"confirmations.block.confirm": "Απόκλεισε",
- "confirmations.block.message": "Σίγουρα θες να αποκλείσεις τον/την {name};",
+ "confirmations.block.message": "Σίγουρα θες να αποκλείσεις {name};",
"confirmations.delete.confirm": "Διέγραψε",
- "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή την κατάσταση;",
+ "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή τη δημοσίευση;",
"confirmations.delete_list.confirm": "Διέγραψε",
"confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
"confirmations.domain_block.confirm": "Απόκρυψη ολόκληρου του τομέα",
"confirmations.domain_block.message": "Σίγουρα θες να μπλοκάρεις ολόκληρο το {domain}; Συνήθως μερικά εστιασμένα μπλοκ ή αποσιωπήσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον κόμβο σε καμία δημόσια ροή, ούτε στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον κόμβο θα αφαιρεθούν.",
"confirmations.mute.confirm": "Αποσιώπηση",
- "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις τον/την {name};",
+ "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις {name};",
"confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
"confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την κατάσταση και να την ξαναγράψεις; Οι αναφορές και τα αγαπημένα της θα χαθούν ενώ οι απαντήσεις προς αυτή θα μείνουν ορφανές.",
"confirmations.reply.confirm": "Απάντησε",
@@ -148,7 +149,7 @@
"hashtag.column_header.tag_mode.none": "χωρίς {additional}",
"hashtag.column_settings.select.no_options_message": "Δεν βρέθηκαν προτάσεις",
"hashtag.column_settings.select.placeholder": "Γράψε μερικές ταμπέλες…",
- "hashtag.column_settings.tag_mode.all": "Όλα αυτα",
+ "hashtag.column_settings.tag_mode.all": "Όλα αυτά",
"hashtag.column_settings.tag_mode.any": "Οποιοδήποτε από αυτά",
"hashtag.column_settings.tag_mode.none": "Κανένα από αυτά",
"hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "εστίαση αναζήτησης",
"keyboard_shortcuts.start": "άνοιγμα κολώνας \"Ξεκινώντας\"",
"keyboard_shortcuts.toggle_hidden": "εμφάνιση/απόκρυψη κειμένου πίσω από την προειδοποίηση",
+ "keyboard_shortcuts.toggle_sensitivity": "εμφάνιση/απόκρυψη πολυμέσων",
"keyboard_shortcuts.toot": "δημιουργία νέου τουτ",
"keyboard_shortcuts.unfocus": "απο-εστίαση του πεδίου σύνθεσης/αναζήτησης",
"keyboard_shortcuts.up": "κίνηση προς την κορυφή της λίστας",
"lightbox.close": "Κλείσιμο",
"lightbox.next": "Επόμενο",
"lightbox.previous": "Προηγούμενο",
+ "lightbox.view_context": "Εμφάνιση πλαισίου",
"lists.account.add": "Πρόσθεσε στη λίστα",
"lists.account.remove": "Βγάλε από τη λίστα",
"lists.delete": "Διαγραφή λίστας",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Αγαπημένα",
"navigation_bar.filters": "Αποσιωπημένες λέξεις",
"navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
+ "navigation_bar.follows_and_followers": "Ακολουθεί και ακολουθείται",
"navigation_bar.info": "Πληροφορίες κόμβου",
"navigation_bar.keyboard_shortcuts": "Συντομεύσεις",
"navigation_bar.lists": "Λίστες",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Προσωπικά",
"navigation_bar.pins": "Καρφιτσωμένα τουτ",
"navigation_bar.preferences": "Προτιμήσεις",
+ "navigation_bar.profile_directory": "Κατάλογος λογαριασμών",
"navigation_bar.public_timeline": "Ομοσπονδιακή ροή",
"navigation_bar.security": "Ασφάλεια",
"notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου",
@@ -340,7 +345,6 @@
"status.reply": "Απάντησε",
"status.replyAll": "Απάντησε στην συζήτηση",
"status.report": "Κατάγγειλε @{name}",
- "status.sensitive_toggle": "Κλικ για να δεις",
"status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
"status.share": "Μοιράσου",
"status.show_less": "Δείξε λιγότερα",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index baed4939c..67e1e01f8 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
"lightbox.close": "Close",
"lightbox.next": "Next",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favourites",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "About this server",
"navigation_bar.keyboard_shortcuts": "Hotkeys",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Pinned toots",
"navigation_bar.preferences": "Preferences",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.security": "Security",
"notification.favourite": "{name} favourited your status",
@@ -340,7 +345,6 @@
"status.reply": "Reply",
"status.replyAll": "Reply to thread",
"status.report": "Report @{name}",
- "status.sensitive_toggle": "Click to view",
"status.sensitive_warning": "Sensitive content",
"status.share": "Share",
"status.show_less": "Show less",
@@ -365,7 +369,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
"upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_button.label": "Add media ({formats})",
"upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 740f2bfae..897cb6353 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Forigi ĉi tiu elekton",
"compose_form.publish": "Hup",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Marki aŭdovidaĵojn kiel tiklaj",
"compose_form.sensitive.marked": "Aŭdovidaĵo markita tikla",
"compose_form.sensitive.unmarked": "Aŭdovidaĵo ne markita tikla",
"compose_form.spoiler.marked": "Teksto kaŝita malantaŭ averto",
@@ -117,7 +118,7 @@
"emoji_button.symbols": "Simboloj",
"emoji_button.travel": "Vojaĝoj kaj lokoj",
"empty_column.account_timeline": "Neniu mesaĝo ĉi tie!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_unavailable": "Profilo ne disponebla",
"empty_column.blocks": "Vi ankoraŭ ne blokis uzanton.",
"empty_column.community": "La loka tempolinio estas malplena. Skribu ion por plenigi ĝin!",
"empty_column.direct": "Vi ankoraŭ ne havas rektan mesaĝon. Kiam vi sendos aŭ ricevos iun, ĝi aperos ĉi tie.",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "por fokusigi la serĉilon",
"keyboard_shortcuts.start": "por malfermi la kolumnon «por komenci»",
"keyboard_shortcuts.toggle_hidden": "por montri/kaŝi tekston malantaŭ enhava averto",
+ "keyboard_shortcuts.toggle_sensitivity": "por montri/kaŝi aŭdovidaĵojn",
"keyboard_shortcuts.toot": "por komenci tute novan mesaĝon",
"keyboard_shortcuts.unfocus": "por malfokusigi la tekstujon aŭ la serĉilon",
"keyboard_shortcuts.up": "por iri supren en la listo",
"lightbox.close": "Fermi",
"lightbox.next": "Sekva",
"lightbox.previous": "Antaŭa",
+ "lightbox.view_context": "Vidi kontekston",
"lists.account.add": "Aldoni al la listo",
"lists.account.remove": "Forigi de la listo",
"lists.delete": "Forigi la liston",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Stelumoj",
"navigation_bar.filters": "Silentigitaj vortoj",
"navigation_bar.follow_requests": "Petoj de sekvado",
+ "navigation_bar.follows_and_followers": "Sekvatoj kaj sekvantoj",
"navigation_bar.info": "Pri ĉi tiu servilo",
"navigation_bar.keyboard_shortcuts": "Rapidklavoj",
"navigation_bar.lists": "Listoj",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Persone",
"navigation_bar.pins": "Alpinglitaj mesaĝoj",
"navigation_bar.preferences": "Preferoj",
+ "navigation_bar.profile_directory": "Profilujo",
"navigation_bar.public_timeline": "Fratara tempolinio",
"navigation_bar.security": "Sekureco",
"notification.favourite": "{name} stelumis vian mesaĝon",
@@ -340,7 +345,6 @@
"status.reply": "Respondi",
"status.replyAll": "Respondi al la fadeno",
"status.report": "Signali @{name}",
- "status.sensitive_toggle": "Alklaki por vidi",
"status.sensitive_warning": "Tikla enhavo",
"status.share": "Diskonigi",
"status.show_less": "Malgrandigi",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 158a116d0..8fe50ace5 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -1,5 +1,5 @@
{
- "account.add_or_remove_from_list": "Add or Remove from lists",
+ "account.add_or_remove_from_list": "Agregar o eliminar de las listas",
"account.badges.bot": "Bot",
"account.block": "Bloquear",
"account.block_domain": "Ocultar todo de {domain}",
@@ -15,9 +15,9 @@
"account.follows.empty": "Este usuario todavía no sigue a nadie.",
"account.follows_you": "Te sigue",
"account.hide_reblogs": "Ocultar retoots de @{name}",
- "account.link_verified_on": "Ownership of this link was checked on {date}",
- "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
- "account.media": "Media",
+ "account.link_verified_on": "El proprietario de este link fue verificado el {date}",
+ "account.locked_info": "El estado de privacidad de esta cuenta està configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
+ "account.media": "Multimedia",
"account.mention": "Mencionar a @{name}",
"account.moved_to": "{name} se ha mudado a:",
"account.mute": "Silenciar a @{name}",
@@ -36,7 +36,7 @@
"account.unmute": "Dejar de silenciar a @{name}",
"account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
"alert.unexpected.message": "Hubo un error inesperado.",
- "alert.unexpected.title": "Oops!",
+ "alert.unexpected.title": "¡Ups!",
"boost_modal.combo": "Puedes presionar {combo} para saltear este aviso la próxima vez",
"bundle_column_error.body": "Algo salió mal al cargar este componente.",
"bundle_column_error.retry": "Inténtalo de nuevo",
@@ -71,24 +71,25 @@
"compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
"compose_form.lock_disclaimer.lock": "bloqueado",
"compose_form.placeholder": "¿En qué estás pensando?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "Añadir una opción",
+ "compose_form.poll.duration": "Duración de la encuesta",
+ "compose_form.poll.option_placeholder": "Elección {number}",
+ "compose_form.poll.remove_option": "Eliminar esta opción",
"compose_form.publish": "Tootear",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Marcar multimedia como sensible",
"compose_form.sensitive.marked": "Material marcado como sensible",
"compose_form.sensitive.unmarked": "Material no marcado como sensible",
"compose_form.spoiler.marked": "Texto oculto tras la advertencia",
"compose_form.spoiler.unmarked": "Texto no oculto",
"compose_form.spoiler_placeholder": "Advertencia de contenido",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Bloquear y Reportar",
"confirmations.block.confirm": "Bloquear",
"confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
"confirmations.delete.confirm": "Eliminar",
"confirmations.delete.message": "¿Estás seguro de que quieres borrar este toot?",
- "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.confirm": "Eliminar",
"confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
"confirmations.domain_block.confirm": "Ocultar dominio entero",
"confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
@@ -96,7 +97,7 @@
"confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
"confirmations.redraft.confirm": "Borrar y volver a borrador",
"confirmations.redraft.message": "Estás seguro de que quieres borrar este estado y volverlo a borrador? Perderás todas las respuestas, impulsos y favoritos asociados a él, y las respuestas a la publicación original quedarán huérfanos.",
- "confirmations.reply.confirm": "Reply",
+ "confirmations.reply.confirm": "Responder",
"confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
"confirmations.unfollow.confirm": "Dejar de seguir",
"confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
@@ -116,8 +117,8 @@
"emoji_button.search_results": "Resultados de búsqueda",
"emoji_button.symbols": "Símbolos",
"emoji_button.travel": "Viajes y lugares",
- "empty_column.account_timeline": "No toots here!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_timeline": "¡No hay toots aquí!",
+ "empty_column.account_unavailable": "Perfil no disponible",
"empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
"empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
"empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
@@ -136,21 +137,21 @@
"follow_request.authorize": "Autorizar",
"follow_request.reject": "Rechazar",
"getting_started.developers": "Desarrolladores",
- "getting_started.directory": "Profile directory",
- "getting_started.documentation": "Documentation",
+ "getting_started.directory": "Directorio de perfil",
+ "getting_started.documentation": "Documentación",
"getting_started.heading": "Primeros pasos",
"getting_started.invite": "Invitar usuarios",
"getting_started.open_source_notice": "Mastodon es software libre. Puedes contribuir o reportar errores en {github}.",
"getting_started.security": "Seguridad",
"getting_started.terms": "Términos de servicio",
- "hashtag.column_header.tag_mode.all": "and {additional}",
- "hashtag.column_header.tag_mode.any": "or {additional}",
- "hashtag.column_header.tag_mode.none": "without {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+ "hashtag.column_header.tag_mode.all": "y {additional}",
+ "hashtag.column_header.tag_mode.any": "o {additional}",
+ "hashtag.column_header.tag_mode.none": "sin {additional}",
+ "hashtag.column_settings.select.no_options_message": "No se encontraron sugerencias",
+ "hashtag.column_settings.select.placeholder": "Introduzca hashtags…",
"hashtag.column_settings.tag_mode.all": "All of these",
- "hashtag.column_settings.tag_mode.any": "Any of these",
- "hashtag.column_settings.tag_mode.none": "None of these",
+ "hashtag.column_settings.tag_mode.any": "Cualquiera de estos",
+ "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar retoots",
@@ -158,29 +159,29 @@
"intervals.full.days": "{number, plural, one {# day} other {# days}}",
"intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
"intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
- "introduction.federation.action": "Next",
- "introduction.federation.federated.headline": "Federated",
+ "introduction.federation.action": "Siguiente",
+ "introduction.federation.federated.headline": "Federado",
"introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
- "introduction.federation.home.headline": "Home",
+ "introduction.federation.home.headline": "Inicio",
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
- "introduction.interactions.favourite.headline": "Favourite",
+ "introduction.interactions.action": "¡Terminar tutorial!",
+ "introduction.interactions.favourite.headline": "Favorito",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
"introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
- "introduction.interactions.reply.headline": "Reply",
+ "introduction.interactions.reply.headline": "Responder",
"introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
- "introduction.welcome.action": "Let's go!",
- "introduction.welcome.headline": "First steps",
+ "introduction.welcome.action": "¡Vamos!",
+ "introduction.welcome.headline": "Primeros pasos",
"introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
"keyboard_shortcuts.back": "volver atrás",
"keyboard_shortcuts.blocked": "abrir una lista de usuarios bloqueados",
"keyboard_shortcuts.boost": "retootear",
"keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
"keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
- "keyboard_shortcuts.description": "Description",
+ "keyboard_shortcuts.description": "Descripción",
"keyboard_shortcuts.direct": "abrir la columna de mensajes directos",
"keyboard_shortcuts.down": "mover hacia abajo en la lista",
"keyboard_shortcuts.enter": "to open status",
@@ -203,15 +204,17 @@
"keyboard_shortcuts.search": "para poner el foco en la búsqueda",
"keyboard_shortcuts.start": "abrir la columna \"comenzar\"",
"keyboard_shortcuts.toggle_hidden": "mostrar/ocultar texto tras aviso de contenido (CW)",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "para comenzar un nuevo toot",
"keyboard_shortcuts.unfocus": "para retirar el foco de la caja de redacción/búsqueda",
"keyboard_shortcuts.up": "para ir hacia arriba en la lista",
"lightbox.close": "Cerrar",
"lightbox.next": "Siguiente",
"lightbox.previous": "Anterior",
+ "lightbox.view_context": "Ver contexto",
"lists.account.add": "Añadir a lista",
"lists.account.remove": "Quitar de lista",
- "lists.delete": "Delete list",
+ "lists.delete": "Borrar lista",
"lists.edit": "Editar lista",
"lists.edit.submit": "Change title",
"lists.new.create": "Añadir lista",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Palabras silenciadas",
"navigation_bar.follow_requests": "Solicitudes para seguirte",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Información adicional",
"navigation_bar.keyboard_shortcuts": "Atajos",
"navigation_bar.lists": "Listas",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Toots fijados",
"navigation_bar.preferences": "Preferencias",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Historia federada",
"navigation_bar.security": "Seguridad",
"notification.favourite": "{name} marcó tu estado como favorito",
@@ -340,7 +345,6 @@
"status.reply": "Responder",
"status.replyAll": "Responder al hilo",
"status.report": "Reportar",
- "status.sensitive_toggle": "Haz clic para ver",
"status.sensitive_warning": "Contenido sensible",
"status.share": "Compartir",
"status.show_less": "Mostrar menos",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index bd26ae232..3e91012b3 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -1,6 +1,6 @@
{
"account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
- "account.badges.bot": "Bot",
+ "account.badges.bot": "Bot-a",
"account.block": "Blokeatu @{name}",
"account.block_domain": "Ezkutatu {domain} domeinuko guztia",
"account.blocked": "Blokeatuta",
@@ -17,13 +17,13 @@
"account.hide_reblogs": "Ezkutatu @{name}(r)en bultzadak",
"account.link_verified_on": "Esteka honen jabetzaren egiaztaketa data: {date}",
"account.locked_info": "Kontu honen pribatutasun egoera blokeatuta gisa ezarri da. Jabeak eskuz erabakitzen du nork jarraitu diezaioken.",
- "account.media": "Media",
+ "account.media": "Multimedia",
"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": "Tootak",
+ "account.posts": "Toot",
"account.posts_with_replies": "Toot eta erantzunak",
"account.report": "Salatu @{name}",
"account.requested": "Onarpenaren zain. Klikatu jarraitzeko eskaera ezeztatzeko",
@@ -32,7 +32,7 @@
"account.unblock": "Desblokeatu @{name}",
"account.unblock_domain": "Berriz erakutsi {domain}",
"account.unendorse": "Ez nabarmendu profilean",
- "account.unfollow": "Jarraitzeari utzi",
+ "account.unfollow": "Utzi jarraitzeari",
"account.unmute": "Desmututu @{name}",
"account.unmute_notifications": "Desmututu @{name}(r)en jakinarazpenak",
"alert.unexpected.message": "Ustekabeko errore bat gertatu da.",
@@ -40,7 +40,7 @@
"boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
"bundle_column_error.body": "Zerbait okerra gertatu da osagai hau kargatzean.",
"bundle_column_error.retry": "Saiatu berriro",
- "bundle_column_error.title": "Network error",
+ "bundle_column_error.title": "Sareko errorea",
"bundle_modal_error.close": "Itxi",
"bundle_modal_error.message": "Zerbait okerra gertatu da osagai hau kargatzean.",
"bundle_modal_error.retry": "Saiatu berriro",
@@ -71,20 +71,21 @@
"compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren mezuak ikusteko.",
"compose_form.lock_disclaimer.lock": "giltzapetuta",
"compose_form.placeholder": "Zer duzu buruan?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "Gehitu aukera bat",
+ "compose_form.poll.duration": "Inkestaren iraupena",
+ "compose_form.poll.option_placeholder": "{number}. aukera",
+ "compose_form.poll.remove_option": "Kendu aukera hau",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Markatu multimedia hunkigarri gisa",
"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",
"confirmation_modal.cancel": "Utzi",
- "confirmations.block.block_and_report": "Block & Report",
- "confirmations.block.confirm": "Block",
+ "confirmations.block.block_and_report": "Blokeatu eta salatu",
+ "confirmations.block.confirm": "Blokeatu",
"confirmations.block.message": "Ziur {name} blokeatu nahi duzula?",
"confirmations.delete.confirm": "Ezabatu",
"confirmations.delete.message": "Ziur mezu hau ezabatu nahi duzula?",
@@ -117,7 +118,7 @@
"emoji_button.symbols": "Sinboloak",
"emoji_button.travel": "Bidaiak eta tokiak",
"empty_column.account_timeline": "Ez dago toot-ik hemen!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_unavailable": "Profila ez dago eskuragarri",
"empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
"empty_column.community": "Denbora-lerro lokala hutsik dago. Idatzi zerbait publikoki pilota biraka jartzeko!",
"empty_column.direct": "Ez duzu mezu zuzenik oraindik. Baten bat bidali edo jasotzen duzunean, hemen agertuko da.",
@@ -146,8 +147,8 @@
"hashtag.column_header.tag_mode.all": "eta {osagarria}",
"hashtag.column_header.tag_mode.any": "edo {osagarria}",
"hashtag.column_header.tag_mode.none": "gabe {osagarria}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+ "hashtag.column_settings.select.no_options_message": "Ez da proposamenik aurkitu",
+ "hashtag.column_settings.select.placeholder": "Sartu traolak…",
"hashtag.column_settings.tag_mode.all": "Hauetako guztiak",
"hashtag.column_settings.tag_mode.any": "Hautako edozein",
"hashtag.column_settings.tag_mode.none": "Hauetako bat ere ez",
@@ -155,15 +156,15 @@
"home.column_settings.basic": "Oinarrizkoa",
"home.column_settings.show_reblogs": "Erakutsi bultzadak",
"home.column_settings.show_replies": "Erakutsi erantzunak",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+ "intervals.full.days": "{number, plural, one {egun #} other {# egun}}",
+ "intervals.full.hours": "{number, plural, one {ordu #} other {# ordu}}",
+ "intervals.full.minutes": "{number, plural, one {minutu #} other {# minutu}}",
"introduction.federation.action": "Hurrengoa",
- "introduction.federation.federated.headline": "Federated",
+ "introduction.federation.federated.headline": "Federatua",
"introduction.federation.federated.text": "Fedibertsoko beste zerbitzarietako bidalketa publikoak federatutako denbora-lerroan agertuko dira.",
- "introduction.federation.home.headline": "Home",
+ "introduction.federation.home.headline": "Hasiera",
"introduction.federation.home.text": "Jarraitzen dituzun horien mezuak zure hasierako jarioan agertuko dira. Edozein zerbitzariko edonor jarraitu dezakezu!",
- "introduction.federation.local.headline": "Local",
+ "introduction.federation.local.headline": "Lokala",
"introduction.federation.local.text": "Zure zerbitzari berean dauden horien mezu publikoak denbora-lerro lokalean agertuko dira.",
"introduction.interactions.action": "Amaitu tutoriala!",
"introduction.interactions.favourite.headline": "Gogokoa",
@@ -180,10 +181,10 @@
"keyboard_shortcuts.boost": "bultzada ematea",
"keyboard_shortcuts.column": "mezu bat zutabe batean fokatzea",
"keyboard_shortcuts.compose": "testua konposatzeko arean fokatzea",
- "keyboard_shortcuts.description": "Description",
+ "keyboard_shortcuts.description": "Deskripzioa",
"keyboard_shortcuts.direct": "mezu zuzenen zutabea irekitzeko",
"keyboard_shortcuts.down": "zerrendan behera mugitzea",
- "keyboard_shortcuts.enter": "to open status",
+ "keyboard_shortcuts.enter": "mezua irekitzeko",
"keyboard_shortcuts.favourite": "gogoko egitea",
"keyboard_shortcuts.favourites": "gogokoen zerrenda irekitzeko",
"keyboard_shortcuts.federated": "federatutako denbora-lerroa irekitzeko",
@@ -203,17 +204,19 @@
"keyboard_shortcuts.search": "bilaketan fokua jartzea",
"keyboard_shortcuts.start": "\"Menua\" zutabea irekitzeko",
"keyboard_shortcuts.toggle_hidden": "testua erakustea/ezkutatzea abisu baten atzean",
+ "keyboard_shortcuts.toggle_sensitivity": "multimedia erakutsi/ezkutatzeko",
"keyboard_shortcuts.toot": "toot berria hastea",
"keyboard_shortcuts.unfocus": "testua konposatzeko area / bilaketatik fokua kentzea",
"keyboard_shortcuts.up": "zerrendan gora mugitzea",
"lightbox.close": "Itxi",
"lightbox.next": "Hurrengoa",
"lightbox.previous": "Aurrekoa",
+ "lightbox.view_context": "Ikusi testuingurua",
"lists.account.add": "Gehitu zerrendara",
"lists.account.remove": "Kendu zerrendatik",
"lists.delete": "Ezabatu zerrenda",
"lists.edit": "Editatu zerrenda",
- "lists.edit.submit": "Change title",
+ "lists.edit.submit": "Aldatu izenburua",
"lists.new.create": "Gehitu zerrenda",
"lists.new.title_placeholder": "Zerrenda berriaren izena",
"lists.search": "Bilatu jarraitzen dituzun pertsonen artean",
@@ -234,20 +237,22 @@
"navigation_bar.favourites": "Gogokoak",
"navigation_bar.filters": "Mutututako hitzak",
"navigation_bar.follow_requests": "Jarraitzeko eskariak",
+ "navigation_bar.follows_and_followers": "Jarraitutakoak eta jarraitzaileak",
"navigation_bar.info": "Zerbitzari honi buruz",
"navigation_bar.keyboard_shortcuts": "Laster-teklak",
"navigation_bar.lists": "Zerrendak",
"navigation_bar.logout": "Amaitu saioa",
"navigation_bar.mutes": "Mutututako erabiltzaileak",
- "navigation_bar.personal": "Personal",
+ "navigation_bar.personal": "Pertsonala",
"navigation_bar.pins": "Finkatutako toot-ak",
"navigation_bar.preferences": "Hobespenak",
+ "navigation_bar.profile_directory": "Profilen direktorioa",
"navigation_bar.public_timeline": "Federatutako denbora-lerroa",
"navigation_bar.security": "Segurtasuna",
"notification.favourite": "{name}(e)k zure mezua gogoko du",
"notification.follow": "{name}(e)k jarraitzen zaitu",
"notification.mention": "{name}(e)k aipatu zaitu",
- "notification.poll": "A poll you have voted in has ended",
+ "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
"notification.reblog": "{name}(e)k bultzada eman dio zure mezuari",
"notifications.clear": "Garbitu jakinarazpenak",
"notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
@@ -258,7 +263,7 @@
"notifications.column_settings.filter_bar.show": "Erakutsi",
"notifications.column_settings.follow": "Jarraitzaile berriak:",
"notifications.column_settings.mention": "Aipamenak:",
- "notifications.column_settings.poll": "Poll results:",
+ "notifications.column_settings.poll": "Inkestaren emaitzak:",
"notifications.column_settings.push": "Push jakinarazpenak",
"notifications.column_settings.reblog": "Bultzadak:",
"notifications.column_settings.show": "Erakutsi zutabean",
@@ -268,14 +273,14 @@
"notifications.filter.favourites": "Gogokoak",
"notifications.filter.follows": "Jarraipenak",
"notifications.filter.mentions": "Aipamenak",
- "notifications.filter.polls": "Poll results",
+ "notifications.filter.polls": "Inkestaren emaitza",
"notifications.group": "{count} jakinarazpen",
- "poll.closed": "Closed",
- "poll.refresh": "Refresh",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
- "poll.vote": "Vote",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
+ "poll.closed": "Itxita",
+ "poll.refresh": "Berritu",
+ "poll.total_votes": "{count, plural, one {boto #} other {# boto}}",
+ "poll.vote": "Bozkatu",
+ "poll_button.add_poll": "Gehitu inkesta bat",
+ "poll_button.remove_poll": "Kendu inkesta",
"privacy.change": "Doitu mezuaren pribatutasuna",
"privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
"privacy.direct.short": "Zuzena",
@@ -297,22 +302,22 @@
"report.forward_hint": "Kontu hau beste zerbitzari batekoa da. Bidali txostenaren kopia anonimo hara ere?",
"report.hint": "Txostena zure zerbitzariaren moderatzaileei bidaliko zaie. Kontu hau zergatik salatzen duzun behean azaldu dezakezu:",
"report.placeholder": "Iruzkin gehigarriak",
- "report.submit": "Submit",
+ "report.submit": "Bidali",
"report.target": "{target} salatzen",
"search.placeholder": "Bilatu",
"search_popout.search_format": "Bilaketa aurreratuaren formatua",
"search_popout.tips.full_text": "Testu hutsarekin zuk idatzitako mezuak, gogokoak, bultzadak edo aipamenak aurkitu ditzakezu, bat datozen erabiltzaile-izenak, pantaila-izenak, eta traolak.",
"search_popout.tips.hashtag": "traola",
- "search_popout.tips.status": "status",
+ "search_popout.tips.status": "mezua",
"search_popout.tips.text": "Testu hutsak pantaila-izenak, erabiltzaile-izenak eta traolak bilatzen ditu",
"search_popout.tips.user": "erabiltzailea",
"search_results.accounts": "Jendea",
"search_results.hashtags": "Traolak",
"search_results.statuses": "Toot-ak",
- "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+ "search_results.total": "{count, number} {count, plural, one {emaitza} other {emaitzak}}",
"status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea",
"status.admin_status": "Ireki mezu hau moderazio interfazean",
- "status.block": "Block @{name}",
+ "status.block": "Blokeatu @{name}",
"status.cancel_reblog_private": "Kendu bultzada",
"status.cannot_reblog": "Mezu honi ezin zaio bultzada eman",
"status.copy": "Kopiatu mezuaren esteka",
@@ -340,7 +345,6 @@
"status.reply": "Erantzun",
"status.replyAll": "Erantzun harian",
"status.report": "Salatu @{name}",
- "status.sensitive_toggle": "Egin klik ikusteko",
"status.sensitive_warning": "Kontuz: Eduki hunkigarria",
"status.share": "Partekatu",
"status.show_less": "Erakutsi gutxiago",
@@ -357,17 +361,17 @@
"tabs_bar.local_timeline": "Lokala",
"tabs_bar.notifications": "Jakinarazpenak",
"tabs_bar.search": "Bilatu",
- "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
- "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
- "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
- "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+ "time_remaining.days": "{number, plural, one {egun #} other {# egun}} amaitzeko",
+ "time_remaining.hours": "{number, plural, one {ordu #} other {# ordu}} amaitzeko",
+ "time_remaining.minutes": "{number, plural, one {minutu #} other {# minutu}} amaitzeko",
+ "time_remaining.moments": "Amaitzekotan",
+ "time_remaining.seconds": "{number, plural, one {segundo #} other {# segundo}} amaitzeko",
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} hitz egiten",
"ui.beforeunload": "Zure zirriborroa galduko da Mastodon uzten baduzu.",
"upload_area.title": "Arrastatu eta jaregin igotzeko",
"upload_button.label": "Gehitu multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_error.limit": "Fitxategi igoera muga gaindituta.",
- "upload_error.poll": "File upload not allowed with polls.",
+ "upload_error.poll": "Ez da inkestetan fitxategiak igotzea onartzen.",
"upload_form.description": "Deskribatu ikusmen arazoak dituztenentzat",
"upload_form.focus": "Aldatu aurrebista",
"upload_form.undo": "Ezabatu",
@@ -375,10 +379,10 @@
"video.close": "Itxi bideoa",
"video.exit_fullscreen": "Irten pantaila osotik",
"video.expand": "Hedatu bideoa",
- "video.fullscreen": "Full screen",
+ "video.fullscreen": "Pantaila osoa",
"video.hide": "Ezkutatu bideoa",
"video.mute": "Mututu soinua",
- "video.pause": "Pause",
+ "video.pause": "Pausatu",
"video.play": "Jo",
"video.unmute": "Desmututu soinua"
}
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 6890fa971..68d231ce9 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -1,5 +1,5 @@
{
- "account.add_or_remove_from_list": "افزودن یا برداشتن از فهرست",
+ "account.add_or_remove_from_list": "افزودن یا حذف از فهرستها",
"account.badges.bot": "ربات",
"account.block": "مسدودسازی @{name}",
"account.block_domain": "پنهانسازی همه چیز از سرور {domain}",
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "حذف این گزینه",
"compose_form.publish": "بوق",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "علامتگذاری به عنوان حساس",
"compose_form.sensitive.marked": "این تصویر به عنوان حساس علامتگذاری شده",
"compose_form.sensitive.unmarked": "این تصویر به عنوان حساس علامتگذاری نشده",
"compose_form.spoiler.marked": "نوشته پشت هشدار محتوا پنهان است",
@@ -88,7 +89,7 @@
"confirmations.block.message": "آیا واقعاً میخواهید {name} را مسدود کنید؟",
"confirmations.delete.confirm": "پاک کن",
"confirmations.delete.message": "آیا واقعاً میخواهید این نوشته را پاک کنید؟",
- "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.confirm": "پاک کن",
"confirmations.delete_list.message": "آیا واقعاً میخواهید این فهرست را برای همیشه پاک کنید؟",
"confirmations.domain_block.confirm": "پنهانسازی کل دامین",
"confirmations.domain_block.message": "آیا جدی جدی میخواهید کل دامین {domain} را مسدود کنید؟ بیشتر وقتها مسدودکردن یا بیصداکردن چند حساب کاربری خاص کافی است و توصیه میشود. پس از این کار شما هیچ نوشتهای را از این دامین در فهرست نوشتههای عمومی یا اعلانهایتان نخواهید دید. پیگیران شما از این دامین هم حذف خواهد شد.",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "برای فعالکردن جستجو",
"keyboard_shortcuts.start": "برای گشودن ستون «آغاز کنید»",
"keyboard_shortcuts.toggle_hidden": "برای نمایش/نهفتن نوشتهٔ پشت هشدار محتوا",
+ "keyboard_shortcuts.toggle_sensitivity": "برای نمایش/نهفتن عکس و ویدیو",
"keyboard_shortcuts.toot": "برای آغاز یک بوق تازه",
"keyboard_shortcuts.unfocus": "برای برداشتن توجه از نوشتن/جستجو",
"keyboard_shortcuts.up": "برای بالا رفتن در فهرست",
"lightbox.close": "بستن",
"lightbox.next": "بعدی",
"lightbox.previous": "قبلی",
+ "lightbox.view_context": "نمایش گفتگو",
"lists.account.add": "افزودن به فهرست",
"lists.account.remove": "پاککردن از فهرست",
"lists.delete": "حذف فهرست",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "پسندیدهها",
"navigation_bar.filters": "واژگان بیصداشده",
"navigation_bar.follow_requests": "درخواستهای پیگیری",
+ "navigation_bar.follows_and_followers": "پیگیریها و پیگیران",
"navigation_bar.info": "دربارهٔ این سرور",
"navigation_bar.keyboard_shortcuts": "میانبرهای صفحهکلید",
"navigation_bar.lists": "فهرستها",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "شخصی",
"navigation_bar.pins": "نوشتههای ثابت",
"navigation_bar.preferences": "ترجیحات",
+ "navigation_bar.profile_directory": "فهرست گزیدهٔ کاربران",
"navigation_bar.public_timeline": "نوشتههای همهجا",
"navigation_bar.security": "امنیت",
"notification.favourite": "{name} نوشتهٔ شما را پسندید",
@@ -287,11 +292,11 @@
"privacy.unlisted.short": "فهرستنشده",
"regeneration_indicator.label": "در حال باز شدن…",
"regeneration_indicator.sublabel": "این فهرست دارد آماده میشود!",
- "relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
+ "relative_time.days": "{number} روز",
+ "relative_time.hours": "{number} ساعت",
"relative_time.just_now": "الان",
- "relative_time.minutes": "{number}m",
- "relative_time.seconds": "{number}s",
+ "relative_time.minutes": "{number} دقیقه",
+ "relative_time.seconds": "{number} ثانیه",
"reply_indicator.cancel": "لغو",
"report.forward": "فرستادن به {target}",
"report.forward_hint": "این حساب در سرور دیگری ثبت شده. آیا میخواهید رونوشتی از این گزارش به طور ناشناس به آنجا هم فرستاده شود؟",
@@ -340,7 +345,6 @@
"status.reply": "پاسخ",
"status.replyAll": "به نوشته پاسخ دهید",
"status.report": "گزارش دادن @{name}",
- "status.sensitive_toggle": "برای دیدن کلیک کنید",
"status.sensitive_warning": "محتوای حساس",
"status.share": "همرسانی",
"status.show_less": "نهفتن",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 825cd4a75..342a15bfb 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -71,19 +71,20 @@
"compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
"compose_form.lock_disclaimer.lock": "lukittu",
"compose_form.placeholder": "Mitä mietit?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "Lisää valinta",
+ "compose_form.poll.duration": "Äänestyksen kesto",
+ "compose_form.poll.option_placeholder": "Valinta numero",
+ "compose_form.poll.remove_option": "Poista tämä valinta",
"compose_form.publish": "Tuuttaa",
- "compose_form.publish_loud": "{publish}!",
+ "compose_form.publish_loud": "Julkista!",
+ "compose_form.sensitive.hide": "Valitse tämä arkaluontoisena",
"compose_form.sensitive.marked": "Media on merkitty arkaluontoiseksi",
"compose_form.sensitive.unmarked": "Mediaa ei ole merkitty arkaluontoiseksi",
"compose_form.spoiler.marked": "Teksti on piilotettu varoituksen taakse",
"compose_form.spoiler.unmarked": "Teksti ei ole piilotettu",
"compose_form.spoiler_placeholder": "Sisältövaroitus",
"confirmation_modal.cancel": "Peruuta",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Estä ja raportoi",
"confirmations.block.confirm": "Estä",
"confirmations.block.message": "Haluatko varmasti estää käyttäjän {name}?",
"confirmations.delete.confirm": "Poista",
@@ -117,7 +118,7 @@
"emoji_button.symbols": "Symbolit",
"emoji_button.travel": "Matkailu",
"empty_column.account_timeline": "Ei ole 'toots' täällä!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_unavailable": "Profiilia ei löydy",
"empty_column.blocks": "Et ole vielä estänyt yhtään käyttäjää.",
"empty_column.community": "Paikallinen aikajana on tyhjä. Homma lähtee käyntiin, kun kirjoitat jotain julkista!",
"empty_column.direct": "Sinulla ei ole vielä yhtään viestiä yksittäiselle käyttäjälle. Kun lähetät tai vastaanotat sellaisen, se näkyy täällä.",
@@ -137,7 +138,7 @@
"follow_request.reject": "Hylkää",
"getting_started.developers": "Kehittäjille",
"getting_started.directory": "Profiili hakemisto",
- "getting_started.documentation": "Documentation",
+ "getting_started.documentation": "Documentaatio",
"getting_started.heading": "Aloitus",
"getting_started.invite": "Kutsu ihmisiä",
"getting_started.open_source_notice": "Mastodon on avoimen lähdekoodin ohjelma. Voit avustaa tai raportoida ongelmia GitHubissa: {github}.",
@@ -146,8 +147,8 @@
"hashtag.column_header.tag_mode.all": "ja {additional}",
"hashtag.column_header.tag_mode.any": "tai {additional}",
"hashtag.column_header.tag_mode.none": "ilman {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+ "hashtag.column_settings.select.no_options_message": "Ehdostuta ei löydetty",
+ "hashtag.column_settings.select.placeholder": "Laita häshtägejä…",
"hashtag.column_settings.tag_mode.all": "Kaikki",
"hashtag.column_settings.tag_mode.any": "Kaikki",
"hashtag.column_settings.tag_mode.none": "Ei mikään",
@@ -155,25 +156,25 @@
"home.column_settings.basic": "Perusasetukset",
"home.column_settings.show_reblogs": "Näytä buustaukset",
"home.column_settings.show_replies": "Näytä vastaukset",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+ "intervals.full.days": "Päivä päiviä",
+ "intervals.full.hours": "Tunti tunteja",
+ "intervals.full.minutes": "Minuuti minuuteja",
"introduction.federation.action": "Seuraava",
- "introduction.federation.federated.headline": "Federated",
- "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
- "introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
- "introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
- "introduction.interactions.favourite.headline": "Favourite",
- "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
- "introduction.interactions.reblog.headline": "Boost",
- "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
- "introduction.interactions.reply.headline": "Reply",
- "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
- "introduction.welcome.action": "Let's go!",
- "introduction.welcome.headline": "First steps",
+ "introduction.federation.federated.headline": "Federaatioitettu",
+ "introduction.federation.federated.text": "Julkisia viestejä muiden serverien that is not a word aikoo tulla federoituun aikajanaan.",
+ "introduction.federation.home.headline": "Koti",
+ "introduction.federation.home.text": "Viestit muilta pelaajilta jota seuraat aikovat tulla koti sivuusi. Voit seurata ketä vain missä vain serverillä!",
+ "introduction.federation.local.headline": "Paikallinen",
+ "introduction.federation.local.text": "Julkiset viestit muilta pelaajilta samalla serverillä tulevat sinun paikalliseen aikajanaan.",
+ "introduction.interactions.action": "Suorita harjoitus!",
+ "introduction.interactions.favourite.headline": "Lempi",
+ "introduction.interactions.favourite.text": "Toot is not a word.",
+ "introduction.interactions.reblog.headline": "Nopeutus",
+ "introduction.interactions.reblog.text": "Toot is not a word",
+ "introduction.interactions.reply.headline": "Vastaa",
+ "introduction.interactions.reply.text": "TOOT IS NOT A WORD",
+ "introduction.welcome.action": "Mennään!",
+ "introduction.welcome.headline": "Ensimmäiset askeleet",
"introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
"keyboard_shortcuts.back": "liiku taaksepäin",
"keyboard_shortcuts.blocked": "avaa lista estetyistä käyttäjistä",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "siirry hakukenttään",
"keyboard_shortcuts.start": "avaa \"Aloitus\" -sarake",
"keyboard_shortcuts.toggle_hidden": "näytä/piilota sisältövaroituksella merkitty teksti",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "ala kirjoittaa uutta tuuttausta",
"keyboard_shortcuts.unfocus": "siirry pois tekstikentästä tai hakukentästä",
"keyboard_shortcuts.up": "siirry listassa ylöspäin",
"lightbox.close": "Sulje",
"lightbox.next": "Seuraava",
"lightbox.previous": "Edellinen",
+ "lightbox.view_context": "View context",
"lists.account.add": "Lisää listaan",
"lists.account.remove": "Poista listasta",
"lists.delete": "Poista lista",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Suosikit",
"navigation_bar.filters": "Mykistetyt sanat",
"navigation_bar.follow_requests": "Seuraamispyynnöt",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Tietoa tästä instanssista",
"navigation_bar.keyboard_shortcuts": "Näppäinkomennot",
"navigation_bar.lists": "Listat",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Kiinnitetyt tuuttaukset",
"navigation_bar.preferences": "Asetukset",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Yleinen aikajana",
"navigation_bar.security": "Tunnukset",
"notification.favourite": "{name} tykkäsi tilastasi",
@@ -340,7 +345,6 @@
"status.reply": "Vastaa",
"status.replyAll": "Vastaa ketjuun",
"status.report": "Raportoi @{name}",
- "status.sensitive_toggle": "Klikkaa nähdäksesi",
"status.sensitive_warning": "Arkaluontoista sisältöä",
"status.share": "Jaa",
"status.show_less": "Näytä vähemmän",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 58f3ce147..06bb70e02 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,6 +1,6 @@
{
"account.add_or_remove_from_list": "Ajouter ou retirer des listes",
- "account.badges.bot": "Bot",
+ "account.badges.bot": "Robot",
"account.block": "Bloquer @{name}",
"account.block_domain": "Tout masquer venant de {domain}",
"account.blocked": "Bloqué",
@@ -77,13 +77,14 @@
"compose_form.poll.remove_option": "Supprimer ce choix",
"compose_form.publish": "Pouet",
"compose_form.publish_loud": "{publish} !",
+ "compose_form.sensitive.hide": "Marquer le média comme sensible",
"compose_form.sensitive.marked": "Média marqué comme sensible",
"compose_form.sensitive.unmarked": "Média non marqué comme sensible",
"compose_form.spoiler.marked": "Le texte est caché derrière un avertissement",
"compose_form.spoiler.unmarked": "Le texte n’est pas caché",
"compose_form.spoiler_placeholder": "Écrivez ici votre avertissement",
"confirmation_modal.cancel": "Annuler",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Bloquer et signaler",
"confirmations.block.confirm": "Bloquer",
"confirmations.block.message": "Confirmez-vous le blocage de {name} ?",
"confirmations.delete.confirm": "Supprimer",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "pour cibler la recherche",
"keyboard_shortcuts.start": "pour ouvrir la colonne \"pour commencer\"",
"keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derrière CW",
+ "keyboard_shortcuts.toggle_sensitivity": "pour afficher/cacher les médias",
"keyboard_shortcuts.toot": "pour démarrer un tout nouveau pouet",
"keyboard_shortcuts.unfocus": "pour quitter la zone de composition/recherche",
"keyboard_shortcuts.up": "pour remonter dans la liste",
"lightbox.close": "Fermer",
"lightbox.next": "Suivant",
"lightbox.previous": "Précédent",
+ "lightbox.view_context": "Voir le contexte",
"lists.account.add": "Ajouter à la liste",
"lists.account.remove": "Supprimer de la liste",
"lists.delete": "Effacer la liste",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoris",
"navigation_bar.filters": "Mots silenciés",
"navigation_bar.follow_requests": "Demandes de suivi",
+ "navigation_bar.follows_and_followers": "Abonnements et abonné⋅e·s",
"navigation_bar.info": "Plus d’informations",
"navigation_bar.keyboard_shortcuts": "Raccourcis clavier",
"navigation_bar.lists": "Listes",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personnel",
"navigation_bar.pins": "Pouets épinglés",
"navigation_bar.preferences": "Préférences",
+ "navigation_bar.profile_directory": "Annuaire des profils",
"navigation_bar.public_timeline": "Fil public global",
"navigation_bar.security": "Sécurité",
"notification.favourite": "{name} a ajouté à ses favoris :",
@@ -340,7 +345,6 @@
"status.reply": "Répondre",
"status.replyAll": "Répondre au fil",
"status.report": "Signaler @{name}",
- "status.sensitive_toggle": "Cliquer pour afficher",
"status.sensitive_warning": "Contenu sensible",
"status.share": "Partager",
"status.show_less": "Replier",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 723328ab4..9b19d6f11 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -13,7 +13,7 @@
"account.followers.empty": "Ninguén está a seguir esta usuaria por agora.",
"account.follows": "Seguindo",
"account.follows.empty": "Esta usuaria aínda non segue a ninguén.",
- "account.follows_you": "Séguena",
+ "account.follows_you": "Séguete",
"account.hide_reblogs": "Ocultar repeticións de @{name}",
"account.link_verified_on": "A propiedade de esta ligazón foi comprobada en {date}",
"account.locked_info": "O estado da intimidade de esta conta estableceuse en pechado. A persoa dona da conta revisa quen pode seguila.",
@@ -71,24 +71,25 @@
"compose_form.lock_disclaimer": "A súa conta non está {locked}. Calquera pode seguila para ver as súas mensaxes só-para-seguidoras.",
"compose_form.lock_disclaimer.lock": "bloqueado",
"compose_form.placeholder": "Qué contas?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "Engadir unha opción",
+ "compose_form.poll.duration": "Duración da sondaxe",
+ "compose_form.poll.option_placeholder": "Opción {number}",
+ "compose_form.poll.remove_option": "Eliminar esta opción",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Marcar medios como sensibles",
"compose_form.sensitive.marked": "Medios marcados como sensibles",
"compose_form.sensitive.unmarked": "Os medios non están marcados como sensibles",
"compose_form.spoiler.marked": "O texto está agochado tras un aviso",
"compose_form.spoiler.unmarked": "O texto non está agochado",
"compose_form.spoiler_placeholder": "Escriba o aviso aquí",
"confirmation_modal.cancel": "Cancelar",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Bloquear e Informar",
"confirmations.block.confirm": "Bloquear",
"confirmations.block.message": "Está segura de querer bloquear a {name}?",
"confirmations.delete.confirm": "Borrar",
"confirmations.delete.message": "Está segura de que quere eliminar este estado?",
- "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.confirm": "Eliminar",
"confirmations.delete_list.message": "Estás seguro de que queres eliminar permanentemente esta lista?",
"confirmations.domain_block.confirm": "Agochar un dominio completo",
"confirmations.domain_block.message": "Realmente está segura de que quere bloquear por completo o dominio {domain}? Normalmente é suficiente, e preferible, bloquear de xeito selectivo varios elementos. Non verá contidos de ese dominio en ningunha liña temporal ou nas notificacións. As súas seguidoras en ese dominio serán eliminadas.",
@@ -137,7 +138,7 @@
"follow_request.reject": "Rexeitar",
"getting_started.developers": "Desenvolvedoras",
"getting_started.directory": "Directorio do perfil",
- "getting_started.documentation": "Documentation",
+ "getting_started.documentation": "Documentación",
"getting_started.heading": "Comezando",
"getting_started.invite": "Convide a xente",
"getting_started.open_source_notice": "Mastodon é software de código aberto. Pode contribuír ou informar de fallos en GitHub en {github}.",
@@ -146,8 +147,8 @@
"hashtag.column_header.tag_mode.all": "e {additional}",
"hashtag.column_header.tag_mode.any": "ou {additional}",
"hashtag.column_header.tag_mode.none": "sen {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+ "hashtag.column_settings.select.no_options_message": "Non se atopan suxestións",
+ "hashtag.column_settings.select.placeholder": "Introducir etiquetas…",
"hashtag.column_settings.tag_mode.all": "Todos estos",
"hashtag.column_settings.tag_mode.any": "Calquera de estos",
"hashtag.column_settings.tag_mode.none": "Ningún de estos",
@@ -155,13 +156,13 @@
"home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar repeticións",
"home.column_settings.show_replies": "Mostrar respostas",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+ "intervals.full.days": "{number, plural,one {# día} other {# días}}",
+ "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
"intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
"introduction.federation.action": "Seguinte",
- "introduction.federation.federated.headline": "Federated",
+ "introduction.federation.federated.headline": "Federado",
"introduction.federation.federated.text": "Publicacións públicas desde outros servidores do fediverso aparecerán na liña temporal federada.",
- "introduction.federation.home.headline": "Home",
+ "introduction.federation.home.headline": "Inicio",
"introduction.federation.home.text": "Publicacións de xente que vostede segue aparecerán no TL de Inicio. Pode seguir a calquera en calquer servidor!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Publicacións públicas de xente no seu mesmo servidor aparecerán na liña temporal local.",
@@ -203,17 +204,19 @@
"keyboard_shortcuts.search": "para centrar a busca",
"keyboard_shortcuts.start": "abrir columna \"comezando\"",
"keyboard_shortcuts.toggle_hidden": "mostrar/agochar un texto detrás do AC",
+ "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar medios",
"keyboard_shortcuts.toot": "escribir un toot novo",
"keyboard_shortcuts.unfocus": "quitar o foco do área de escritura/busca",
"keyboard_shortcuts.up": "ir hacia arriba na lista",
"lightbox.close": "Fechar",
"lightbox.next": "Seguinte",
"lightbox.previous": "Anterior",
+ "lightbox.view_context": "Ver contexto",
"lists.account.add": "Engadir á lista",
"lists.account.remove": "Eliminar da lista",
- "lists.delete": "Delete list",
+ "lists.delete": "Eliminar lista",
"lists.edit": "Editar lista",
- "lists.edit.submit": "Change title",
+ "lists.edit.submit": "Cambiar título",
"lists.new.create": "Engadir lista",
"lists.new.title_placeholder": "Novo título da lista",
"lists.search": "Procurar entre a xente que segues",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoritas",
"navigation_bar.filters": "Palabras acaladas",
"navigation_bar.follow_requests": "Peticións de seguimento",
+ "navigation_bar.follows_and_followers": "Seguindo e seguidoras",
"navigation_bar.info": "Sobre este servidor",
"navigation_bar.keyboard_shortcuts": "Atallos",
"navigation_bar.lists": "Listas",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Persoal",
"navigation_bar.pins": "Mensaxes fixadas",
"navigation_bar.preferences": "Preferencias",
+ "navigation_bar.profile_directory": "Directorio de perfil",
"navigation_bar.public_timeline": "Liña temporal federada",
"navigation_bar.security": "Seguridade",
"notification.favourite": "{name} marcou como favorito o seu estado",
@@ -270,12 +275,12 @@
"notifications.filter.mentions": "Mencións",
"notifications.filter.polls": "Resultados da sondaxe",
"notifications.group": "{count} notificacións",
- "poll.closed": "Closed",
- "poll.refresh": "Refresh",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+ "poll.closed": "Pechado",
+ "poll.refresh": "Actualizar",
+ "poll.total_votes": "{count, plural, one {# voto} outros {# votos}}",
"poll.vote": "Votar",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
+ "poll_button.add_poll": "Engadir sondaxe",
+ "poll_button.remove_poll": "Eliminar sondaxe",
"privacy.change": "Axustar a intimidade do estado",
"privacy.direct.long": "Enviar exclusivamente as usuarias mencionadas",
"privacy.direct.short": "Directa",
@@ -312,10 +317,10 @@
"search_results.total": "{count, number} {count,plural,one {result} outros {results}}",
"status.admin_account": "Abrir interface de moderación para @{name}",
"status.admin_status": "Abrir este estado na interface de moderación",
- "status.block": "Block @{name}",
+ "status.block": "Bloquear @{name}",
"status.cancel_reblog_private": "Non promover",
"status.cannot_reblog": "Esta mensaxe non pode ser promovida",
- "status.copy": "Copy link to status",
+ "status.copy": "Copiar ligazón ao estado",
"status.delete": "Eliminar",
"status.detailed_status": "Vista detallada da conversa",
"status.direct": "Mensaxe directa @{name}",
@@ -340,7 +345,6 @@
"status.reply": "Resposta",
"status.replyAll": "Resposta a conversa",
"status.report": "Informar @{name}",
- "status.sensitive_toggle": "Pulse para ver",
"status.sensitive_warning": "Contido sensible",
"status.share": "Compartir",
"status.show_less": "Mostrar menos",
@@ -357,17 +361,17 @@
"tabs_bar.local_timeline": "Local",
"tabs_bar.notifications": "Notificacións",
"tabs_bar.search": "Buscar",
- "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
- "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
- "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
- "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+ "time_remaining.days": "{number, plural, one {# dia} other {# días}} restantes",
+ "time_remaining.hours": "{number, plural, one {# hora} other {# horas}} restantes",
+ "time_remaining.minutes": "{number, plural, one {# minuto} other {# minutos}} restantes",
+ "time_remaining.moments": "Está rematando",
+ "time_remaining.seconds": "{number, plural, one {# segundo} other {# segundos}} restantes",
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} outras {people}} conversando",
"ui.beforeunload": "O borrador perderase se sae de Mastodon.",
"upload_area.title": "Arrastre e solte para subir",
"upload_button.label": "Engadir medios (JPEG, PNG, GIF, WebM, MP4, MOV)",
- "upload_error.limit": "File upload limit exceeded.",
- "upload_error.poll": "File upload not allowed with polls.",
+ "upload_error.limit": "Excedeu o límite de subida de ficheiros.",
+ "upload_error.poll": "Non se poden subir ficheiros nas sondaxes.",
"upload_form.description": "Describa para deficientes visuais",
"upload_form.focus": "Cambiar vista previa",
"upload_form.undo": "Eliminar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index c9228cffd..248be3c7b 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "ללחוש",
"compose_form.publish_loud": "לחצרץ!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "להתמקד בחלון החיפוש",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "להתחיל חיצרוץ חדש",
"keyboard_shortcuts.unfocus": "לצאת מתיבת חיבור/חיפוש",
"keyboard_shortcuts.up": "לנוע במעלה הרשימה",
"lightbox.close": "סגירה",
"lightbox.next": "הלאה",
"lightbox.previous": "הקודם",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "חיבובים",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "בקשות מעקב",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "מידע נוסף",
"navigation_bar.keyboard_shortcuts": "קיצורי מקלדת",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "חיצרוצים מקובעים",
"navigation_bar.preferences": "העדפות",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "ציר זמן בין-קהילתי",
"navigation_bar.security": "Security",
"notification.favourite": "חצרוצך חובב על ידי {name}",
@@ -340,7 +345,6 @@
"status.reply": "תגובה",
"status.replyAll": "תגובה לכולם",
"status.report": "דיווח על @{name}",
- "status.sensitive_toggle": "לחצו כדי לראות",
"status.sensitive_warning": "תוכן רגיש",
"status.share": "שיתוף",
"status.show_less": "הראה פחות",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 9d507346a..ac58514d4 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
"lightbox.close": "Close",
"lightbox.next": "Next",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favourites",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "About this server",
"navigation_bar.keyboard_shortcuts": "Hotkeys",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Pinned toots",
"navigation_bar.preferences": "Preferences",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.security": "Security",
"notification.favourite": "{name} favourited your status",
@@ -340,7 +345,6 @@
"status.reply": "Reply",
"status.replyAll": "Reply to thread",
"status.report": "Report @{name}",
- "status.sensitive_toggle": "Click to view",
"status.sensitive_warning": "Sensitive content",
"status.share": "Share",
"status.show_less": "Show less",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 55a4ec4ee..6f9b5343a 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
"lightbox.close": "Zatvori",
"lightbox.next": "Next",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoriti",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Zahtjevi za slijeđenje",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Više informacija",
"navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Pinned toots",
"navigation_bar.preferences": "Postavke",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Federalni timeline",
"navigation_bar.security": "Security",
"notification.favourite": "{name} je lajkao tvoj status",
@@ -340,7 +345,6 @@
"status.reply": "Odgovori",
"status.replyAll": "Odgovori na temu",
"status.report": "Prijavi @{name}",
- "status.sensitive_toggle": "Klikni da bi vidio",
"status.sensitive_warning": "Osjetljiv sadržaj",
"status.share": "Share",
"status.show_less": "Pokaži manje",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index c5b0831c3..1c3b63d7d 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -1,106 +1,107 @@
{
- "account.add_or_remove_from_list": "Add or Remove from lists",
+ "account.add_or_remove_from_list": "Hozzáadás és elvétel listáról",
"account.badges.bot": "Bot",
"account.block": "@{name} letiltása",
"account.block_domain": "Minden elrejtése innen: {domain}",
- "account.blocked": "Blocked",
- "account.direct": "Direct Message @{name}",
- "account.domain_blocked": "Domain hidden",
+ "account.blocked": "Letiltva",
+ "account.direct": "Közvetlen üzenet @{name} számára",
+ "account.domain_blocked": "Rejtett domain",
"account.edit_profile": "Profil szerkesztése",
- "account.endorse": "Feature on profile",
+ "account.endorse": "Kiemelés a profilodon",
"account.follow": "Követés",
- "account.followers": "Követők",
- "account.followers.empty": "No one follows this user yet.",
- "account.follows": "Követve",
- "account.follows.empty": "This user doesn't follow anyone yet.",
- "account.follows_you": "Követnek téged",
- "account.hide_reblogs": "Rejtsd el a tülkölést @{name}-tól/től",
- "account.link_verified_on": "Ownership of this link was checked on {date}",
- "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+ "account.followers": "Követő",
+ "account.followers.empty": "Ezt a felhasználót még senki sem követi.",
+ "account.follows": "Követett",
+ "account.follows.empty": "Ez a felhasználó még senkit sem követ.",
+ "account.follows_you": "Követ téged",
+ "account.hide_reblogs": "@{name} megtolásainak némítása",
+ "account.link_verified_on": "A linket ellenőriztük: {date}",
+ "account.locked_info": "Ez a fiók zárt. A tulaj engedélyezi, ki követheti őt.",
"account.media": "Média",
"account.mention": "@{name} említése",
"account.moved_to": "{name} átköltözött:",
"account.mute": "@{name} némítása",
- "account.mute_notifications": "@{name} értesítések némítása",
- "account.muted": "Muted",
- "account.posts": "Státuszok",
- "account.posts_with_replies": "Toots with replies",
+ "account.mute_notifications": "@{name} értesítéseinek némítása",
+ "account.muted": "Némítva",
+ "account.posts": "Tülkölés",
+ "account.posts_with_replies": "Tülkölés válaszokkal",
"account.report": "@{name} jelentése",
- "account.requested": "Engedélyre vár. Kattintson a követési kérés visszavonására",
+ "account.requested": "Engedélyre vár. Kattints a követési kérés visszavonásához",
"account.share": "@{name} profiljának megosztása",
- "account.show_reblogs": "@{name} kedvenceinek mutatása",
- "account.unblock": "@{name} kiblokkolása",
- "account.unblock_domain": "{domain} mutatása",
- "account.unendorse": "Don't feature on profile",
- "account.unfollow": "Követés abbahagyása",
- "account.unmute": "@{name} kinémítása",
- "account.unmute_notifications": "@{name} értesítéseinek kinémítása",
- "alert.unexpected.message": "An unexpected error occurred.",
- "alert.unexpected.title": "Oops!",
- "boost_modal.combo": "Megnyomhatod {combo}, hogy átugord következő alkalommal",
+ "account.show_reblogs": "@{name} megtolásainak mutatása",
+ "account.unblock": "@{name} letiltásának feloldása",
+ "account.unblock_domain": "{domain} elrejtésének feloldása",
+ "account.unendorse": "Kiemelés törlése a profilodról",
+ "account.unfollow": "Követés vége",
+ "account.unmute": "@{name} némítás feloldása",
+ "account.unmute_notifications": "@{name} némított értesítéseinek feloldása",
+ "alert.unexpected.message": "Váratlan hiba történt.",
+ "alert.unexpected.title": "Hoppá!",
+ "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
"bundle_column_error.body": "Hiba történt a komponens betöltése közben.",
- "bundle_column_error.retry": "Próbálja újra",
+ "bundle_column_error.retry": "Próbáld újra",
"bundle_column_error.title": "Hálózati hiba",
- "bundle_modal_error.close": "Bezár",
+ "bundle_modal_error.close": "Bezárás",
"bundle_modal_error.message": "Hiba történt a komponens betöltésekor.",
- "bundle_modal_error.retry": "Próbálja újra",
+ "bundle_modal_error.retry": "Próbáld újra",
"column.blocks": "Letiltott felhasználók",
"column.community": "Helyi idővonal",
- "column.direct": "Direct messages",
- "column.domain_blocks": "Hidden domains",
+ "column.direct": "Közvetlen üzenetek",
+ "column.domain_blocks": "Rejtett domainek",
"column.favourites": "Kedvencek",
- "column.follow_requests": "Követési kérések",
+ "column.follow_requests": "Követési kérelmek",
"column.home": "Kezdőlap",
"column.lists": "Listák",
"column.mutes": "Némított felhasználók",
"column.notifications": "Értesítések",
- "column.pins": "Kitűzött tülkölések",
+ "column.pins": "Kitűzött tülkök",
"column.public": "Nyilvános idővonal",
"column_back_button.label": "Vissza",
"column_header.hide_settings": "Beállítások elrejtése",
"column_header.moveLeft_settings": "Oszlop elmozdítása balra",
- "column_header.moveRight_settings": "oszlop elmozdítása jobbra",
- "column_header.pin": "Kitűz",
+ "column_header.moveRight_settings": "Oszlop elmozdítása jobbra",
+ "column_header.pin": "Kitűzés",
"column_header.show_settings": "Beállítások mutatása",
"column_header.unpin": "Kitűzés eltávolítása",
"column_subheading.settings": "Beállítások",
- "community.column_settings.media_only": "Media Only",
- "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
- "compose_form.direct_message_warning_learn_more": "Learn more",
- "compose_form.hashtag_warning": "Ezen tülkölés nem fog megjelenni semmilyen hashtag alatt mivel listázatlan. Csak a publikus tülkölések kereshetőek hashtag-el.",
- "compose_form.lock_disclaimer": "Az ön fiókja nincs {locked}. Bárki követni tud, hogy megtekintse a kizárt követőknek szánt üzeneteid.",
+ "community.column_settings.media_only": "Csak média",
+ "compose_form.direct_message_warning": "Ezt a tülköt csak a benne megemlített felhasználók láthatják majd.",
+ "compose_form.direct_message_warning_learn_more": "Több infó",
+ "compose_form.hashtag_warning": "Ez a tülköd nem fog megjelenni semmilyen hashtag alatt mivel listázatlan. Csak nyilvános tülkök kereshetőek hashtaggel.",
+ "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt üzeneteidet.",
"compose_form.lock_disclaimer.lock": "lezárva",
- "compose_form.placeholder": "Mire gondolsz?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.placeholder": "Mi jár a fejedben?",
+ "compose_form.poll.add_option": "Lehetőség hozzáadása",
+ "compose_form.poll.duration": "Szavazás időtartama",
+ "compose_form.poll.option_placeholder": "Lehetőség {number}",
+ "compose_form.poll.remove_option": "Lehetőség törlése",
"compose_form.publish": "Tülk",
"compose_form.publish_loud": "{publish}!",
- "compose_form.sensitive.marked": "Media is marked as sensitive",
- "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
- "compose_form.spoiler.marked": "Text is hidden behind warning",
- "compose_form.spoiler.unmarked": "Text is not hidden",
- "compose_form.spoiler_placeholder": "Figyelmeztetését írja ide",
- "confirmation_modal.cancel": "Bezár",
- "confirmations.block.block_and_report": "Block & Report",
- "confirmations.block.confirm": "Letilt",
- "confirmations.block.message": "Biztos benne, hogy le szeretné tiltani {name}?",
- "confirmations.delete.confirm": "Töröl",
- "confirmations.delete.message": "Biztos benne, hogy törölni szeretné ezt a státuszt?",
- "confirmations.delete_list.confirm": "Töröl",
- "confirmations.delete_list.message": "Biztos benne, hogy véglegesen törölni szeretné ezt a listát?",
- "confirmations.domain_block.confirm": "Egész domain elrejtése",
- "confirmations.domain_block.message": "Nagyon biztos abban, hogy le szeretné tiltani az egész {domain}-t? A legtöbb esetben néhány célszerű tiltás vagy némítás elegendő és kívánatosabb megoldás.",
- "confirmations.mute.confirm": "Némít",
- "confirmations.mute.message": "Biztos benne, hogy némítani szeretné {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.reply.confirm": "Reply",
- "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+ "compose_form.sensitive.hide": "Média megjelölése szenzitívként",
+ "compose_form.sensitive.marked": "A médiát szenzitívnek jelölték",
+ "compose_form.sensitive.unmarked": "A médiát nem jelölték szenzitívnek",
+ "compose_form.spoiler.marked": "A szöveg figyelmeztetés mögé van rejtve",
+ "compose_form.spoiler.unmarked": "A szöveg nem rejtett",
+ "compose_form.spoiler_placeholder": "Írd ide a figyelmeztetést",
+ "confirmation_modal.cancel": "Mégse",
+ "confirmations.block.block_and_report": "Letiltás és Bejelentés",
+ "confirmations.block.confirm": "Letiltás",
+ "confirmations.block.message": "Biztos, hogy le szeretnéd tiltani {name}?",
+ "confirmations.delete.confirm": "Törlés",
+ "confirmations.delete.message": "Biztos, hogy törölni szeretnéd ezt a tülkölést?",
+ "confirmations.delete_list.confirm": "Törlés",
+ "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
+ "confirmations.domain_block.confirm": "Teljes domain elrejtése",
+ "confirmations.domain_block.message": "Egészen biztos, hogy le szeretnéd tiltani a teljes {domain}-t? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se idővonalakon, se értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
+ "confirmations.mute.confirm": "Némítás",
+ "confirmations.mute.message": "Biztos, hogy némítani szeretnéd {name}?",
+ "confirmations.redraft.confirm": "Törlés és újraírás",
+ "confirmations.redraft.message": "Biztos, hogy ezt a tülköt szeretnéd törölni és újraírni? Minden megtolást és kedvencnek jelölést elvesztesz, az eredetire adott válaszok pedig elárvulnak.",
+ "confirmations.reply.confirm": "Válasz",
+ "confirmations.reply.message": "Ha most válaszolsz, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
"confirmations.unfollow.confirm": "Követés visszavonása",
- "confirmations.unfollow.message": "Biztos benne, hogy vissza szeretné vonni {name} követését?",
- "embed.instructions": "Ágyazza be ezen státuszt weboldalába az alábbi kód másolásával.",
+ "confirmations.unfollow.message": "Biztos, hogy vissza szeretnéd vonni {name} követését?",
+ "embed.instructions": "Ágyazd be ezt a tülköt a weboldaladba az alábbi kód kimásolásával.",
"embed.preview": "Így fog kinézni:",
"emoji_button.activity": "Aktivitás",
"emoji_button.custom": "Egyéni",
@@ -108,7 +109,7 @@
"emoji_button.food": "Étel és Ital",
"emoji_button.label": "Emoji beszúrása",
"emoji_button.nature": "Természet",
- "emoji_button.not_found": "Nincsenek emojok!! (╯°□°)╯︵ ┻━┻",
+ "emoji_button.not_found": "Nincsenek emojik!! (╯°□°)╯︵ ┻━┻",
"emoji_button.objects": "Tárgyak",
"emoji_button.people": "Emberek",
"emoji_button.recent": "Gyakran használt",
@@ -116,269 +117,272 @@
"emoji_button.search_results": "Keresési találatok",
"emoji_button.symbols": "Szimbólumok",
"emoji_button.travel": "Utazás és Helyek",
- "empty_column.account_timeline": "No toots here!",
- "empty_column.account_unavailable": "Profile unavailable",
- "empty_column.blocks": "You haven't blocked any users yet.",
- "empty_column.community": "A helyi idővonal üres. Írj egy publikus stástuszt, hogy elindítsd a labdát!",
- "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
- "empty_column.domain_blocks": "There are no hidden domains yet.",
- "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
- "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
- "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
- "empty_column.hashtag": "Jelenleg nem található semmi ezen hashtaggel.",
- "empty_column.home": "A hazai idővonala üres! Látogasd meg a {public} vagy használd a keresőt, hogy ismerj meg más felhasználókat.",
- "empty_column.home.public_timeline": "publikus idővonal",
- "empty_column.list": "A lista jelenleg üres. Mikor a listatagok új státuszt posztolnak itt meg fognak jelenni.",
- "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
- "empty_column.mutes": "You haven't muted any users yet.",
- "empty_column.notifications": "Jelenleg nincsenek értesítései. Lépj kapcsolatba másokkal, hogy indítsd el a beszélgetést.",
- "empty_column.public": "Jelenleg semmi nincs itt! Írj valamit publikusan vagy kövess más szervereken levő felhasználókat, hogy megtöltsd",
- "follow_request.authorize": "Engedélyez",
- "follow_request.reject": "Visszautasít",
- "getting_started.developers": "Developers",
- "getting_started.directory": "Profile directory",
- "getting_started.documentation": "Documentation",
+ "empty_column.account_timeline": "Itt nincs tülkölés!",
+ "empty_column.account_unavailable": "A profil nem elérhető",
+ "empty_column.blocks": "Még senkit sem tiltottál le.",
+ "empty_column.community": "A helyi idővonal üres. Tülkölj egyet nyilvánosan, hogy elindítsd az eseményeket!",
+ "empty_column.direct": "Még nincs egy közvetlen üzeneted sem. Ha küldesz vagy kapsz egyet, itt fog megjelenni.",
+ "empty_column.domain_blocks": "Még nem rejtettél el egyetlen domaint sem.",
+ "empty_column.favourited_statuses": "Még nincs egy kedvenc tülköd sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
+ "empty_column.favourites": "Még senki sem jelölte ezt a tülköt kedvencként. Ha valaki mégis megteszi, itt fogjuk mutatni.",
+ "empty_column.follow_requests": "Még nincs egy követési kérésed sem. Ha kapsz egyet, itt fogjuk feltüntetni.",
+ "empty_column.hashtag": "Jelenleg nem található semmi ezzel a hashtaggel.",
+ "empty_column.home": "A saját idővonalad üres! Látogasd meg a {public} -at vagy használd a keresőt, hogy megismerj másokat.",
+ "empty_column.home.public_timeline": "nyilvános idővonal",
+ "empty_column.list": "A lista jelenleg üres. Ha a listatagok tülkölnek, itt fognak megjelenni.",
+ "empty_column.lists": "Még nem hoztál létre listát. Ha csinálsz egyet, itt látszik majd.",
+ "empty_column.mutes": "Még egy felhasználót sem némítottál le.",
+ "empty_column.notifications": "Jelenleg nincsenek értesítéseid. Lépj kapcsolatba másokkal, hogy elindítsd a beszélgetést.",
+ "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más szervereken levő felhasználókat, hogy megtöltsd",
+ "follow_request.authorize": "Engedélyezés",
+ "follow_request.reject": "Visszautasítás",
+ "getting_started.developers": "Fejlesztőknek",
+ "getting_started.directory": "Profilok",
+ "getting_started.documentation": "Dokumentáció",
"getting_started.heading": "Első lépések",
- "getting_started.invite": "Invite people",
- "getting_started.open_source_notice": "Mastodon egy nyílt forráskódú szoftver. Hozzájárulás vagy problémák jelentése a GitHub-on {github}.",
- "getting_started.security": "Security",
- "getting_started.terms": "Terms of service",
- "hashtag.column_header.tag_mode.all": "and {additional}",
- "hashtag.column_header.tag_mode.any": "or {additional}",
- "hashtag.column_header.tag_mode.none": "without {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
- "hashtag.column_settings.tag_mode.all": "All of these",
- "hashtag.column_settings.tag_mode.any": "Any of these",
- "hashtag.column_settings.tag_mode.none": "None of these",
- "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
- "home.column_settings.basic": "Alap",
- "home.column_settings.show_reblogs": "Ismétlések mutatása",
+ "getting_started.invite": "Mások meghívása",
+ "getting_started.open_source_notice": "A Mastodon nyílt forráskódú szoftver. Csatlakozhatsz a fejlesztéshez vagy jelenthetsz problémákat GitHub-on {github}.",
+ "getting_started.security": "Biztonság",
+ "getting_started.terms": "Felhasználási feltételek",
+ "hashtag.column_header.tag_mode.all": "és {additional}",
+ "hashtag.column_header.tag_mode.any": "vagy {additional}",
+ "hashtag.column_header.tag_mode.none": "nélküle {additional}",
+ "hashtag.column_settings.select.no_options_message": "Nincs javaslat",
+ "hashtag.column_settings.select.placeholder": "Addj meg hashtageket…",
+ "hashtag.column_settings.tag_mode.all": "Mindegyik",
+ "hashtag.column_settings.tag_mode.any": "Bármelyik",
+ "hashtag.column_settings.tag_mode.none": "Egyik sem",
+ "hashtag.column_settings.tag_toggle": "Új tagek felvétele ehhez az oszlophoz",
+ "home.column_settings.basic": "Alapértelmezések",
+ "home.column_settings.show_reblogs": "Megtolások mutatása",
"home.column_settings.show_replies": "Válaszok mutatása",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
- "introduction.federation.action": "Next",
- "introduction.federation.federated.headline": "Federated",
- "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
- "introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
- "introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
- "introduction.interactions.favourite.headline": "Favourite",
- "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
- "introduction.interactions.reblog.headline": "Boost",
- "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
- "introduction.interactions.reply.headline": "Reply",
- "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
- "introduction.welcome.action": "Let's go!",
- "introduction.welcome.headline": "First steps",
- "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
- "keyboard_shortcuts.back": "vissza navigálás",
- "keyboard_shortcuts.blocked": "to open blocked users list",
- "keyboard_shortcuts.boost": "ismétlés",
- "keyboard_shortcuts.column": "összpontosítson egy státuszra az egyik oszlopban",
- "keyboard_shortcuts.compose": "fókuszálja a szerkesztési szövegdobozt",
+ "intervals.full.days": "{number, plural, one {# nap} other {# nap}}",
+ "intervals.full.hours": "{number, plural, one {# óra} other {# óra}}",
+ "intervals.full.minutes": "{number, plural, one {# perc} other {# perc}}",
+ "introduction.federation.action": "Következő",
+ "introduction.federation.federated.headline": "Föderációs",
+ "introduction.federation.federated.text": "A fediverzum más szervereiről származó nyilvános tülkök a föderációs idővonalon jelennek meg.",
+ "introduction.federation.home.headline": "Saját",
+ "introduction.federation.home.text": "A saját idővonaladon az általad követettek tülkjei jelennek meg. Bárkit követhetsz bármely szerveren.",
+ "introduction.federation.local.headline": "Helyi",
+ "introduction.federation.local.text": "A helyi idővonalon a veled közös szerveren lévő emberek nyilvános tülkjei jelennek meg.",
+ "introduction.interactions.action": "Oktatóanyag befejezése!",
+ "introduction.interactions.favourite.headline": "Kedvenc",
+ "introduction.interactions.favourite.text": "A kedvenc funkcióval elrakhatsz későbbre egy tülköt, illetve közölheted a szerzővel, hogy tetszett a megosztása.",
+ "introduction.interactions.reblog.headline": "Megtolás",
+ "introduction.interactions.reblog.text": "A saját követőiddel mások tülkjeit is megoszthatod úgy, hogy megtolod őket.",
+ "introduction.interactions.reply.headline": "Válasz",
+ "introduction.interactions.reply.text": "Saját vagy mások tülkjeire válaszolva egy beszélgetési láncot alakíthatsz ki.",
+ "introduction.welcome.action": "Csapjunk bele!",
+ "introduction.welcome.headline": "Első lépések",
+ "introduction.welcome.text": "Üdv a fediverzumban! Pár pillanat múlva már küldheted is üzeneteidet barátaidnak bármely szerveren. Ez a szerver {domain} viszont különleges. Ez tartja nyilván a profilod, szóval jegyezd meg a nevét.",
+ "keyboard_shortcuts.back": "visszafelé navigálás",
+ "keyboard_shortcuts.blocked": "letiltott felhasználók listájának megnyitása",
+ "keyboard_shortcuts.boost": "megtolás",
+ "keyboard_shortcuts.column": "fókuszálás egy tülkre az egyik oszlopban",
+ "keyboard_shortcuts.compose": "fókuszálás a szerkesztési szövegdobozra",
"keyboard_shortcuts.description": "Leírás",
- "keyboard_shortcuts.direct": "to open direct messages column",
+ "keyboard_shortcuts.direct": "közvetlen üzenetek megnyitása",
"keyboard_shortcuts.down": "lefele navigálás a listában",
- "keyboard_shortcuts.enter": "státusz megnyitása",
- "keyboard_shortcuts.favourite": "kedvenccé tétel",
- "keyboard_shortcuts.favourites": "to open favourites list",
- "keyboard_shortcuts.federated": "to open federated timeline",
- "keyboard_shortcuts.heading": "Billentyű rövidítések",
- "keyboard_shortcuts.home": "to open home timeline",
+ "keyboard_shortcuts.enter": "tülk megnyitása",
+ "keyboard_shortcuts.favourite": "kedvencnek jelölés",
+ "keyboard_shortcuts.favourites": "kedvenc lista megnyitása",
+ "keyboard_shortcuts.federated": "föderációs idővonal megnyitása",
+ "keyboard_shortcuts.heading": "Billentyűparancsok",
+ "keyboard_shortcuts.home": "saját idővonal megnyitása",
"keyboard_shortcuts.hotkey": "Gyorsbillentyű",
"keyboard_shortcuts.legend": "jelmagyarázat megjelenítése",
- "keyboard_shortcuts.local": "to open local timeline",
- "keyboard_shortcuts.mention": "szerző megjelenítése",
- "keyboard_shortcuts.muted": "to open muted users list",
- "keyboard_shortcuts.my_profile": "to open your profile",
- "keyboard_shortcuts.notifications": "to open notifications column",
- "keyboard_shortcuts.pinned": "to open pinned toots list",
- "keyboard_shortcuts.profile": "to open author's profile",
- "keyboard_shortcuts.reply": "válaszolás",
- "keyboard_shortcuts.requests": "to open follow requests list",
- "keyboard_shortcuts.search": "kereső kiemelése",
- "keyboard_shortcuts.start": "to open \"get started\" column",
- "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
- "keyboard_shortcuts.toot": "új tülk megkezdése",
+ "keyboard_shortcuts.local": "helyi idővonal megnyitása",
+ "keyboard_shortcuts.mention": "szerző megemlítése",
+ "keyboard_shortcuts.muted": "némított felhasználók listájának megnyitása",
+ "keyboard_shortcuts.my_profile": "profilod megnyitása",
+ "keyboard_shortcuts.notifications": "értesítések megnyitása",
+ "keyboard_shortcuts.pinned": "kitűzött tülkök listájának megnyitása",
+ "keyboard_shortcuts.profile": "szerző profiljának megnyitása",
+ "keyboard_shortcuts.reply": "válasz",
+ "keyboard_shortcuts.requests": "követési kérések listájának megnyitása",
+ "keyboard_shortcuts.search": "fókuszálás a keresőre",
+ "keyboard_shortcuts.start": "\"Első lépések\" megnyitása",
+ "keyboard_shortcuts.toggle_hidden": "tartalmi figyelmeztetéssel ellátott szöveg mutatása/elrejtése",
+ "keyboard_shortcuts.toggle_sensitivity": "média mutatása/elrejtése",
+ "keyboard_shortcuts.toot": "új tülk írása",
"keyboard_shortcuts.unfocus": "tülk szerkesztés/keresés fókuszpontból való kivétele",
- "keyboard_shortcuts.up": "fennebb helyezés a listában",
+ "keyboard_shortcuts.up": "felfelé mozdítás a listában",
"lightbox.close": "Bezárás",
"lightbox.next": "Következő",
"lightbox.previous": "Előző",
+ "lightbox.view_context": "Kontextus megtekintése",
"lists.account.add": "Hozzáadás a listához",
- "lists.account.remove": "Eltávolít a listából",
+ "lists.account.remove": "Eltávolítás a listából",
"lists.delete": "Lista törlése",
"lists.edit": "Lista szerkesztése",
- "lists.edit.submit": "Change title",
+ "lists.edit.submit": "Cím megváltoztatása",
"lists.new.create": "Lista hozzáadása",
- "lists.new.title_placeholder": "Új lista cím",
- "lists.search": "Keresés a követtett személyek között",
+ "lists.new.title_placeholder": "Új lista címe",
+ "lists.search": "Keresés a követett személyek között",
"lists.subheading": "Listáid",
"loading_indicator.label": "Betöltés...",
- "media_gallery.toggle_visible": "Láthatóság váltása",
+ "media_gallery.toggle_visible": "Láthatóság állítása",
"missing_indicator.label": "Nincs találat",
- "missing_indicator.sublabel": "Ezen forrás nem található",
- "mute_modal.hide_notifications": "Értesítések elrejtése ezen felhasználótól?",
- "navigation_bar.apps": "Mobile apps",
- "navigation_bar.blocks": "Tiltott felhasználók",
+ "missing_indicator.sublabel": "Ez az erőforrás nem található",
+ "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?",
+ "navigation_bar.apps": "Mobil appok",
+ "navigation_bar.blocks": "Letiltott felhasználók",
"navigation_bar.community_timeline": "Helyi idővonal",
- "navigation_bar.compose": "Compose new toot",
- "navigation_bar.direct": "Direct messages",
- "navigation_bar.discover": "Discover",
- "navigation_bar.domain_blocks": "Hidden domains",
+ "navigation_bar.compose": "Új tülk írása",
+ "navigation_bar.direct": "Közvetlen üzenetek",
+ "navigation_bar.discover": "Felfedezés",
+ "navigation_bar.domain_blocks": "Rejtett domainek",
"navigation_bar.edit_profile": "Profil szerkesztése",
"navigation_bar.favourites": "Kedvencek",
- "navigation_bar.filters": "Muted words",
- "navigation_bar.follow_requests": "Követési kérések",
- "navigation_bar.info": "Ezen szerverről",
+ "navigation_bar.filters": "Némított szavak",
+ "navigation_bar.follow_requests": "Követési kérelmek",
+ "navigation_bar.follows_and_followers": "Követettek és követők",
+ "navigation_bar.info": "Erről a szerverről",
"navigation_bar.keyboard_shortcuts": "Gyorsbillentyűk",
"navigation_bar.lists": "Listák",
"navigation_bar.logout": "Kijelentkezés",
"navigation_bar.mutes": "Némított felhasználók",
- "navigation_bar.personal": "Personal",
+ "navigation_bar.personal": "Személyes",
"navigation_bar.pins": "Kitűzött tülkök",
"navigation_bar.preferences": "Beállítások",
- "navigation_bar.public_timeline": "Nyilvános időfolyam",
- "navigation_bar.security": "Security",
- "notification.favourite": "{name} kedvencnek jelölte az állapotod",
+ "navigation_bar.profile_directory": "Profilok",
+ "navigation_bar.public_timeline": "Föderációs idővonal",
+ "navigation_bar.security": "Biztonság",
+ "notification.favourite": "{name} kedvencnek jelölte egy tülködet",
"notification.follow": "{name} követ téged",
"notification.mention": "{name} megemlített",
- "notification.poll": "A poll you have voted in has ended",
- "notification.reblog": "{name} rebloggolta az állapotod",
+ "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
+ "notification.reblog": "{name} megtolta a tülködet",
"notifications.clear": "Értesítések törlése",
- "notifications.clear_confirmation": "Biztos benne, hogy véglegesen törölni akarja az összes értesítését?",
- "notifications.column_settings.alert": "Asztali gépi értesítések",
+ "notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
+ "notifications.column_settings.alert": "Asztali értesítések",
"notifications.column_settings.favourite": "Kedvencek:",
- "notifications.column_settings.filter_bar.advanced": "Display all categories",
- "notifications.column_settings.filter_bar.category": "Quick filter bar",
- "notifications.column_settings.filter_bar.show": "Show",
+ "notifications.column_settings.filter_bar.advanced": "Minden kategória mutatása",
+ "notifications.column_settings.filter_bar.category": "Gyorskereső mező",
+ "notifications.column_settings.filter_bar.show": "Mutat",
"notifications.column_settings.follow": "Új követők:",
- "notifications.column_settings.mention": "Megemítéseim:",
- "notifications.column_settings.poll": "Poll results:",
+ "notifications.column_settings.mention": "Megemlítéseid:",
+ "notifications.column_settings.poll": "Szavazás eredménye:",
"notifications.column_settings.push": "Push értesítések",
- "notifications.column_settings.reblog": "Rebloggolások:",
+ "notifications.column_settings.reblog": "Megtolások:",
"notifications.column_settings.show": "Oszlopban mutatás",
"notifications.column_settings.sound": "Hang lejátszása",
- "notifications.filter.all": "All",
- "notifications.filter.boosts": "Boosts",
- "notifications.filter.favourites": "Favourites",
- "notifications.filter.follows": "Follows",
- "notifications.filter.mentions": "Mentions",
- "notifications.filter.polls": "Poll results",
- "notifications.group": "{count} notifications",
- "poll.closed": "Closed",
- "poll.refresh": "Refresh",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
- "poll.vote": "Vote",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
- "privacy.change": "Státusz láthatóságának módosítása",
- "privacy.direct.long": "Posztolás csak az említett felhasználóknak",
- "privacy.direct.short": "Egyenesen",
- "privacy.private.long": "Posztolás csak követőknek",
+ "notifications.filter.all": "Mind",
+ "notifications.filter.boosts": "Megtolások",
+ "notifications.filter.favourites": "Kedvencnek jelölések",
+ "notifications.filter.follows": "Követések",
+ "notifications.filter.mentions": "Megemlítések",
+ "notifications.filter.polls": "Szavazások eredményei",
+ "notifications.group": "{count} értesítés",
+ "poll.closed": "Lezárva",
+ "poll.refresh": "Frissítés",
+ "poll.total_votes": "{count, plural, one {# szavazat} other {# szavazat}}",
+ "poll.vote": "Szavazás",
+ "poll_button.add_poll": "Új szavazás",
+ "poll_button.remove_poll": "Szavazás törlése",
+ "privacy.change": "Tülk láthatóságának módosítása",
+ "privacy.direct.long": "Tülk csak az említett felhasználóknak",
+ "privacy.direct.short": "Közvetlen",
+ "privacy.private.long": "Tülk csak követőknek",
"privacy.private.short": "Csak követőknek",
- "privacy.public.long": "Posztolás a publikus idővonalakra",
- "privacy.public.short": "Publikus",
- "privacy.unlisted.long": "Do not show in public timelines",
+ "privacy.public.long": "Tülk a nyilvános idővonalra",
+ "privacy.public.short": "Nyilvános",
+ "privacy.unlisted.long": "Ne mutassuk nyilvános idővonalon",
"privacy.unlisted.short": "Listázatlan",
"regeneration_indicator.label": "Töltődik…",
- "regeneration_indicator.sublabel": "Your home feed is being prepared!",
- "relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
+ "regeneration_indicator.sublabel": "A saját idővonalad épp készül!",
+ "relative_time.days": "{number}nap",
+ "relative_time.hours": "{number}ó",
"relative_time.just_now": "most",
- "relative_time.minutes": "{number}m",
- "relative_time.seconds": "{number}s",
+ "relative_time.minutes": "{number}p",
+ "relative_time.seconds": "{number}mp",
"reply_indicator.cancel": "Mégsem",
- "report.forward": "Forward to {target}",
- "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
- "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
- "report.placeholder": "További kommentek",
- "report.submit": "Submit",
- "report.target": "Reporting",
+ "report.forward": "Továbbítás neki {target}",
+ "report.forward_hint": "Ez a fiók egy másik szerverről van. Küldjünk oda is egy anonimizált bejelentést?",
+ "report.hint": "A bejelentést a szervered moderátorainak küldjük el. Megmagyarázhatod, miért jelented az alábbi problémát:",
+ "report.placeholder": "További megjegyzések",
+ "report.submit": "Küldés",
+ "report.target": "{target} jelentése",
"search.placeholder": "Keresés",
- "search_popout.search_format": "Fejlett keresés",
- "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+ "search_popout.search_format": "Haladó keresés",
+ "search_popout.tips.full_text": "Egyszerű szöveg. Illeszkedő, általad írt tülköket, kedvencnek jelöléseket, megtolást, megemlítést, felhasználói nevet, megjelenített nevet, hashtageket ad majd vissza.",
"search_popout.tips.hashtag": "hashtag",
- "search_popout.tips.status": "status",
- "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+ "search_popout.tips.status": "tülk",
+ "search_popout.tips.text": "Egyszerű szöveg. Illeszkedő megjelenített nevet, felhasználói nevet, hashtageket ad majd vissza",
"search_popout.tips.user": "felhasználó",
- "search_results.accounts": "People",
- "search_results.hashtags": "Hashtags",
- "search_results.statuses": "Toots",
- "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
- "status.admin_account": "Open moderation interface for @{name}",
- "status.admin_status": "Open this status in the moderation interface",
- "status.block": "Block @{name}",
- "status.cancel_reblog_private": "Unboost",
- "status.cannot_reblog": "Ezen státusz nem rebloggolható",
- "status.copy": "Copy link to status",
+ "search_results.accounts": "Emberek",
+ "search_results.hashtags": "Hashtagek",
+ "search_results.statuses": "Tülkök",
+ "search_results.total": "{count, number} {count, plural, one {találat} other {találat}}",
+ "status.admin_account": "Moderáció megnyitása @{name} felhasználóhoz",
+ "status.admin_status": "Tülk megnyitása moderációra",
+ "status.block": "@{name} letiltása",
+ "status.cancel_reblog_private": "Megtolás törlése",
+ "status.cannot_reblog": "Ez a tülk nem tolható meg",
+ "status.copy": "Link másolása tülkbe",
"status.delete": "Törlés",
- "status.detailed_status": "Detailed conversation view",
- "status.direct": "Direct message @{name}",
- "status.embed": "Beágyaz",
+ "status.detailed_status": "Részletes beszélgetési nézet",
+ "status.direct": "Közvetlen üzenet @{name} számára",
+ "status.embed": "Beágyazás",
"status.favourite": "Kedvenc",
- "status.filtered": "Filtered",
+ "status.filtered": "Megszűrt",
"status.load_more": "Többet",
"status.media_hidden": "Média elrejtve",
- "status.mention": "Említés",
+ "status.mention": "@{name} említése",
"status.more": "Többet",
"status.mute": "@{name} némítása",
"status.mute_conversation": "Beszélgetés némítása",
- "status.open": "Státusz kinagyítása",
+ "status.open": "Tülk kibontása",
"status.pin": "Kitűzés a profilra",
- "status.pinned": "Pinned toot",
- "status.read_more": "Read more",
- "status.reblog": "Reblog",
- "status.reblog_private": "Boost to original audience",
- "status.reblogged_by": "{name} reblogolta",
- "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
- "status.redraft": "Delete & re-draft",
+ "status.pinned": "Kitűzött tülk",
+ "status.read_more": "Bővebben",
+ "status.reblog": "Megtolás",
+ "status.reblog_private": "Megtolás az eredeti közönségnek",
+ "status.reblogged_by": "{name} megtolta",
+ "status.reblogs.empty": "Senki sem tolta még meg ezt a tülköt. Ha valaki megteszi, itt fog megjelenni.",
+ "status.redraft": "Törlés és újraírás",
"status.reply": "Válasz",
- "status.replyAll": "Válaszolj a beszélgetésre",
- "status.report": "Report @{name}",
- "status.sensitive_toggle": "Katt a megtekintéshez",
- "status.sensitive_warning": "Érzékeny tartalom",
+ "status.replyAll": "Válasz a beszélgetésre",
+ "status.report": "@{name} jelentése",
+ "status.sensitive_warning": "Szenzitív tartalom",
"status.share": "Megosztás",
- "status.show_less": "Kevesebb",
- "status.show_less_all": "Show less for all",
+ "status.show_less": "Kevesebbet",
+ "status.show_less_all": "Kevesebbet mindenhol",
"status.show_more": "Többet",
- "status.show_more_all": "Show more for all",
- "status.show_thread": "Show thread",
- "status.unmute_conversation": "Beszélgetés némításának elvonása",
- "status.unpin": "Kitűzés eltávolítása a profilról",
- "suggestions.dismiss": "Dismiss suggestion",
- "suggestions.header": "You might be interested in…",
- "tabs_bar.federated_timeline": "Federált",
- "tabs_bar.home": "Kezdőlap",
- "tabs_bar.local_timeline": "Local",
+ "status.show_more_all": "Többet mindenhol",
+ "status.show_thread": "Szál mutatása",
+ "status.unmute_conversation": "Beszélgetés némításának kikapcsolása",
+ "status.unpin": "Kitűzés eltávolítása a profilodról",
+ "suggestions.dismiss": "Javaslat elvetése",
+ "suggestions.header": "Esetleg érdekelhet…",
+ "tabs_bar.federated_timeline": "Föderációs",
+ "tabs_bar.home": "Saját",
+ "tabs_bar.local_timeline": "Helyi",
"tabs_bar.notifications": "Értesítések",
- "tabs_bar.search": "Search",
- "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
- "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
- "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
- "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
- "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
- "ui.beforeunload": "A piszkozata el fog vesztődni ha elhagyja Mastodon-t.",
- "upload_area.title": "Húzza ide a feltöltéshez",
- "upload_button.label": "Média hozzáadása",
- "upload_error.limit": "File upload limit exceeded.",
- "upload_error.poll": "File upload not allowed with polls.",
- "upload_form.description": "Describe for the visually impaired",
- "upload_form.focus": "Crop",
+ "tabs_bar.search": "Keresés",
+ "time_remaining.days": "{number, plural, one {# nap} other {# nap}} van hátra",
+ "time_remaining.hours": "{number, plural, one {# óra} other {# óra}} van hátra",
+ "time_remaining.minutes": "{number, plural, one {# perc} other {# perc}} van hátra",
+ "time_remaining.moments": "Pillanatok vannak hátra",
+ "time_remaining.seconds": "{number, plural, one {# másodperc} other {# másodperc}} van hátra",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {résztvevő} other {résztvevő}} beszélget",
+ "ui.beforeunload": "A piszkozatod el fog veszni, ha elhagyod a Mastodon-t.",
+ "upload_area.title": "Húzd ide a feltöltéshez",
+ "upload_button.label": "Média hozzáadása (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_error.limit": "Túllépted a fájl feltöltési limitet.",
+ "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
+ "upload_form.description": "Leírás látáskorlátozottak számára",
+ "upload_form.focus": "Előnézet megváltoztatása",
"upload_form.undo": "Mégsem",
- "upload_progress.label": "Uploading...",
- "video.close": "Close video",
- "video.exit_fullscreen": "Exit full screen",
- "video.expand": "Expand video",
- "video.fullscreen": "Full screen",
- "video.hide": "Hide video",
- "video.mute": "Mute sound",
+ "upload_progress.label": "Feltöltés...",
+ "video.close": "Videó bezárása",
+ "video.exit_fullscreen": "Kilépés teljes képernyőből",
+ "video.expand": "Videó nagyítása",
+ "video.fullscreen": "Teljes képernyő",
+ "video.hide": "Videó elrejtése",
+ "video.mute": "Hang némitása",
"video.pause": "Szünet",
"video.play": "Lejátszás",
- "video.unmute": "Hang kinémítása"
+ "video.unmute": "Hang némitásának vége"
}
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index ca7732d85..b2dc16a48 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Թթել",
"compose_form.publish_loud": "Թթե՜լ",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "որոնման դաշտին սեւեռվելու համար",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "թարմ թութ սկսելու համար",
"keyboard_shortcuts.unfocus": "տեքստի/որոնման տիրույթից ապասեւեռվելու համար",
"keyboard_shortcuts.up": "ցանկով վերեւ շարժվելու համար",
"lightbox.close": "Փակել",
"lightbox.next": "Հաջորդ",
"lightbox.previous": "Նախորդ",
+ "lightbox.view_context": "View context",
"lists.account.add": "Ավելացնել ցանկին",
"lists.account.remove": "Հանել ցանկից",
"lists.delete": "Ջնջել ցանկը",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Հավանածներ",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Հետեւելու հայցեր",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Այս հանգույցի մասին",
"navigation_bar.keyboard_shortcuts": "Ստեղնաշարի կարճատներ",
"navigation_bar.lists": "Ցանկեր",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Անձնական",
"navigation_bar.pins": "Ամրացված թթեր",
"navigation_bar.preferences": "Նախապատվություններ",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Դաշնային հոսք",
"navigation_bar.security": "Անվտանգություն",
"notification.favourite": "{name} հավանեց թութդ",
@@ -340,7 +345,6 @@
"status.reply": "Պատասխանել",
"status.replyAll": "Պատասխանել թելին",
"status.report": "Բողոքել @{name}֊ից",
- "status.sensitive_toggle": "Կտացրու՝ դիտելու համար",
"status.sensitive_warning": "Կասկածելի բովանդակություն",
"status.share": "Կիսվել",
"status.show_less": "Պակաս",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index c4610c330..07ce0eb98 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Sumber ini telah ditandai sebagai sumber sensitif.",
"compose_form.sensitive.unmarked": "Sumber ini tidak ditandai sebagai sumber sensitif",
"compose_form.spoiler.marked": "Teks disembunyikan dibalik peringatan",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "untuk fokus mencari",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
"lightbox.close": "Tutup",
"lightbox.next": "Next",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favorit",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Permintaan mengikuti",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Informasi selengkapnya",
"navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Pinned toots",
"navigation_bar.preferences": "Pengaturan",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Linimasa gabungan",
"navigation_bar.security": "Security",
"notification.favourite": "{name} menyukai status anda",
@@ -340,7 +345,6 @@
"status.reply": "Balas",
"status.replyAll": "Balas ke semua",
"status.report": "Laporkan @{name}",
- "status.sensitive_toggle": "Klik untuk menampilkan",
"status.sensitive_warning": "Konten sensitif",
"status.share": "Share",
"status.show_less": "Tampilkan lebih sedikit",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index dcdae5771..c3f8707d1 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Siflar",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
"lightbox.close": "Klozar",
"lightbox.next": "Next",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favorati",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Demandi di sequado",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Detaloza informi",
"navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Pinned toots",
"navigation_bar.preferences": "Preferi",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Federata tempolineo",
"navigation_bar.security": "Security",
"notification.favourite": "{name} favorizis tua mesajo",
@@ -340,7 +345,6 @@
"status.reply": "Respondar",
"status.replyAll": "Respondar a filo",
"status.report": "Denuncar @{name}",
- "status.sensitive_toggle": "Kliktar por vidar",
"status.sensitive_warning": "Trubliva kontenajo",
"status.share": "Share",
"status.show_less": "Montrar mine",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 792204830..f7e2e4353 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -40,7 +40,7 @@
"boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio la prossima volta",
"bundle_column_error.body": "E' avvenuto un errore durante il caricamento di questo componente.",
"bundle_column_error.retry": "Riprova",
- "bundle_column_error.title": "Network error",
+ "bundle_column_error.title": "Errore di rete",
"bundle_modal_error.close": "Chiudi",
"bundle_modal_error.message": "C'è stato un errore mentre questo componente veniva caricato.",
"bundle_modal_error.retry": "Riprova",
@@ -71,19 +71,20 @@
"compose_form.lock_disclaimer": "Il tuo account non è {bloccato}. Chiunque può decidere di seguirti per vedere i tuoi post per soli seguaci.",
"compose_form.lock_disclaimer.lock": "bloccato",
"compose_form.placeholder": "A cosa stai pensando?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "Aggiungi una scelta",
+ "compose_form.poll.duration": "Durata del sondaggio",
+ "compose_form.poll.option_placeholder": "Scelta {number}",
+ "compose_form.poll.remove_option": "Rimuovi questa scelta",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Segna media come sensibile",
"compose_form.sensitive.marked": "Questo media è contrassegnato come sensibile",
"compose_form.sensitive.unmarked": "Questo media non è contrassegnato come sensibile",
"compose_form.spoiler.marked": "Il testo è nascosto dall'avviso",
"compose_form.spoiler.unmarked": "Il testo non è nascosto",
"compose_form.spoiler_placeholder": "Content warning",
"confirmation_modal.cancel": "Annulla",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Blocca & Segnala",
"confirmations.block.confirm": "Blocca",
"confirmations.block.message": "Sei sicuro di voler bloccare {name}?",
"confirmations.delete.confirm": "Cancella",
@@ -117,7 +118,7 @@
"emoji_button.symbols": "Simboli",
"emoji_button.travel": "Viaggi e luoghi",
"empty_column.account_timeline": "Non ci sono toot qui!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_unavailable": "Profilo non disponibile",
"empty_column.blocks": "Non hai ancora bloccato nessun utente.",
"empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
"empty_column.direct": "Non hai ancora nessun messaggio diretto. Quando ne manderai o riceverai qualcuno, apparirà qui.",
@@ -155,15 +156,15 @@
"home.column_settings.basic": "Semplice",
"home.column_settings.show_reblogs": "Mostra post condivisi",
"home.column_settings.show_replies": "Mostra risposte",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+ "intervals.full.days": "{number, plural, one {# giorno} other {# giorni}}",
+ "intervals.full.hours": "{number, plural, one {# ora} other {# ore}}",
+ "intervals.full.minutes": "{number, plural, one {# minuto} other {# minuti}}",
"introduction.federation.action": "Avanti",
- "introduction.federation.federated.headline": "Federated",
+ "introduction.federation.federated.headline": "Federato",
"introduction.federation.federated.text": "I post pubblici provenienti da altri server del fediverse saranno mostrati nella timeline federata.",
"introduction.federation.home.headline": "Home",
"introduction.federation.home.text": "I post scritti da persone che segui saranno mostrati nella timeline home. Puoi seguire chiunque su qualunque server!",
- "introduction.federation.local.headline": "Local",
+ "introduction.federation.local.headline": "Locale",
"introduction.federation.local.text": "I post pubblici scritti da persone sul tuo stesso server saranno mostrati nella timeline locale.",
"introduction.interactions.action": "Finisci il tutorial!",
"introduction.interactions.favourite.headline": "Apprezza",
@@ -203,15 +204,17 @@
"keyboard_shortcuts.search": "per spostare il focus sulla ricerca",
"keyboard_shortcuts.start": "per aprire la colonna \"Come iniziare\"",
"keyboard_shortcuts.toggle_hidden": "per mostrare/nascondere il testo dei CW",
+ "keyboard_shortcuts.toggle_sensitivity": "mostrare/nascondere media",
"keyboard_shortcuts.toot": "per iniziare a scrivere un toot completamente nuovo",
"keyboard_shortcuts.unfocus": "per uscire dall'area di composizione o dalla ricerca",
"keyboard_shortcuts.up": "per spostarsi in alto nella lista",
"lightbox.close": "Chiudi",
"lightbox.next": "Successivo",
"lightbox.previous": "Precedente",
+ "lightbox.view_context": "Mostra contesto",
"lists.account.add": "Aggiungi alla lista",
"lists.account.remove": "Togli dalla lista",
- "lists.delete": "Delete list",
+ "lists.delete": "Elimina lista",
"lists.edit": "Modifica lista",
"lists.edit.submit": "Cambia titolo",
"lists.new.create": "Aggiungi lista",
@@ -234,20 +237,22 @@
"navigation_bar.favourites": "Apprezzati",
"navigation_bar.filters": "Parole silenziate",
"navigation_bar.follow_requests": "Richieste di amicizia",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Informazioni su questo server",
"navigation_bar.keyboard_shortcuts": "Tasti di scelta rapida",
"navigation_bar.lists": "Liste",
"navigation_bar.logout": "Esci",
"navigation_bar.mutes": "Utenti silenziati",
- "navigation_bar.personal": "Personal",
+ "navigation_bar.personal": "Personale",
"navigation_bar.pins": "Toot fissati in cima",
"navigation_bar.preferences": "Impostazioni",
+ "navigation_bar.profile_directory": "Directory dei profili",
"navigation_bar.public_timeline": "Timeline federata",
"navigation_bar.security": "Sicurezza",
"notification.favourite": "{name} ha apprezzato il tuo post",
"notification.follow": "{name} ha iniziato a seguirti",
"notification.mention": "{name} ti ha menzionato",
- "notification.poll": "A poll you have voted in has ended",
+ "notification.poll": "Un sondaggio in cui hai votato è terminato",
"notification.reblog": "{name} ha condiviso il tuo post",
"notifications.clear": "Cancella notifiche",
"notifications.clear_confirmation": "Vuoi davvero cancellare tutte le notifiche?",
@@ -258,7 +263,7 @@
"notifications.column_settings.filter_bar.show": "Mostra",
"notifications.column_settings.follow": "Nuovi seguaci:",
"notifications.column_settings.mention": "Menzioni:",
- "notifications.column_settings.poll": "Poll results:",
+ "notifications.column_settings.poll": "Risultati del sondaggio:",
"notifications.column_settings.push": "Notifiche push",
"notifications.column_settings.reblog": "Post condivisi:",
"notifications.column_settings.show": "Mostra in colonna",
@@ -268,14 +273,14 @@
"notifications.filter.favourites": "Apprezzati",
"notifications.filter.follows": "Seguaci",
"notifications.filter.mentions": "Menzioni",
- "notifications.filter.polls": "Poll results",
+ "notifications.filter.polls": "Risultati del sondaggio",
"notifications.group": "{count} notifiche",
"poll.closed": "Chiuso",
"poll.refresh": "Aggiorna",
"poll.total_votes": "{count, plural, one {# voto} other {# voti}}",
"poll.vote": "Vota",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
+ "poll_button.add_poll": "Aggiungi un sondaggio",
+ "poll_button.remove_poll": "Rimuovi sondaggio",
"privacy.change": "Modifica privacy del post",
"privacy.direct.long": "Invia solo a utenti menzionati",
"privacy.direct.short": "Diretto",
@@ -287,8 +292,8 @@
"privacy.unlisted.short": "Non elencato",
"regeneration_indicator.label": "Caricamento in corso…",
"regeneration_indicator.sublabel": "Stiamo preparando il tuo home feed!",
- "relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
+ "relative_time.days": "{number}g",
+ "relative_time.hours": "{number}o",
"relative_time.just_now": "ora",
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
@@ -302,8 +307,8 @@
"search.placeholder": "Cerca",
"search_popout.search_format": "Formato di ricerca avanzato",
"search_popout.tips.full_text": "Testo semplice per trovare gli status che hai scritto, segnato come apprezzati, condiviso o in cui sei stato citato, e inoltre i nomi utente, nomi visualizzati e hashtag che lo contengono.",
- "search_popout.tips.hashtag": "hashtag",
- "search_popout.tips.status": "status",
+ "search_popout.tips.hashtag": "etichetta",
+ "search_popout.tips.status": "stato",
"search_popout.tips.text": "Testo semplice per trovare nomi visualizzati, nomi utente e hashtag che lo contengono",
"search_popout.tips.user": "utente",
"search_results.accounts": "Gente",
@@ -340,7 +345,6 @@
"status.reply": "Rispondi",
"status.replyAll": "Rispondi alla conversazione",
"status.report": "Segnala @{name}",
- "status.sensitive_toggle": "Clicca per vedere",
"status.sensitive_warning": "Materiale sensibile",
"status.share": "Condividi",
"status.show_less": "Mostra meno",
@@ -367,7 +371,7 @@
"upload_area.title": "Trascina per caricare",
"upload_button.label": "Aggiungi file multimediale",
"upload_error.limit": "Limite al caricamento di file superato.",
- "upload_error.poll": "File upload not allowed with polls.",
+ "upload_error.poll": "Caricamento file non consentito nei sondaggi.",
"upload_form.description": "Descrizione per utenti con disabilità visive",
"upload_form.focus": "Modifica anteprima",
"upload_form.undo": "Cancella",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index f80988d0d..83a69e595 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "この項目を削除",
"compose_form.publish": "トゥート",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "メディアを閲覧注意にする",
"compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
"compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
"compose_form.spoiler.marked": "閲覧注意が設定されています",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "検索欄に移動",
"keyboard_shortcuts.start": "\"スタート\" カラムを開く",
"keyboard_shortcuts.toggle_hidden": "CWで隠れた文を見る/隠す",
+ "keyboard_shortcuts.toggle_sensitivity": "非表示のメディアを見る/隠す",
"keyboard_shortcuts.toot": "新規トゥート",
"keyboard_shortcuts.unfocus": "トゥート入力欄・検索欄から離れる",
"keyboard_shortcuts.up": "カラム内一つ上に移動",
"lightbox.close": "閉じる",
"lightbox.next": "次",
"lightbox.previous": "前",
+ "lightbox.view_context": "トゥートを表示",
"lists.account.add": "リストに追加",
"lists.account.remove": "リストから外す",
"lists.delete": "リストを削除",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "お気に入り",
"navigation_bar.filters": "フィルター設定",
"navigation_bar.follow_requests": "フォローリクエスト",
+ "navigation_bar.follows_and_followers": "フォロー・フォロワー",
"navigation_bar.info": "このサーバーについて",
"navigation_bar.keyboard_shortcuts": "ホットキー",
"navigation_bar.lists": "リスト",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "個人用",
"navigation_bar.pins": "固定したトゥート",
"navigation_bar.preferences": "ユーザー設定",
+ "navigation_bar.profile_directory": "ディレクトリ",
"navigation_bar.public_timeline": "連合タイムライン",
"navigation_bar.security": "セキュリティ",
"notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
@@ -340,7 +345,6 @@
"status.reply": "返信",
"status.replyAll": "全員に返信",
"status.report": "@{name}さんを通報",
- "status.sensitive_toggle": "クリックして表示",
"status.sensitive_warning": "閲覧注意",
"status.share": "共有",
"status.show_less": "隠す",
@@ -365,7 +369,7 @@
"trends.count_by_accounts": "{count}人がトゥート",
"ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
"upload_area.title": "ドラッグ&ドロップでアップロード",
- "upload_button.label": "メディアを追加 (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_button.label": "メディアを追加 ({formats})",
"upload_error.limit": "アップロードできる上限を超えています。",
"upload_error.poll": "アンケートではファイルをアップロードできません。",
"upload_form.description": "視覚障害者のための説明",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index ac983a546..ff7059aea 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "ტუტი",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "მედია მონიშნულია მგრძნობიარედ",
"compose_form.sensitive.unmarked": "მედია არაა მონიშნული მგრძნობიარედ",
"compose_form.spoiler.marked": "გაფრთხილების უკან ტექსტი დამალულია",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "ძიებაზე ფოკუსირებისთვის",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "გაფრთხილების უკან ტექსტის გამოსაჩენად/დასამალვად",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "ახალი ტუტის დასაწყებად",
"keyboard_shortcuts.unfocus": "შედგენის ტექსტ-არეაზე ფოკუსის მოსაშორებლად",
"keyboard_shortcuts.up": "სიაში ზემოთ გადასაადგილებლად",
"lightbox.close": "დახურვა",
"lightbox.next": "შემდეგი",
"lightbox.previous": "წინა",
+ "lightbox.view_context": "View context",
"lists.account.add": "სიაში დამატება",
"lists.account.remove": "სიიდან ამოშლა",
"lists.delete": "სიის წაშლა",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "ფავორიტები",
"navigation_bar.filters": "გაჩუმებული სიტყვები",
"navigation_bar.follow_requests": "დადევნების მოთხოვნები",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "ამ ინსტანციის შესახებ",
"navigation_bar.keyboard_shortcuts": "ცხელი კლავიშები",
"navigation_bar.lists": "სიები",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "პირადი",
"navigation_bar.pins": "აპინული ტუტები",
"navigation_bar.preferences": "პრეფერენსიები",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "ფედერალური თაიმლაინი",
"navigation_bar.security": "უსაფრთხოება",
"notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად",
@@ -340,7 +345,6 @@
"status.reply": "პასუხი",
"status.replyAll": "უპასუხე თემას",
"status.report": "დაარეპორტე @{name}",
- "status.sensitive_toggle": "დააწკაპუნეთ სანახავად",
"status.sensitive_warning": "მგრძნობიარე კონტენტი",
"status.share": "გაზიარება",
"status.show_less": "აჩვენე ნაკლები",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index ee7bf5d6e..b9bd7cac3 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Бұл жауапты өшір",
"compose_form.publish": "Түрт",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Медиа нәзік деп белгіленген",
"compose_form.sensitive.unmarked": "Медиа нәзік деп белгіленбеген",
"compose_form.spoiler.marked": "Мәтін ескертумен жасырылған",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "іздеу",
"keyboard_shortcuts.start": "бастапқы бағанға бару",
"keyboard_shortcuts.toggle_hidden": "жабық мәтінді CW ашу/жабу",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "жаңа жазба бастау",
"keyboard_shortcuts.unfocus": "жазба қалдыру алаңынан шығу",
"keyboard_shortcuts.up": "тізімде жоғары шығу",
"lightbox.close": "Жабу",
"lightbox.next": "Келесі",
"lightbox.previous": "Алдыңғы",
+ "lightbox.view_context": "View context",
"lists.account.add": "Тізімге қосу",
"lists.account.remove": "Тізімнен шығару",
"lists.delete": "Тізімді өшіру",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Таңдаулылар",
"navigation_bar.filters": "Үнсіз сөздер",
"navigation_bar.follow_requests": "Жазылуға сұранғандар",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Сервер туралы",
"navigation_bar.keyboard_shortcuts": "Ыстық пернелер",
"navigation_bar.lists": "Тізімдер",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Жеке",
"navigation_bar.pins": "Жабыстырылғандар",
"navigation_bar.preferences": "Басымдықтар",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Жаһандық желі",
"navigation_bar.security": "Қауіпсіздік",
"notification.favourite": "{name} жазбаңызды таңдаулыға қосты",
@@ -340,7 +345,6 @@
"status.reply": "Жауап",
"status.replyAll": "Тақырыпқа жауап",
"status.report": "Шағым @{name}",
- "status.sensitive_toggle": "Қарау үшін басыңыз",
"status.sensitive_warning": "Нәзік контент",
"status.share": "Бөлісу",
"status.show_less": "Аздап көрсет",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index a1e81a9d0..656a36bce 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "이 항목 삭제",
"compose_form.publish": "툿",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
"compose_form.sensitive.marked": "미디어가 열람주의로 설정되어 있습니다",
"compose_form.sensitive.unmarked": "미디어가 열람주의로 설정 되어 있지 않습니다",
"compose_form.spoiler.marked": "열람주의가 설정되어 있습니다",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "검색창에 포커스",
"keyboard_shortcuts.start": "\"시작하기\" 컬럼 열기",
"keyboard_shortcuts.toggle_hidden": "CW로 가려진 텍스트를 표시/비표시",
+ "keyboard_shortcuts.toggle_sensitivity": "이미지 보이기/숨기기",
"keyboard_shortcuts.toot": "새 툿 작성",
"keyboard_shortcuts.unfocus": "작성창에서 포커스 해제",
"keyboard_shortcuts.up": "리스트에서 위로 이동",
"lightbox.close": "닫기",
"lightbox.next": "다음",
"lightbox.previous": "이전",
+ "lightbox.view_context": "게시물 보기",
"lists.account.add": "리스트에 추가",
"lists.account.remove": "리스트에서 제거",
"lists.delete": "리스트 삭제",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "즐겨찾기",
"navigation_bar.filters": "뮤트",
"navigation_bar.follow_requests": "팔로우 요청",
+ "navigation_bar.follows_and_followers": "팔로우와 팔로워",
"navigation_bar.info": "이 서버에 대해서",
"navigation_bar.keyboard_shortcuts": "단축키",
"navigation_bar.lists": "리스트",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "개인용",
"navigation_bar.pins": "고정된 툿",
"navigation_bar.preferences": "사용자 설정",
+ "navigation_bar.profile_directory": "프로필 디렉토리",
"navigation_bar.public_timeline": "연합 타임라인",
"navigation_bar.security": "보안",
"notification.favourite": "{name}님이 즐겨찾기 했습니다",
@@ -340,14 +345,13 @@
"status.reply": "답장",
"status.replyAll": "전원에게 답장",
"status.report": "신고",
- "status.sensitive_toggle": "클릭해서 표시하기",
"status.sensitive_warning": "민감한 미디어",
"status.share": "공유",
"status.show_less": "숨기기",
"status.show_less_all": "모두 접기",
"status.show_more": "더 보기",
"status.show_more_all": "모두 펼치기",
- "status.show_thread": "스레드 보기",
+ "status.show_thread": "글타래 보기",
"status.unmute_conversation": "이 대화의 뮤트 해제하기",
"status.unpin": "고정 해제",
"suggestions.dismiss": "추천 지우기",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
new file mode 100644
index 000000000..ac58514d4
--- /dev/null
+++ b/app/javascript/mastodon/locales/lt.json
@@ -0,0 +1,388 @@
+{
+ "account.add_or_remove_from_list": "Add or Remove from lists",
+ "account.badges.bot": "Bot",
+ "account.block": "Block @{name}",
+ "account.block_domain": "Hide everything from {domain}",
+ "account.blocked": "Blocked",
+ "account.direct": "Direct message @{name}",
+ "account.domain_blocked": "Domain hidden",
+ "account.edit_profile": "Edit profile",
+ "account.endorse": "Feature on profile",
+ "account.follow": "Follow",
+ "account.followers": "Followers",
+ "account.followers.empty": "No one follows this user yet.",
+ "account.follows": "Follows",
+ "account.follows.empty": "This user doesn't follow anyone yet.",
+ "account.follows_you": "Follows you",
+ "account.hide_reblogs": "Hide boosts from @{name}",
+ "account.link_verified_on": "Ownership of this link was checked on {date}",
+ "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+ "account.media": "Media",
+ "account.mention": "Mention @{name}",
+ "account.moved_to": "{name} has moved to:",
+ "account.mute": "Mute @{name}",
+ "account.mute_notifications": "Mute notifications from @{name}",
+ "account.muted": "Muted",
+ "account.posts": "Toots",
+ "account.posts_with_replies": "Toots and replies",
+ "account.report": "Report @{name}",
+ "account.requested": "Awaiting approval. Click to cancel follow request",
+ "account.share": "Share @{name}'s profile",
+ "account.show_reblogs": "Show boosts from @{name}",
+ "account.unblock": "Unblock @{name}",
+ "account.unblock_domain": "Unhide {domain}",
+ "account.unendorse": "Don't feature on profile",
+ "account.unfollow": "Unfollow",
+ "account.unmute": "Unmute @{name}",
+ "account.unmute_notifications": "Unmute notifications from @{name}",
+ "alert.unexpected.message": "An unexpected error occurred.",
+ "alert.unexpected.title": "Oops!",
+ "boost_modal.combo": "You can press {combo} to skip this next time",
+ "bundle_column_error.body": "Something went wrong while loading this component.",
+ "bundle_column_error.retry": "Try again",
+ "bundle_column_error.title": "Network error",
+ "bundle_modal_error.close": "Close",
+ "bundle_modal_error.message": "Something went wrong while loading this component.",
+ "bundle_modal_error.retry": "Try again",
+ "column.blocks": "Blocked users",
+ "column.community": "Local timeline",
+ "column.direct": "Direct messages",
+ "column.domain_blocks": "Hidden domains",
+ "column.favourites": "Favourites",
+ "column.follow_requests": "Follow requests",
+ "column.home": "Home",
+ "column.lists": "Lists",
+ "column.mutes": "Muted users",
+ "column.notifications": "Notifications",
+ "column.pins": "Pinned toot",
+ "column.public": "Federated timeline",
+ "column_back_button.label": "Back",
+ "column_header.hide_settings": "Hide settings",
+ "column_header.moveLeft_settings": "Move column to the left",
+ "column_header.moveRight_settings": "Move column to the right",
+ "column_header.pin": "Pin",
+ "column_header.show_settings": "Show settings",
+ "column_header.unpin": "Unpin",
+ "column_subheading.settings": "Settings",
+ "community.column_settings.media_only": "Media Only",
+ "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+ "compose_form.direct_message_warning_learn_more": "Learn more",
+ "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+ "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+ "compose_form.lock_disclaimer.lock": "locked",
+ "compose_form.placeholder": "What is on your mind?",
+ "compose_form.poll.add_option": "Add a choice",
+ "compose_form.poll.duration": "Poll duration",
+ "compose_form.poll.option_placeholder": "Choice {number}",
+ "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.publish": "Toot",
+ "compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
+ "compose_form.sensitive.marked": "Media is marked as sensitive",
+ "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+ "compose_form.spoiler.marked": "Text is hidden behind warning",
+ "compose_form.spoiler.unmarked": "Text is not hidden",
+ "compose_form.spoiler_placeholder": "Write your warning here",
+ "confirmation_modal.cancel": "Cancel",
+ "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.confirm": "Block",
+ "confirmations.block.message": "Are you sure you want to block {name}?",
+ "confirmations.delete.confirm": "Delete",
+ "confirmations.delete.message": "Are you sure you want to delete this status?",
+ "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+ "confirmations.domain_block.confirm": "Hide entire domain",
+ "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+ "confirmations.mute.confirm": "Mute",
+ "confirmations.mute.message": "Are you sure you want to mute {name}?",
+ "confirmations.redraft.confirm": "Delete & redraft",
+ "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+ "confirmations.reply.confirm": "Reply",
+ "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+ "confirmations.unfollow.confirm": "Unfollow",
+ "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+ "embed.instructions": "Embed this status on your website by copying the code below.",
+ "embed.preview": "Here is what it will look like:",
+ "emoji_button.activity": "Activity",
+ "emoji_button.custom": "Custom",
+ "emoji_button.flags": "Flags",
+ "emoji_button.food": "Food & Drink",
+ "emoji_button.label": "Insert emoji",
+ "emoji_button.nature": "Nature",
+ "emoji_button.not_found": "No emojos!! (╯°□°)╯︵ ┻━┻",
+ "emoji_button.objects": "Objects",
+ "emoji_button.people": "People",
+ "emoji_button.recent": "Frequently used",
+ "emoji_button.search": "Search...",
+ "emoji_button.search_results": "Search results",
+ "emoji_button.symbols": "Symbols",
+ "emoji_button.travel": "Travel & Places",
+ "empty_column.account_timeline": "No toots here!",
+ "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.blocks": "You haven't blocked any users yet.",
+ "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+ "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+ "empty_column.domain_blocks": "There are no hidden domains yet.",
+ "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+ "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
+ "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+ "empty_column.hashtag": "There is nothing in this hashtag yet.",
+ "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+ "empty_column.home.public_timeline": "the public timeline",
+ "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+ "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+ "empty_column.mutes": "You haven't muted any users yet.",
+ "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+ "follow_request.authorize": "Authorize",
+ "follow_request.reject": "Reject",
+ "getting_started.developers": "Developers",
+ "getting_started.directory": "Profile directory",
+ "getting_started.documentation": "Documentation",
+ "getting_started.heading": "Getting started",
+ "getting_started.invite": "Invite people",
+ "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+ "getting_started.security": "Security",
+ "getting_started.terms": "Terms of service",
+ "hashtag.column_header.tag_mode.all": "and {additional}",
+ "hashtag.column_header.tag_mode.any": "or {additional}",
+ "hashtag.column_header.tag_mode.none": "without {additional}",
+ "hashtag.column_settings.select.no_options_message": "No suggestions found",
+ "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+ "hashtag.column_settings.tag_mode.all": "All of these",
+ "hashtag.column_settings.tag_mode.any": "Any of these",
+ "hashtag.column_settings.tag_mode.none": "None of these",
+ "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+ "home.column_settings.basic": "Basic",
+ "home.column_settings.show_reblogs": "Show boosts",
+ "home.column_settings.show_replies": "Show replies",
+ "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+ "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+ "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+ "introduction.federation.action": "Next",
+ "introduction.federation.federated.headline": "Federated",
+ "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+ "introduction.federation.home.headline": "Home",
+ "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+ "introduction.federation.local.headline": "Local",
+ "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+ "introduction.interactions.action": "Finish toot-orial!",
+ "introduction.interactions.favourite.headline": "Favourite",
+ "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+ "introduction.interactions.reblog.headline": "Boost",
+ "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+ "introduction.interactions.reply.headline": "Reply",
+ "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+ "introduction.welcome.action": "Let's go!",
+ "introduction.welcome.headline": "First steps",
+ "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+ "keyboard_shortcuts.back": "to navigate back",
+ "keyboard_shortcuts.blocked": "to open blocked users list",
+ "keyboard_shortcuts.boost": "to boost",
+ "keyboard_shortcuts.column": "to focus a status in one of the columns",
+ "keyboard_shortcuts.compose": "to focus the compose textarea",
+ "keyboard_shortcuts.description": "Description",
+ "keyboard_shortcuts.direct": "to open direct messages column",
+ "keyboard_shortcuts.down": "to move down in the list",
+ "keyboard_shortcuts.enter": "to open status",
+ "keyboard_shortcuts.favourite": "to favourite",
+ "keyboard_shortcuts.favourites": "to open favourites list",
+ "keyboard_shortcuts.federated": "to open federated timeline",
+ "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+ "keyboard_shortcuts.home": "to open home timeline",
+ "keyboard_shortcuts.hotkey": "Hotkey",
+ "keyboard_shortcuts.legend": "to display this legend",
+ "keyboard_shortcuts.local": "to open local timeline",
+ "keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.muted": "to open muted users list",
+ "keyboard_shortcuts.my_profile": "to open your profile",
+ "keyboard_shortcuts.notifications": "to open notifications column",
+ "keyboard_shortcuts.pinned": "to open pinned toots list",
+ "keyboard_shortcuts.profile": "to open author's profile",
+ "keyboard_shortcuts.reply": "to reply",
+ "keyboard_shortcuts.requests": "to open follow requests list",
+ "keyboard_shortcuts.search": "to focus search",
+ "keyboard_shortcuts.start": "to open \"get started\" column",
+ "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+ "keyboard_shortcuts.toot": "to start a brand new toot",
+ "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+ "keyboard_shortcuts.up": "to move up in the list",
+ "lightbox.close": "Close",
+ "lightbox.next": "Next",
+ "lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
+ "lists.account.add": "Add to list",
+ "lists.account.remove": "Remove from list",
+ "lists.delete": "Delete list",
+ "lists.edit": "Edit list",
+ "lists.edit.submit": "Change title",
+ "lists.new.create": "Add list",
+ "lists.new.title_placeholder": "New list title",
+ "lists.search": "Search among people you follow",
+ "lists.subheading": "Your lists",
+ "loading_indicator.label": "Loading...",
+ "media_gallery.toggle_visible": "Toggle visibility",
+ "missing_indicator.label": "Not found",
+ "missing_indicator.sublabel": "This resource could not be found",
+ "mute_modal.hide_notifications": "Hide notifications from this user?",
+ "navigation_bar.apps": "Mobile apps",
+ "navigation_bar.blocks": "Blocked users",
+ "navigation_bar.community_timeline": "Local timeline",
+ "navigation_bar.compose": "Compose new toot",
+ "navigation_bar.direct": "Direct messages",
+ "navigation_bar.discover": "Discover",
+ "navigation_bar.domain_blocks": "Hidden domains",
+ "navigation_bar.edit_profile": "Edit profile",
+ "navigation_bar.favourites": "Favourites",
+ "navigation_bar.filters": "Muted words",
+ "navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.follows_and_followers": "Follows and followers",
+ "navigation_bar.info": "About this server",
+ "navigation_bar.keyboard_shortcuts": "Hotkeys",
+ "navigation_bar.lists": "Lists",
+ "navigation_bar.logout": "Logout",
+ "navigation_bar.mutes": "Muted users",
+ "navigation_bar.personal": "Personal",
+ "navigation_bar.pins": "Pinned toots",
+ "navigation_bar.preferences": "Preferences",
+ "navigation_bar.profile_directory": "Profile directory",
+ "navigation_bar.public_timeline": "Federated timeline",
+ "navigation_bar.security": "Security",
+ "notification.favourite": "{name} favourited your status",
+ "notification.follow": "{name} followed you",
+ "notification.mention": "{name} mentioned you",
+ "notification.poll": "A poll you have voted in has ended",
+ "notification.reblog": "{name} boosted your status",
+ "notifications.clear": "Clear notifications",
+ "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+ "notifications.column_settings.alert": "Desktop notifications",
+ "notifications.column_settings.favourite": "Favourites:",
+ "notifications.column_settings.filter_bar.advanced": "Display all categories",
+ "notifications.column_settings.filter_bar.category": "Quick filter bar",
+ "notifications.column_settings.filter_bar.show": "Show",
+ "notifications.column_settings.follow": "New followers:",
+ "notifications.column_settings.mention": "Mentions:",
+ "notifications.column_settings.poll": "Poll results:",
+ "notifications.column_settings.push": "Push notifications",
+ "notifications.column_settings.reblog": "Boosts:",
+ "notifications.column_settings.show": "Show in column",
+ "notifications.column_settings.sound": "Play sound",
+ "notifications.filter.all": "All",
+ "notifications.filter.boosts": "Boosts",
+ "notifications.filter.favourites": "Favourites",
+ "notifications.filter.follows": "Follows",
+ "notifications.filter.mentions": "Mentions",
+ "notifications.filter.polls": "Poll results",
+ "notifications.group": "{count} notifications",
+ "poll.closed": "Closed",
+ "poll.refresh": "Refresh",
+ "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+ "poll.vote": "Vote",
+ "poll_button.add_poll": "Add a poll",
+ "poll_button.remove_poll": "Remove poll",
+ "privacy.change": "Adjust status privacy",
+ "privacy.direct.long": "Post to mentioned users only",
+ "privacy.direct.short": "Direct",
+ "privacy.private.long": "Post to followers only",
+ "privacy.private.short": "Followers-only",
+ "privacy.public.long": "Post to public timelines",
+ "privacy.public.short": "Public",
+ "privacy.unlisted.long": "Do not show in public timelines",
+ "privacy.unlisted.short": "Unlisted",
+ "regeneration_indicator.label": "Loading…",
+ "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+ "relative_time.days": "{number}d",
+ "relative_time.hours": "{number}h",
+ "relative_time.just_now": "now",
+ "relative_time.minutes": "{number}m",
+ "relative_time.seconds": "{number}s",
+ "reply_indicator.cancel": "Cancel",
+ "report.forward": "Forward to {target}",
+ "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+ "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+ "report.placeholder": "Additional comments",
+ "report.submit": "Submit",
+ "report.target": "Report {target}",
+ "search.placeholder": "Search",
+ "search_popout.search_format": "Advanced search format",
+ "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+ "search_popout.tips.hashtag": "hashtag",
+ "search_popout.tips.status": "status",
+ "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+ "search_popout.tips.user": "user",
+ "search_results.accounts": "People",
+ "search_results.hashtags": "Hashtags",
+ "search_results.statuses": "Toots",
+ "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+ "status.admin_account": "Open moderation interface for @{name}",
+ "status.admin_status": "Open this status in the moderation interface",
+ "status.block": "Block @{name}",
+ "status.cancel_reblog_private": "Unboost",
+ "status.cannot_reblog": "This post cannot be boosted",
+ "status.copy": "Copy link to status",
+ "status.delete": "Delete",
+ "status.detailed_status": "Detailed conversation view",
+ "status.direct": "Direct message @{name}",
+ "status.embed": "Embed",
+ "status.favourite": "Favourite",
+ "status.filtered": "Filtered",
+ "status.load_more": "Load more",
+ "status.media_hidden": "Media hidden",
+ "status.mention": "Mention @{name}",
+ "status.more": "More",
+ "status.mute": "Mute @{name}",
+ "status.mute_conversation": "Mute conversation",
+ "status.open": "Expand this status",
+ "status.pin": "Pin on profile",
+ "status.pinned": "Pinned toot",
+ "status.read_more": "Read more",
+ "status.reblog": "Boost",
+ "status.reblog_private": "Boost to original audience",
+ "status.reblogged_by": "{name} boosted",
+ "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+ "status.redraft": "Delete & re-draft",
+ "status.reply": "Reply",
+ "status.replyAll": "Reply to thread",
+ "status.report": "Report @{name}",
+ "status.sensitive_warning": "Sensitive content",
+ "status.share": "Share",
+ "status.show_less": "Show less",
+ "status.show_less_all": "Show less for all",
+ "status.show_more": "Show more",
+ "status.show_more_all": "Show more for all",
+ "status.show_thread": "Show thread",
+ "status.unmute_conversation": "Unmute conversation",
+ "status.unpin": "Unpin from profile",
+ "suggestions.dismiss": "Dismiss suggestion",
+ "suggestions.header": "You might be interested in…",
+ "tabs_bar.federated_timeline": "Federated",
+ "tabs_bar.home": "Home",
+ "tabs_bar.local_timeline": "Local",
+ "tabs_bar.notifications": "Notifications",
+ "tabs_bar.search": "Search",
+ "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+ "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+ "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+ "time_remaining.moments": "Moments remaining",
+ "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+ "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+ "upload_area.title": "Drag & drop to upload",
+ "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_error.limit": "File upload limit exceeded.",
+ "upload_error.poll": "File upload not allowed with polls.",
+ "upload_form.description": "Describe for the visually impaired",
+ "upload_form.focus": "Crop",
+ "upload_form.undo": "Delete",
+ "upload_progress.label": "Uploading...",
+ "video.close": "Close video",
+ "video.exit_fullscreen": "Exit full screen",
+ "video.expand": "Expand video",
+ "video.fullscreen": "Full screen",
+ "video.hide": "Hide video",
+ "video.mute": "Mute sound",
+ "video.pause": "Pause",
+ "video.play": "Play",
+ "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index ac3342699..647e23a69 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Publicēt",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Mēdijs ir atzīmēts kā sensitīvs",
"compose_form.sensitive.unmarked": "Mēdijs nav atzīmēts kā sensitīvs",
"compose_form.spoiler.marked": "Teksts ir paslēpts aiz brīdinājuma",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
"lightbox.close": "Close",
"lightbox.next": "Next",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favourites",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "About this instance",
"navigation_bar.keyboard_shortcuts": "Hotkeys",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Pinned toots",
"navigation_bar.preferences": "Preferences",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.security": "Security",
"notification.favourite": "{name} favourited your status",
@@ -340,7 +345,6 @@
"status.reply": "Reply",
"status.replyAll": "Reply to thread",
"status.report": "Report @{name}",
- "status.sensitive_toggle": "Click to view",
"status.sensitive_warning": "Sensitive content",
"status.share": "Share",
"status.show_less": "Show less",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 220cc86f9..d7c509963 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "to focus search",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "to start a brand new toot",
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"keyboard_shortcuts.up": "to move up in the list",
"lightbox.close": "Close",
"lightbox.next": "Next",
"lightbox.previous": "Previous",
+ "lightbox.view_context": "View context",
"lists.account.add": "Add to list",
"lists.account.remove": "Remove from list",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favourites",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Follow requests",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "About this instance",
"navigation_bar.keyboard_shortcuts": "Hotkeys",
"navigation_bar.lists": "Lists",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Pinned toots",
"navigation_bar.preferences": "Preferences",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.security": "Security",
"notification.favourite": "{name} favourited your status",
@@ -340,7 +345,6 @@
"status.reply": "Reply",
"status.replyAll": "Reply to thread",
"status.report": "Report @{name}",
- "status.sensitive_toggle": "Click to view",
"status.sensitive_warning": "Sensitive content",
"status.share": "Share",
"status.show_less": "Show less",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 96e39356b..f6504f4bb 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Deze keuze verwijderen",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Media als gevoelig markeren",
"compose_form.sensitive.marked": "Media is als gevoelig gemarkeerd",
"compose_form.sensitive.unmarked": "Media is niet als gevoelig gemarkeerd",
"compose_form.spoiler.marked": "Tekst is achter een waarschuwing verborgen",
@@ -161,14 +162,14 @@
"introduction.federation.action": "Volgende",
"introduction.federation.federated.headline": "Globaal",
"introduction.federation.federated.text": "Openbare toots van mensen op andere servers in de fediverse verschijnen op de globale tijdlijn.",
- "introduction.federation.home.headline": "Home",
+ "introduction.federation.home.headline": "Start",
"introduction.federation.home.text": "Toots van mensen die jij volgt verschijnen onder start. Je kunt iedereen op elke server volgen!",
- "introduction.federation.local.headline": "Local",
+ "introduction.federation.local.headline": "Lokaal",
"introduction.federation.local.text": "Openbare toots van mensen die ook op jouw server zitten verschijnen op de lokale tijdlijn.",
"introduction.interactions.action": "Introductie beëindigen!",
"introduction.interactions.favourite.headline": "Favorieten",
"introduction.interactions.favourite.text": "Je kunt door een toot aan jouw favorieten toe te voegen, deze voor later bewaren en de auteur laten weten dat je de toot leuk vind.",
- "introduction.interactions.reblog.headline": "Boost",
+ "introduction.interactions.reblog.headline": "Boosten",
"introduction.interactions.reblog.text": "Je kunt toots van andere mensen met jouw volgers delen door deze te boosten.",
"introduction.interactions.reply.headline": "Reageren",
"introduction.interactions.reply.text": "Je kunt op toots van andere mensen en op die van jezelf reageren, waardoor er een gesprek ontstaat.",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "om het zoekvak te focussen",
"keyboard_shortcuts.start": "om de \"Aan de slag\"-kolom te tonen",
"keyboard_shortcuts.toggle_hidden": "om tekst achter een waarschuwing (CW) te tonen/verbergen",
+ "keyboard_shortcuts.toggle_sensitivity": "om media te tonen/verbergen",
"keyboard_shortcuts.toot": "om een nieuwe toot te starten",
"keyboard_shortcuts.unfocus": "om het tekst- en zoekvak te ontfocussen",
"keyboard_shortcuts.up": "om omhoog te bewegen in de lijst",
"lightbox.close": "Sluiten",
"lightbox.next": "Volgende",
"lightbox.previous": "Vorige",
+ "lightbox.view_context": "Context tonen",
"lists.account.add": "Aan lijst toevoegen",
"lists.account.remove": "Uit lijst verwijderen",
"lists.delete": "Lijst verwijderen",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favorieten",
"navigation_bar.filters": "Filters",
"navigation_bar.follow_requests": "Volgverzoeken",
+ "navigation_bar.follows_and_followers": "Volgers en gevolgden",
"navigation_bar.info": "Over deze server",
"navigation_bar.keyboard_shortcuts": "Sneltoetsen",
"navigation_bar.lists": "Lijsten",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Persoonlijk",
"navigation_bar.pins": "Vastgezette toots",
"navigation_bar.preferences": "Instellingen",
+ "navigation_bar.profile_directory": "Gebruikersgids",
"navigation_bar.public_timeline": "Globale tijdlijn",
"navigation_bar.security": "Beveiliging",
"notification.favourite": "{name} voegde jouw toot als favoriet toe",
@@ -288,7 +293,7 @@
"regeneration_indicator.label": "Aan het laden…",
"regeneration_indicator.sublabel": "Jouw tijdlijn wordt aangemaakt!",
"relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
+ "relative_time.hours": "{number}u",
"relative_time.just_now": "nu",
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
@@ -319,7 +324,7 @@
"status.delete": "Verwijderen",
"status.detailed_status": "Uitgebreide gespreksweergave",
"status.direct": "Directe toot @{name}",
- "status.embed": "Embed",
+ "status.embed": "Insluiten",
"status.favourite": "Favoriet",
"status.filtered": "Gefilterd",
"status.load_more": "Meer laden",
@@ -332,7 +337,7 @@
"status.pin": "Aan profielpagina vastmaken",
"status.pinned": "Vastgemaakte toot",
"status.read_more": "Meer lezen",
- "status.reblog": "Boost",
+ "status.reblog": "Boosten",
"status.reblog_private": "Boost naar oorspronkelijke ontvangers",
"status.reblogged_by": "{name} boostte",
"status.reblogs.empty": "Niemand heeft deze toot nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
@@ -340,7 +345,6 @@
"status.reply": "Reageren",
"status.replyAll": "Reageer op iedereen",
"status.report": "Rapporteer @{name}",
- "status.sensitive_toggle": "Klik om te bekijken",
"status.sensitive_warning": "Gevoelige inhoud",
"status.share": "Delen",
"status.show_less": "Minder tonen",
@@ -357,15 +361,15 @@
"tabs_bar.local_timeline": "Lokaal",
"tabs_bar.notifications": "Meldingen",
"tabs_bar.search": "Zoeken",
- "time_remaining.days": "{number, plural, one {# dag} other {# dagen}} left",
- "time_remaining.hours": "{number, plural, one {# uur} other {# uur}} left",
- "time_remaining.minutes": "{number, plural, one {# minuut} other {# minuten}} left",
+ "time_remaining.days": "{number, plural, one {# dag} other {# dagen}} te gaan",
+ "time_remaining.hours": "{number, plural, one {# uur} other {# uur}} te gaan",
+ "time_remaining.minutes": "{number, plural, one {# minuut} other {# minuten}} te gaan",
"time_remaining.moments": "Nog enkele ogenblikken resterend",
- "time_remaining.seconds": "{number, plural, one {# seconde} other {# seconden}} left",
+ "time_remaining.seconds": "{number, plural, one {# seconde} other {# seconden}} te gaan",
"trends.count_by_accounts": "{count} {rawCount, plural, one {persoon praat} other {mensen praten}} hierover",
"ui.beforeunload": "Je concept zal verloren gaan als je Mastodon verlaat.",
- "upload_area.title": "Hierin slepen om te uploaden",
- "upload_button.label": "Media toevoegen (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_area.title": "Hiernaar toe slepen om te uploaden",
+ "upload_button.label": "Media toevoegen ({formats})",
"upload_error.limit": "Uploadlimiet van bestand overschreden.",
"upload_error.poll": "Het uploaden van bestanden is in polls niet toegestaan.",
"upload_form.description": "Omschrijf dit voor mensen met een visuele beperking",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index fc2c3c573..2ba8236e2 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Tut",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "å fokusere søk",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "å starte en helt ny tut",
"keyboard_shortcuts.unfocus": "å ufokusere komponerings-/søkefeltet",
"keyboard_shortcuts.up": "å flytte opp i listen",
"lightbox.close": "Lukk",
"lightbox.next": "Neste",
"lightbox.previous": "Forrige",
+ "lightbox.view_context": "View context",
"lists.account.add": "Legg til i listen",
"lists.account.remove": "Fjern fra listen",
"lists.delete": "Slett listen",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoritter",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Følgeforespørsler",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Utvidet informasjon",
"navigation_bar.keyboard_shortcuts": "Tastatursnarveier",
"navigation_bar.lists": "Lister",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Festa tuter",
"navigation_bar.preferences": "Preferanser",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Felles tidslinje",
"navigation_bar.security": "Security",
"notification.favourite": "{name} likte din status",
@@ -340,7 +345,6 @@
"status.reply": "Svar",
"status.replyAll": "Svar til samtale",
"status.report": "Rapporter @{name}",
- "status.sensitive_toggle": "Klikk for å vise",
"status.sensitive_warning": "Følsomt innhold",
"status.share": "Del",
"status.show_less": "Vis mindre",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 4dfb9904e..3178f200d 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Levar aquesta opcion",
"compose_form.publish": "Tut",
"compose_form.publish_loud": "{publish} !",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Lo mèdia es marcat coma sensible",
"compose_form.sensitive.unmarked": "Lo mèdia es pas marcat coma sensible",
"compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "anar a la recèrca",
"keyboard_shortcuts.start": "dobrir la colomna « Per començar »",
"keyboard_shortcuts.toggle_hidden": "mostrar/amagar lo tèxte dels avertiments",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "començar un estatut tot novèl",
"keyboard_shortcuts.unfocus": "quitar lo camp tèxte/de recèrca",
"keyboard_shortcuts.up": "far montar dins la lista",
"lightbox.close": "Tampar",
"lightbox.next": "Seguent",
"lightbox.previous": "Precedent",
+ "lightbox.view_context": "View context",
"lists.account.add": "Ajustar a la lista",
"lists.account.remove": "Levar de la lista",
"lists.delete": "Suprimir la lista",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favorits",
"navigation_bar.filters": "Mots ignorats",
"navigation_bar.follow_requests": "Demandas d’abonament",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Tocant aqueste servidor",
"navigation_bar.keyboard_shortcuts": "Acorchis clavièr",
"navigation_bar.lists": "Listas",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Tuts penjats",
"navigation_bar.preferences": "Preferéncias",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Flux public global",
"navigation_bar.security": "Seguretat",
"notification.favourite": "{name} a ajustat a sos favorits",
@@ -340,7 +345,6 @@
"status.reply": "Respondre",
"status.replyAll": "Respondre a la conversacion",
"status.report": "Senhalar @{name}",
- "status.sensitive_toggle": "Clicar per mostrar",
"status.sensitive_warning": "Contengut sensible",
"status.share": "Partejar",
"status.show_less": "Tornar plegar",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index b25a2c5f1..44edf6e3d 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -77,13 +77,14 @@
"compose_form.poll.remove_option": "Usuń tę opcję",
"compose_form.publish": "Wyślij",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Oznacz multimedia jako wrażliwe",
"compose_form.sensitive.marked": "Zawartość multimedia jest oznaczona jako wrażliwa",
"compose_form.sensitive.unmarked": "Zawartość multimedialna nie jest oznaczona jako wrażliwa",
"compose_form.spoiler.marked": "Tekst jest ukryty za ostrzeżeniem",
"compose_form.spoiler.unmarked": "Tekst nie jest ukryty",
"compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości",
"confirmation_modal.cancel": "Anuluj",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Zablokuj i zgłoś",
"confirmations.block.confirm": "Zablokuj",
"confirmations.block.message": "Czy na pewno chcesz zablokować {name}?",
"confirmations.delete.confirm": "Usuń",
@@ -117,7 +118,7 @@
"emoji_button.symbols": "Symbole",
"emoji_button.travel": "Podróże i miejsca",
"empty_column.account_timeline": "Brak wpisów tutaj!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_unavailable": "Profil niedostępny",
"empty_column.blocks": "Nie zablokowałeś(-aś) jeszcze żadnego użytkownika.",
"empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby zagaić!",
"empty_column.direct": "Nie masz żadnych wiadomości bezpośrednich. Kiedy dostaniesz lub wyślesz jakąś, pojawi się ona tutaj.",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "aby przejść do pola wyszukiwania",
"keyboard_shortcuts.start": "aby otworzyć kolumnę „Rozpocznij”",
"keyboard_shortcuts.toggle_hidden": "aby wyświetlić lub ukryć wpis spod CW",
+ "keyboard_shortcuts.toggle_sensitivity": "by pokazać/ukryć multimedia",
"keyboard_shortcuts.toot": "aby utworzyć nowy wpis",
"keyboard_shortcuts.unfocus": "aby opuścić pole wyszukiwania/pisania",
"keyboard_shortcuts.up": "aby przejść na górę listy",
"lightbox.close": "Zamknij",
"lightbox.next": "Następne",
"lightbox.previous": "Poprzednie",
+ "lightbox.view_context": "Pokaż kontekst",
"lists.account.add": "Dodaj do listy",
"lists.account.remove": "Usunąć z listy",
"lists.delete": "Usuń listę",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Ulubione",
"navigation_bar.filters": "Wyciszone słowa",
"navigation_bar.follow_requests": "Prośby o śledzenie",
+ "navigation_bar.follows_and_followers": "Śledzeni i śledzący",
"navigation_bar.info": "Szczegółowe informacje",
"navigation_bar.keyboard_shortcuts": "Skróty klawiszowe",
"navigation_bar.lists": "Listy",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Osobiste",
"navigation_bar.pins": "Przypięte wpisy",
"navigation_bar.preferences": "Preferencje",
+ "navigation_bar.profile_directory": "Katalog profilów",
"navigation_bar.public_timeline": "Globalna oś czasu",
"navigation_bar.security": "Bezpieczeństwo",
"notification.favourite": "{name} dodał(a) Twój wpis do ulubionych",
@@ -268,7 +273,7 @@
"notifications.filter.favourites": "Ulubione",
"notifications.filter.follows": "Śledzenia",
"notifications.filter.mentions": "Wspomienia",
- "notifications.filter.polls": "Poll results",
+ "notifications.filter.polls": "Wyniki głosowania",
"notifications.group": "{count, number} {count, plural, one {powiadomienie} few {powiadomienia} many {powiadomień} more {powiadomień}}",
"poll.closed": "Zamknięte",
"poll.refresh": "Odśwież",
@@ -302,7 +307,7 @@
"search.placeholder": "Szukaj",
"search_popout.search_format": "Zaawansowane wyszukiwanie",
"search_popout.tips.full_text": "Pozwala na wyszukiwanie wpisów które napisałeś(-aś), dodałeś(-aś) do ulubionych lub podbiłeś(-aś), w których o Tobie wspomniano, oraz pasujące nazwy użytkowników, pełne nazwy i hashtagi.",
- "search_popout.tips.hashtag": "hashtag",
+ "search_popout.tips.hashtag": "hasztag",
"search_popout.tips.status": "wpis",
"search_popout.tips.text": "Proste wyszukiwanie pasujących pseudonimów, nazw użytkowników i hashtagów",
"search_popout.tips.user": "użytkownik",
@@ -340,7 +345,6 @@
"status.reply": "Odpowiedz",
"status.replyAll": "Odpowiedz na wątek",
"status.report": "Zgłoś @{name}",
- "status.sensitive_toggle": "Naciśnij aby wyświetlić",
"status.sensitive_warning": "Wrażliwa zawartość",
"status.share": "Udostępnij",
"status.show_less": "Zwiń",
@@ -367,7 +371,7 @@
"upload_area.title": "Przeciągnij i upuść aby wysłać",
"upload_button.label": "Dodaj zawartość multimedialną (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_error.limit": "Przekroczono limit plików do wysłania.",
- "upload_error.poll": "File upload not allowed with polls.",
+ "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
"upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
"upload_form.focus": "Dopasuj podgląd",
"upload_form.undo": "Usuń",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index e469344ec..dca087af9 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remover essa opção",
"compose_form.publish": "Publicar",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Mídia está marcada como sensível",
"compose_form.sensitive.unmarked": "Mídia não está marcada como sensível",
"compose_form.spoiler.marked": "O texto está escondido por um aviso de conteúdo",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "para focar a pesquisa",
"keyboard_shortcuts.start": "para abrir a coluna \"primeiros passos\"",
"keyboard_shortcuts.toggle_hidden": "mostrar/esconder o texto com aviso de conteúdo",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "para compor um novo toot",
"keyboard_shortcuts.unfocus": "para remover o foco da área de composição/pesquisa",
"keyboard_shortcuts.up": "para mover para cima na lista",
"lightbox.close": "Fechar",
"lightbox.next": "Próximo",
"lightbox.previous": "Anterior",
+ "lightbox.view_context": "View context",
"lists.account.add": "Adicionar a listas",
"lists.account.remove": "Remover da lista",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Palavras silenciadas",
"navigation_bar.follow_requests": "Seguidores pendentes",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Mais informações",
"navigation_bar.keyboard_shortcuts": "Atalhos de teclado",
"navigation_bar.lists": "Listas",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Pessoal",
"navigation_bar.pins": "Postagens fixadas",
"navigation_bar.preferences": "Preferências",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Global",
"navigation_bar.security": "Segurança",
"notification.favourite": "{name} adicionou a sua postagem aos favoritos",
@@ -340,7 +345,6 @@
"status.reply": "Responder",
"status.replyAll": "Responder à sequência",
"status.report": "Denunciar @{name}",
- "status.sensitive_toggle": "Clique para ver",
"status.sensitive_warning": "Conteúdo sensível",
"status.share": "Compartilhar",
"status.show_less": "Mostrar menos",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 2abc3e252..157090c55 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Publicar",
"compose_form.publish_loud": "{publicar}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media marcado como sensível",
"compose_form.sensitive.unmarked": "Media não está marcado como sensível",
"compose_form.spoiler.marked": "Texto escondido atrás de aviso",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "para focar na pesquisa",
"keyboard_shortcuts.start": "para abrir a coluna dos \"primeiros passos\"",
"keyboard_shortcuts.toggle_hidden": "para mostrar/esconder texto atrás de CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "para compor um novo post",
"keyboard_shortcuts.unfocus": "para remover o foco da área de publicação/pesquisa",
"keyboard_shortcuts.up": "para mover para cima na lista",
"lightbox.close": "Fechar",
"lightbox.next": "Próximo",
"lightbox.previous": "Anterior",
+ "lightbox.view_context": "View context",
"lists.account.add": "Adicionar à lista",
"lists.account.remove": "Remover da lista",
"lists.delete": "Delete list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoritos",
"navigation_bar.filters": "Palavras silenciadas",
"navigation_bar.follow_requests": "Seguidores pendentes",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Sobre este servidor",
"navigation_bar.keyboard_shortcuts": "Atalhos de teclado",
"navigation_bar.lists": "Listas",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Posts fixos",
"navigation_bar.preferences": "Preferências",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Global",
"navigation_bar.security": "Segurança",
"notification.favourite": "{name} adicionou o teu post aos favoritos",
@@ -340,7 +345,6 @@
"status.reply": "Responder",
"status.replyAll": "Responder à conversa",
"status.report": "Denunciar @{name}",
- "status.sensitive_toggle": "Clique para ver",
"status.sensitive_warning": "Conteúdo sensível",
"status.share": "Compartilhar",
"status.show_less": "Mostrar menos",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index c0ec77cc6..dcb7a088d 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Postează",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Conținutul media este marcat ca sensibil",
"compose_form.sensitive.unmarked": "Conținutul media nu este marcat ca sensibil",
"compose_form.spoiler.marked": "Textul este ascuns sub o avertizare",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "să focuseze căutarea",
"keyboard_shortcuts.start": "să deschidă coloana \"Începere\"",
"keyboard_shortcuts.toggle_hidden": "să arate/ascundă textul in spatele CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "să înceapă o postare nouă",
"keyboard_shortcuts.unfocus": "să dezactiveze zona de compunere/căutare",
"keyboard_shortcuts.up": "să mute mai sus în listă",
"lightbox.close": "Închide",
"lightbox.next": "Următorul",
"lightbox.previous": "Precedentul",
+ "lightbox.view_context": "View context",
"lists.account.add": "Adaugă în listă",
"lists.account.remove": "Elimină din listă",
"lists.delete": "Șterge lista",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favorite",
"navigation_bar.filters": "Cuvinte oprite",
"navigation_bar.follow_requests": "Cereri de urmărire",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Despre această instanță",
"navigation_bar.keyboard_shortcuts": "Prescurtări",
"navigation_bar.lists": "Liste",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Postări fixate",
"navigation_bar.preferences": "Preferințe",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Flux global",
"navigation_bar.security": "Securitate",
"notification.favourite": "{name} a adăugat statusul tău la favorite",
@@ -340,7 +345,6 @@
"status.reply": "Răspunde",
"status.replyAll": "Răspunde la topic",
"status.report": "Raportează @{name}",
- "status.sensitive_toggle": "Afișează",
"status.sensitive_warning": "Conținut sensibil",
"status.share": "Distribuie",
"status.show_less": "Arată mai puțin",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 475899797..d720b6272 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -14,7 +14,7 @@
"account.follows": "Подписки",
"account.follows.empty": "Этот пользователь ни на кого не подписан.",
"account.follows_you": "Подписан(а) на Вас",
- "account.hide_reblogs": "Скрыть продвижения от @{name}",
+ "account.hide_reblogs": "Скрыть реблоги от @{name}",
"account.link_verified_on": "Владение этой ссылкой было проверено {date}",
"account.locked_info": "Это закрытый аккаунт. Его владелец вручную одобряет подписчиков.",
"account.media": "Медиа",
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Удалить этот вариант",
"compose_form.publish": "Трубить",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Пометить медиафайл как чувствительный",
"compose_form.sensitive.marked": "Медиафайлы не отмечены как чувствительные",
"compose_form.sensitive.unmarked": "Медиафайлы не отмечены как чувствительные",
"compose_form.spoiler.marked": "Текст скрыт за предупреждением",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "перейти к поиску",
"keyboard_shortcuts.start": "перейти к разделу \"добро пожаловать\"",
"keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением",
+ "keyboard_shortcuts.toggle_sensitivity": "показать/скрыть медиафайлы",
"keyboard_shortcuts.toot": "начать писать новый пост",
"keyboard_shortcuts.unfocus": "убрать фокус с поля ввода/поиска",
"keyboard_shortcuts.up": "вверх по списку",
"lightbox.close": "Закрыть",
"lightbox.next": "Далее",
"lightbox.previous": "Назад",
+ "lightbox.view_context": "Контекст",
"lists.account.add": "Добавить в список",
"lists.account.remove": "Убрать из списка",
"lists.delete": "Удалить список",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Понравившееся",
"navigation_bar.filters": "Заглушенные слова",
"navigation_bar.follow_requests": "Запросы на подписку",
+ "navigation_bar.follows_and_followers": "Подписки и подписчики",
"navigation_bar.info": "Об узле",
"navigation_bar.keyboard_shortcuts": "Сочетания клавиш",
"navigation_bar.lists": "Списки",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Личное",
"navigation_bar.pins": "Закреплённые посты",
"navigation_bar.preferences": "Опции",
+ "navigation_bar.profile_directory": "Каталог профилей",
"navigation_bar.public_timeline": "Глобальная лента",
"navigation_bar.security": "Безопасность",
"notification.favourite": "{name} понравился Ваш статус",
@@ -340,7 +345,6 @@
"status.reply": "Ответить",
"status.replyAll": "Ответить всем",
"status.report": "Пожаловаться",
- "status.sensitive_toggle": "Нажмите для просмотра",
"status.sensitive_warning": "Чувствительный контент",
"status.share": "Поделиться",
"status.show_less": "Свернуть",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index c4fcb9f18..18993af97 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,5 +1,5 @@
{
- "account.add_or_remove_from_list": "Pridaj, alebo odstráň zo zoznamov",
+ "account.add_or_remove_from_list": "Pridaj do, alebo odober zo zoznamov",
"account.badges.bot": "Bot",
"account.block": "Blokuj @{name}",
"account.block_domain": "Ukry všetko z {domain}",
@@ -36,7 +36,7 @@
"account.unmute": "Prestaň ignorovať @{name}",
"account.unmute_notifications": "Zruš stĺmenie oboznámení od @{name}",
"alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
- "alert.unexpected.title": "Oops!",
+ "alert.unexpected.title": "Ups!",
"boost_modal.combo": "Nabudúce môžeš kliknúť {combo} pre preskočenie",
"bundle_column_error.body": "Pri načítaní tohto prvku nastala nejaká chyba.",
"bundle_column_error.retry": "Skús to znova",
@@ -77,13 +77,14 @@
"compose_form.poll.remove_option": "Odstráň túto voľbu",
"compose_form.publish": "Pošli",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Označ médiá ako chúlostivé",
"compose_form.sensitive.marked": "Médiálny obsah je označený ako chúlostivý",
"compose_form.sensitive.unmarked": "Médiálny obsah nieje označený ako chúlostivý",
"compose_form.spoiler.marked": "Text je ukrytý za varovaním",
"compose_form.spoiler.unmarked": "Text nieje ukrytý",
"compose_form.spoiler_placeholder": "Sem napíš tvoje varovanie",
"confirmation_modal.cancel": "Zruš",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "Zablokuj a nahlás",
"confirmations.block.confirm": "Blokuj",
"confirmations.block.message": "Si si istý/á, že chceš blokovať {name}?",
"confirmations.delete.confirm": "Vymaž",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "zameraj sa na vyhľadávanie",
"keyboard_shortcuts.start": "otvor panel ''začíname''",
"keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW",
+ "keyboard_shortcuts.toggle_sensitivity": "pre zobrazenie/skrytie médií",
"keyboard_shortcuts.toot": "začni úplne nový príspevok",
"keyboard_shortcuts.unfocus": "nesústreď sa na písaciu plochu, alebo hľadanie",
"keyboard_shortcuts.up": "posuň sa vyššie v zozname",
"lightbox.close": "Zatvor",
"lightbox.next": "Ďalšie",
"lightbox.previous": "Predchádzajúci",
+ "lightbox.view_context": "Ukáž kontext",
"lists.account.add": "Pridaj do zoznamu",
"lists.account.remove": "Odober zo zoznamu",
"lists.delete": "Vymaž list",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Obľúbené",
"navigation_bar.filters": "Filtrované slová",
"navigation_bar.follow_requests": "Žiadosti o sledovanie",
+ "navigation_bar.follows_and_followers": "Následovaní a sledovatelia",
"navigation_bar.info": "O tomto serveri",
"navigation_bar.keyboard_shortcuts": "Klávesové skratky",
"navigation_bar.lists": "Zoznamy",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Osobné",
"navigation_bar.pins": "Pripnuté príspevky",
"navigation_bar.preferences": "Voľby",
+ "navigation_bar.profile_directory": "Katalóg profilov",
"navigation_bar.public_timeline": "Federovaná časová os",
"navigation_bar.security": "Zabezbečenie",
"notification.favourite": "{name} si obľúbil/a tvoj príspevok",
@@ -287,11 +292,11 @@
"privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
"regeneration_indicator.label": "Načítava sa…",
"regeneration_indicator.sublabel": "Vaša domovská nástenka sa pripravuje!",
- "relative_time.days": "{number}d",
- "relative_time.hours": "{number}h",
+ "relative_time.days": "{number}dní",
+ "relative_time.hours": "{number}hod",
"relative_time.just_now": "teraz",
- "relative_time.minutes": "{number}m",
- "relative_time.seconds": "{number}s",
+ "relative_time.minutes": "{number}min",
+ "relative_time.seconds": "{number}sek",
"reply_indicator.cancel": "Zrušiť",
"report.forward": "Posuň ku {target}",
"report.forward_hint": "Tento účet je z iného serveru. Chceš poslať anonymnú kópiu hlásenia aj tam?",
@@ -303,7 +308,7 @@
"search_popout.search_format": "Pokročilé vyhľadávanie",
"search_popout.tips.full_text": "Vráti jednoduchý textový výpis príspevkov ktoré si napísal/a, ktoré si obľúbil/a, povýšil/a, alebo aj tých, v ktorých si bol/a spomenutý/á, a potom všetky zadaniu odpovedajúce prezívky, mená a haštagy.",
"search_popout.tips.hashtag": "haštag",
- "search_popout.tips.status": "status",
+ "search_popout.tips.status": "príspevok",
"search_popout.tips.text": "Vráti jednoduchý textový výpis zhodujúcich sa mien, prezývok a haštagov",
"search_popout.tips.user": "užívateľ",
"search_results.accounts": "Ľudia",
@@ -340,7 +345,6 @@
"status.reply": "Odpovedať",
"status.replyAll": "Odpovedz na diskusiu",
"status.report": "Nahlás @{name}",
- "status.sensitive_toggle": "Klikni pre zobrazenie",
"status.sensitive_warning": "Chúlostivý obsah",
"status.share": "Zdieľaj",
"status.show_less": "Zobraz menej",
@@ -357,7 +361,7 @@
"tabs_bar.local_timeline": "Miestna",
"tabs_bar.notifications": "Oboznámenia",
"tabs_bar.search": "Hľadaj",
- "time_remaining.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dni} other {# dni}}",
+ "time_remaining.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dní} other {# dni}}",
"time_remaining.hours": "Ostáva {number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodiny}}",
"time_remaining.minutes": "Ostáva {number, plural, one {# minúta} few {# minút} many {# minút} other {# minúty}}",
"time_remaining.moments": "Ostáva už iba chviľka",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index f7a294cfe..51794a862 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -13,10 +13,10 @@
"account.followers.empty": "Nihče ne sledi temu uporabniku.",
"account.follows": "Sledi",
"account.follows.empty": "Ta uporabnik še ne sledi nikomur.",
- "account.follows_you": "Ti sledi",
- "account.hide_reblogs": "Skrij sunke od @{name}",
+ "account.follows_you": "Sledi tebi",
+ "account.hide_reblogs": "Skrij spodbude od @{name}",
"account.link_verified_on": "Lastništvo te povezave je bilo preverjeno {date}",
- "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+ "account.locked_info": "Stanje zasebnosti računa je nastavljeno na zaklenjeno. Lastnik ročno pregleda, kdo ga lahko spremlja.",
"account.media": "Mediji",
"account.mention": "Omeni @{name}",
"account.moved_to": "{name} se je premaknil na:",
@@ -28,16 +28,16 @@
"account.report": "Prijavi @{name}",
"account.requested": "Čakanje na odobritev. Kliknite, da prekličete prošnjo za sledenje",
"account.share": "Delite profil osebe @{name}",
- "account.show_reblogs": "Pokaži delitve osebe @{name}",
+ "account.show_reblogs": "Pokaži spodbude osebe @{name}",
"account.unblock": "Odblokiraj @{name}",
"account.unblock_domain": "Razkrij {domain}",
- "account.unendorse": "Don't feature on profile",
+ "account.unendorse": "Ne vključi v profil",
"account.unfollow": "Prenehaj slediti",
"account.unmute": "Odtišaj @{name}",
"account.unmute_notifications": "Vklopi obvestila od @{name}",
"alert.unexpected.message": "Zgodila se je nepričakovana napaka.",
"alert.unexpected.title": "Uups!",
- "boost_modal.combo": "Če želite naslednjič preskočiti to, lahko pritisnete {combo}",
+ "boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
"bundle_column_error.body": "Med nalaganjem te komponente je prišlo do napake.",
"bundle_column_error.retry": "Poskusi ponovno",
"bundle_column_error.title": "Napaka omrežja",
@@ -67,48 +67,49 @@
"community.column_settings.media_only": "Samo mediji",
"compose_form.direct_message_warning": "Ta tut bo viden le vsem omenjenim uporabnikom.",
"compose_form.direct_message_warning_learn_more": "Nauči se več",
- "compose_form.hashtag_warning": "Ta tut ne bo naveden pod nobenim hashtagom, ker ni dodan hashtag. Samo javne tute lahko iščete pod hashtagom.",
+ "compose_form.hashtag_warning": "Ta tut ne bo naveden pod nobenim ključnikom, ker ni javen. Samo javne tute lahko iščete s ključniki.",
"compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
"compose_form.lock_disclaimer.lock": "zaklenjen",
"compose_form.placeholder": "O čem razmišljaš?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "Dodaj izbiro",
+ "compose_form.poll.duration": "Trajanje ankete",
+ "compose_form.poll.option_placeholder": "Izbira {number}",
+ "compose_form.poll.remove_option": "Odstrani to izbiro",
"compose_form.publish": "Tutni",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Označi medij kot občutljiv",
"compose_form.sensitive.marked": "Medij je označen kot občutljiv",
"compose_form.sensitive.unmarked": "Medij ni označen kot občutljiv",
"compose_form.spoiler.marked": "Besedilo je skrito za opozorilom",
"compose_form.spoiler.unmarked": "Besedilo ni skrito",
- "compose_form.spoiler_placeholder": "Napišite opozorilo tukaj",
+ "compose_form.spoiler_placeholder": "Tukaj napišite opozorilo",
"confirmation_modal.cancel": "Prekliči",
- "confirmations.block.block_and_report": "Block & Report",
- "confirmations.block.confirm": "Block",
+ "confirmations.block.block_and_report": "Blokiraj in Prijavi",
+ "confirmations.block.confirm": "Blokiraj",
"confirmations.block.message": "Ali ste prepričani, da želite blokirati {name}?",
- "confirmations.delete.confirm": "Delete",
+ "confirmations.delete.confirm": "Izbriši",
"confirmations.delete.message": "Ali ste prepričani, da želite izbrisati to stanje?",
- "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.confirm": "Izbriši",
"confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
"confirmations.domain_block.confirm": "Skrij celotno domeno",
- "confirmations.domain_block.message": "Ali ste res, res prepričani, da želite blokirati celotno {domain}? V večini primerov je nekaj ciljnih blokiranj ali utišanj dovolj in boljše.",
+ "confirmations.domain_block.message": "Ali ste res, res prepričani, da želite blokirati celotno {domain}? V večini primerov je nekaj ciljnih blokiranj ali utišanj dovolj in boljše. Vsebino iz te domene ne boste videli v javnih časovnicah ali obvestilih. Vaši sledilci iz te domene bodo odstranjeni.",
"confirmations.mute.confirm": "Utišanje",
"confirmations.mute.message": "Ali ste prepričani, da želite utišati {name}?",
"confirmations.redraft.confirm": "Izbriši in preoblikuj",
- "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.reply.confirm": "Reply",
+ "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in spodbude bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
+ "confirmations.reply.confirm": "Odgovori",
"confirmations.reply.message": "Odgovarjanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
"confirmations.unfollow.confirm": "Prenehaj slediti",
"confirmations.unfollow.message": "Ali ste prepričani, da ne želite več slediti {name}?",
"embed.instructions": "Vstavi ta status na svojo spletno stran tako, da kopirate spodnjo kodo.",
- "embed.preview": "Tukaj je, kako bo izgledalo:",
+ "embed.preview": "Tako bo izgledalo:",
"emoji_button.activity": "Dejavnost",
"emoji_button.custom": "Po meri",
"emoji_button.flags": "Zastave",
"emoji_button.food": "Hrana in Pijača",
- "emoji_button.label": "Vstavi emojija",
+ "emoji_button.label": "Vstavi emotikon",
"emoji_button.nature": "Narava",
- "emoji_button.not_found": "Ni emojijev!! (╯°□°)╯︵ ┻━┻",
+ "emoji_button.not_found": "Ni emotikonov!! (╯°□°)╯︵ ┻━┻",
"emoji_button.objects": "Predmeti",
"emoji_button.people": "Ljudje",
"emoji_button.recent": "Pogosto uporabljeni",
@@ -116,231 +117,234 @@
"emoji_button.search_results": "Rezultati iskanja",
"emoji_button.symbols": "Simboli",
"emoji_button.travel": "Potovanja in Kraji",
- "empty_column.account_timeline": "No toots here!",
- "empty_column.account_unavailable": "Profile unavailable",
+ "empty_column.account_timeline": "Tukaj ni tutov!",
+ "empty_column.account_unavailable": "Profil ni na voljo",
"empty_column.blocks": "Niste še blokirali nobenega uporabnika.",
"empty_column.community": "Lokalna časovnica je prazna. Napišite nekaj javnega, da se bo žoga zakotalila!",
- "empty_column.direct": "Nimate še nobenih neposrednih sporočil. Ko ga pošljete ali prejmete, se prikaže tukaj.",
+ "empty_column.direct": "Nimate še nobenih neposrednih sporočil. Ko ga boste poslali ali prejeli, se bo prikazal tukaj.",
"empty_column.domain_blocks": "Še vedno ni skritih domen.",
- "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
- "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
- "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
- "empty_column.hashtag": "V tem hashtagu še ni nič.",
+ "empty_column.favourited_statuses": "Nimate priljubljenih tutov. Ko boste vzljubili kakšnega, se bo prikazal tukaj.",
+ "empty_column.favourites": "Nihče še ni vzljubil tega tuta. Ko ga bo nekdo, se bo pojavil tukaj.",
+ "empty_column.follow_requests": "Nimate prošenj za sledenje. Ko boste prejeli kakšno, se bo prikazala tukaj.",
+ "empty_column.hashtag": "V tem ključniku še ni nič.",
"empty_column.home": "Vaša domača časovnica je prazna! Obiščite {public} ali uporabite iskanje, da se boste srečali druge uporabnike.",
"empty_column.home.public_timeline": "javna časovnica",
"empty_column.list": "Na tem seznamu ni ničesar. Ko bodo člani tega seznama objavili nove statuse, se bodo pojavili tukaj.",
- "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
- "empty_column.mutes": "You haven't muted any users yet.",
+ "empty_column.lists": "Nimate seznamov. Ko ga boste ustvarili, se bo prikazal tukaj.",
+ "empty_column.mutes": "Niste utišali še nobenega uporabnika.",
"empty_column.notifications": "Nimate še nobenih obvestil. Poveži se z drugimi, da začnete pogovor.",
- "empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih vozlišč",
- "follow_request.authorize": "Odobri",
+ "empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih strežnikov",
+ "follow_request.authorize": "Overi",
"follow_request.reject": "Zavrni",
- "getting_started.developers": "Developers",
- "getting_started.directory": "Profile directory",
- "getting_started.documentation": "Documentation",
- "getting_started.heading": "Prvi koraki",
- "getting_started.invite": "Invite people",
- "getting_started.open_source_notice": "Mastodon je odprtokodna programska oprema. V GitHubu na {github} lahko prispevate ali poročate o napakah.",
- "getting_started.security": "Security",
- "getting_started.terms": "Terms of service",
- "hashtag.column_header.tag_mode.all": "and {additional}",
- "hashtag.column_header.tag_mode.any": "or {additional}",
- "hashtag.column_header.tag_mode.none": "without {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
- "hashtag.column_settings.tag_mode.all": "All of these",
- "hashtag.column_settings.tag_mode.any": "Any of these",
- "hashtag.column_settings.tag_mode.none": "None of these",
- "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+ "getting_started.developers": "Razvijalci",
+ "getting_started.directory": "Imenik profilov",
+ "getting_started.documentation": "Dokumentacija",
+ "getting_started.heading": "Kako začeti",
+ "getting_started.invite": "Povabite osebe",
+ "getting_started.open_source_notice": "Mastodon je odprtokodna programska oprema. Na GitHubu na {github} lahko prispevate ali poročate o napakah.",
+ "getting_started.security": "Varnost",
+ "getting_started.terms": "Pogoji uporabe",
+ "hashtag.column_header.tag_mode.all": "in {additional}",
+ "hashtag.column_header.tag_mode.any": "ali {additional}",
+ "hashtag.column_header.tag_mode.none": "brez {additional}",
+ "hashtag.column_settings.select.no_options_message": "Ni najdenih predlogov",
+ "hashtag.column_settings.select.placeholder": "Vpiši ključnik…",
+ "hashtag.column_settings.tag_mode.all": "Vse od naštetega",
+ "hashtag.column_settings.tag_mode.any": "Karkoli od naštetega",
+ "hashtag.column_settings.tag_mode.none": "Nič od naštetega",
+ "hashtag.column_settings.tag_toggle": "Za ta stolpec vključi dodatne oznake",
"home.column_settings.basic": "Osnovno",
- "home.column_settings.show_reblogs": "Pokaži sunke",
+ "home.column_settings.show_reblogs": "Pokaži spodbude",
"home.column_settings.show_replies": "Pokaži odgovore",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
- "introduction.federation.action": "Next",
- "introduction.federation.federated.headline": "Federated",
- "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
- "introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
- "introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
- "introduction.interactions.favourite.headline": "Favourite",
- "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
- "introduction.interactions.reblog.headline": "Boost",
- "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
- "introduction.interactions.reply.headline": "Reply",
- "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
- "introduction.welcome.action": "Let's go!",
- "introduction.welcome.headline": "First steps",
- "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
- "keyboard_shortcuts.back": "za krmarjenje nazaj",
- "keyboard_shortcuts.blocked": "to open blocked users list",
- "keyboard_shortcuts.boost": "suniti",
- "keyboard_shortcuts.column": "osredotočiti status v enega od stolpcev",
- "keyboard_shortcuts.compose": "osredotočiti na sestavljanje besedila",
+ "intervals.full.days": "{number, plural, one {# dan} two {# dni} few {# dni} other {# dni}}",
+ "intervals.full.hours": "{number, plural, one {# ura} two {# uri} few {# ure} other {# ur}}",
+ "intervals.full.minutes": "{number, plural, one {# minuta} two {# minuti} few {# minute} other {# minut}}",
+ "introduction.federation.action": "Naprej",
+ "introduction.federation.federated.headline": "Združeno",
+ "introduction.federation.federated.text": "Javne objave iz drugih strežnikov fediverse-a bodo prikazane v združeni časovnici.",
+ "introduction.federation.home.headline": "Domov",
+ "introduction.federation.home.text": "Objave oseb, ki jim sledite, bodo prikazane v vaši domači časovnici. Lahko sledite vsakomur na katerem koli strežniku!",
+ "introduction.federation.local.headline": "Lokalno",
+ "introduction.federation.local.text": "Javne objave ljudi na istem strežniku, se bodo prikazale na lokalni časovnici.",
+ "introduction.interactions.action": "Zaključi vadnico!",
+ "introduction.interactions.favourite.headline": "Priljubljeni",
+ "introduction.interactions.favourite.text": "Tut lahko shranite za pozneje in ga vzljubite ter s tem pokažete avtorju, da vam je ta tut priljubljen.",
+ "introduction.interactions.reblog.headline": "Spodbudi",
+ "introduction.interactions.reblog.text": "Tute drugih ljudi lahko delite z vašimi sledilci, tako da spodbudite tute.",
+ "introduction.interactions.reply.headline": "Odgovori",
+ "introduction.interactions.reply.text": "Lahko odgovarjate na tuje in vaše tute, kar bo odgovore povezalo v pogovor.",
+ "introduction.welcome.action": "Gremo!",
+ "introduction.welcome.headline": "Prvi koraki",
+ "introduction.welcome.text": "Dobrodošli v fediverse-u! Čez nekaj trenutkov boste lahko oddajali sporočila in se pogovarjali s prijatelji prek različnih strežnikov. Vendar je ta strežnik {domain} poseben - gosti vaš profil, zato si zapomnite njegovo ime.",
+ "keyboard_shortcuts.back": "pojdi nazaj",
+ "keyboard_shortcuts.blocked": "odpri seznam blokiranih uporabnikov",
+ "keyboard_shortcuts.boost": "spodbudi",
+ "keyboard_shortcuts.column": "fokusiraj na status v enemu od stolpcev",
+ "keyboard_shortcuts.compose": "fokusiraj na območje za sestavljanje besedila",
"keyboard_shortcuts.description": "Opis",
- "keyboard_shortcuts.direct": "to open direct messages column",
- "keyboard_shortcuts.down": "premakniti navzdol po seznamu",
- "keyboard_shortcuts.enter": "odpreti status",
- "keyboard_shortcuts.favourite": "to favourite",
- "keyboard_shortcuts.favourites": "to open favourites list",
- "keyboard_shortcuts.federated": "to open federated timeline",
+ "keyboard_shortcuts.direct": "odpri stolpec za neposredna sporočila",
+ "keyboard_shortcuts.down": "premakni se navzdol po seznamu",
+ "keyboard_shortcuts.enter": "odpri status",
+ "keyboard_shortcuts.favourite": "vzljubi",
+ "keyboard_shortcuts.favourites": "odpri seznam priljubljenih",
+ "keyboard_shortcuts.federated": "odpri združeno časovnico",
"keyboard_shortcuts.heading": "Tipkovne bližnjice",
- "keyboard_shortcuts.home": "to open home timeline",
+ "keyboard_shortcuts.home": "odpri domačo časovnico",
"keyboard_shortcuts.hotkey": "Hitra tipka",
- "keyboard_shortcuts.legend": "to display this legend",
- "keyboard_shortcuts.local": "to open local timeline",
- "keyboard_shortcuts.mention": "to mention author",
- "keyboard_shortcuts.muted": "to open muted users list",
- "keyboard_shortcuts.my_profile": "to open your profile",
- "keyboard_shortcuts.notifications": "to open notifications column",
- "keyboard_shortcuts.pinned": "to open pinned toots list",
- "keyboard_shortcuts.profile": "to open author's profile",
- "keyboard_shortcuts.reply": "to reply",
- "keyboard_shortcuts.requests": "to open follow requests list",
- "keyboard_shortcuts.search": "to focus search",
- "keyboard_shortcuts.start": "to open \"get started\" column",
- "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
- "keyboard_shortcuts.toot": "da začnete povsem nov tut",
- "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
- "keyboard_shortcuts.up": "to move up in the list",
- "lightbox.close": "Close",
- "lightbox.next": "Next",
- "lightbox.previous": "Previous",
- "lists.account.add": "Add to list",
- "lists.account.remove": "Remove from list",
- "lists.delete": "Delete list",
- "lists.edit": "Edit list",
- "lists.edit.submit": "Change title",
- "lists.new.create": "Add list",
- "lists.new.title_placeholder": "New list title",
- "lists.search": "Search among people you follow",
- "lists.subheading": "Your lists",
- "loading_indicator.label": "Loading...",
- "media_gallery.toggle_visible": "Toggle visibility",
- "missing_indicator.label": "Not found",
- "missing_indicator.sublabel": "This resource could not be found",
- "mute_modal.hide_notifications": "Hide notifications from this user?",
- "navigation_bar.apps": "Mobile apps",
- "navigation_bar.blocks": "Blocked users",
- "navigation_bar.community_timeline": "Local timeline",
- "navigation_bar.compose": "Compose new toot",
- "navigation_bar.direct": "Direct messages",
- "navigation_bar.discover": "Discover",
- "navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "Edit profile",
- "navigation_bar.favourites": "Favourites",
- "navigation_bar.filters": "Muted words",
- "navigation_bar.follow_requests": "Follow requests",
- "navigation_bar.info": "O tem vozlišču",
- "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
- "navigation_bar.lists": "Lists",
- "navigation_bar.logout": "Logout",
- "navigation_bar.mutes": "Muted users",
- "navigation_bar.personal": "Personal",
+ "keyboard_shortcuts.legend": "pokaži to legendo",
+ "keyboard_shortcuts.local": "odpri lokalno časovnico",
+ "keyboard_shortcuts.mention": "omeni avtorja",
+ "keyboard_shortcuts.muted": "odpri seznam utišanih uporabnikov",
+ "keyboard_shortcuts.my_profile": "odpri svoj profil",
+ "keyboard_shortcuts.notifications": "odpri stolpec z obvestili",
+ "keyboard_shortcuts.pinned": "odpri seznam pripetih tutov",
+ "keyboard_shortcuts.profile": "odpri avtorjev profil",
+ "keyboard_shortcuts.reply": "odgovori",
+ "keyboard_shortcuts.requests": "odpri seznam s prošnjami za sledenje",
+ "keyboard_shortcuts.search": "fokusiraj na iskanje",
+ "keyboard_shortcuts.start": "odpri stolpec \"začni\"",
+ "keyboard_shortcuts.toggle_hidden": "prikaži/skrij besedilo za CW",
+ "keyboard_shortcuts.toggle_sensitivity": "prikaži/skrij medije",
+ "keyboard_shortcuts.toot": "začni povsem nov tut",
+ "keyboard_shortcuts.unfocus": "odfokusiraj območje za sestavljanje besedila/iskanje",
+ "keyboard_shortcuts.up": "premakni se navzgor po seznamu",
+ "lightbox.close": "Zapri",
+ "lightbox.next": "Naslednji",
+ "lightbox.previous": "Prejšnji",
+ "lightbox.view_context": "Poglej kontekst",
+ "lists.account.add": "Dodaj na seznam",
+ "lists.account.remove": "Odstrani s seznama",
+ "lists.delete": "Izbriši seznam",
+ "lists.edit": "Uredi seznam",
+ "lists.edit.submit": "Spremeni naslov",
+ "lists.new.create": "Dodaj seznam",
+ "lists.new.title_placeholder": "Nov naslov seznama",
+ "lists.search": "Išči med ljudmi, katerim sledite",
+ "lists.subheading": "Vaši seznami",
+ "loading_indicator.label": "Nalaganje...",
+ "media_gallery.toggle_visible": "Preklopi vidljivost",
+ "missing_indicator.label": "Ni najdeno",
+ "missing_indicator.sublabel": "Tega vira ni bilo mogoče najti",
+ "mute_modal.hide_notifications": "Skrij obvestila tega uporabnika?",
+ "navigation_bar.apps": "Mobilne aplikacije",
+ "navigation_bar.blocks": "Blokirani uporabniki",
+ "navigation_bar.community_timeline": "Lokalna časovnica",
+ "navigation_bar.compose": "Sestavi nov tut",
+ "navigation_bar.direct": "Neposredna sporočila",
+ "navigation_bar.discover": "Odkrijte",
+ "navigation_bar.domain_blocks": "Skrite domene",
+ "navigation_bar.edit_profile": "Uredi profil",
+ "navigation_bar.favourites": "Priljubljeni",
+ "navigation_bar.filters": "Utišane besede",
+ "navigation_bar.follow_requests": "Prošnje za sledenje",
+ "navigation_bar.follows_and_followers": "Sledenja in sledilci",
+ "navigation_bar.info": "O tem strežniku",
+ "navigation_bar.keyboard_shortcuts": "Hitre tipke",
+ "navigation_bar.lists": "Seznami",
+ "navigation_bar.logout": "Odjava",
+ "navigation_bar.mutes": "Utišani uporabniki",
+ "navigation_bar.personal": "Osebno",
"navigation_bar.pins": "Pripeti tuti",
- "navigation_bar.preferences": "Preferences",
- "navigation_bar.public_timeline": "Federated timeline",
- "navigation_bar.security": "Security",
- "notification.favourite": "{name} favourited your status",
- "notification.follow": "{name} followed you",
- "notification.mention": "{name} mentioned you",
- "notification.poll": "A poll you have voted in has ended",
- "notification.reblog": "{name} boosted your status",
- "notifications.clear": "Clear notifications",
- "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
- "notifications.column_settings.alert": "Desktop notifications",
- "notifications.column_settings.favourite": "Favourites:",
- "notifications.column_settings.filter_bar.advanced": "Display all categories",
- "notifications.column_settings.filter_bar.category": "Quick filter bar",
- "notifications.column_settings.filter_bar.show": "Show",
- "notifications.column_settings.follow": "New followers:",
- "notifications.column_settings.mention": "Mentions:",
- "notifications.column_settings.poll": "Poll results:",
- "notifications.column_settings.push": "Push notifications",
- "notifications.column_settings.reblog": "Boosts:",
- "notifications.column_settings.show": "Show in column",
- "notifications.column_settings.sound": "Play sound",
- "notifications.filter.all": "All",
- "notifications.filter.boosts": "Boosts",
- "notifications.filter.favourites": "Favourites",
- "notifications.filter.follows": "Follows",
- "notifications.filter.mentions": "Mentions",
- "notifications.filter.polls": "Poll results",
- "notifications.group": "{count} notifications",
- "poll.closed": "Closed",
- "poll.refresh": "Refresh",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
- "poll.vote": "Vote",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
- "privacy.change": "Adjust status privacy",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "Post to public timelines",
- "privacy.public.short": "Public",
- "privacy.unlisted.long": "Do not show in public timelines",
- "privacy.unlisted.short": "Unlisted",
- "regeneration_indicator.label": "Loading…",
- "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+ "navigation_bar.preferences": "Nastavitve",
+ "navigation_bar.profile_directory": "Imenik profilov",
+ "navigation_bar.public_timeline": "Združena časovnica",
+ "navigation_bar.security": "Varnost",
+ "notification.favourite": "{name} je vzljubil/a vaš status",
+ "notification.follow": "{name} vam sledi",
+ "notification.mention": "{name} vas je omenil/a",
+ "notification.poll": "Glasovanje, v katerem ste sodelovali, se je končalo",
+ "notification.reblog": "{name} je spodbudil/a vaš status",
+ "notifications.clear": "Počisti obvestila",
+ "notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa vaša obvestila?",
+ "notifications.column_settings.alert": "Namizna obvestila",
+ "notifications.column_settings.favourite": "Priljubljeni:",
+ "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
+ "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
+ "notifications.column_settings.filter_bar.show": "Pokaži",
+ "notifications.column_settings.follow": "Novi sledilci:",
+ "notifications.column_settings.mention": "Omembe:",
+ "notifications.column_settings.poll": "Rezultati glasovanja:",
+ "notifications.column_settings.push": "Potisna obvestila",
+ "notifications.column_settings.reblog": "Spodbude:",
+ "notifications.column_settings.show": "Prikaži v stolpcu",
+ "notifications.column_settings.sound": "Predvajaj zvok",
+ "notifications.filter.all": "Vse",
+ "notifications.filter.boosts": "Spodbude",
+ "notifications.filter.favourites": "Priljubljeni",
+ "notifications.filter.follows": "Sledi",
+ "notifications.filter.mentions": "Omembe",
+ "notifications.filter.polls": "Rezultati glasovanj",
+ "notifications.group": "{count} obvestil",
+ "poll.closed": "Zaprto",
+ "poll.refresh": "Osveži",
+ "poll.total_votes": "{count, plural,one {# glas} other {# glasov}}",
+ "poll.vote": "Glasuj",
+ "poll_button.add_poll": "Dodaj anketo",
+ "poll_button.remove_poll": "Odstrani anketo",
+ "privacy.change": "Prilagodi zasebnost statusa",
+ "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
+ "privacy.direct.short": "Neposredno",
+ "privacy.private.long": "Objavi samo sledilcem",
+ "privacy.private.short": "Samo sledilci",
+ "privacy.public.long": "Objavi na javne časovnice",
+ "privacy.public.short": "Javno",
+ "privacy.unlisted.long": "Ne objavi na javne časovnice",
+ "privacy.unlisted.short": "Ni prikazano",
+ "regeneration_indicator.label": "Nalaganje…",
+ "regeneration_indicator.sublabel": "Vaš domači vir se pripravlja!",
"relative_time.days": "{number}d",
"relative_time.hours": "{number}h",
- "relative_time.just_now": "now",
+ "relative_time.just_now": "zdaj",
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
- "reply_indicator.cancel": "Cancel",
- "report.forward": "Forward to {target}",
- "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
- "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
- "report.placeholder": "Additional comments",
- "report.submit": "Submit",
- "report.target": "Report {target}",
- "search.placeholder": "Search",
- "search_popout.search_format": "Advanced search format",
- "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
- "search_popout.tips.hashtag": "hashtag",
- "search_popout.tips.status": "status",
- "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
- "search_popout.tips.user": "user",
- "search_results.accounts": "People",
- "search_results.hashtags": "Hashtags",
+ "reply_indicator.cancel": "Prekliči",
+ "report.forward": "Posreduj do {target}",
+ "report.forward_hint": "Račun je iz drugega strežnika. Pošljem anonimno kopijo poročila tudi na drugi strežnik?",
+ "report.hint": "Poročilo bo poslano moderatorjem vašega vozlišča. Spodaj lahko navedete, zakaj prijavljate ta račun:",
+ "report.placeholder": "Dodatni komentarji",
+ "report.submit": "Pošlji",
+ "report.target": "Prijavi {target}",
+ "search.placeholder": "Iskanje",
+ "search_popout.search_format": "Napredna oblika iskanja",
+ "search_popout.tips.full_text": "Enostavno besedilo vrne statuse, ki ste jih napisali, vzljubili, spodbudili ali ste bili v njih omenjeni, kot tudi ujemajoča se uporabniška imena, prikazna imena in ključnike.",
+ "search_popout.tips.hashtag": "ključnik",
+ "search_popout.tips.status": "stanje",
+ "search_popout.tips.text": "Enostavno besedilo vrne ujemajoča se prikazna imena, uporabniška imena in ključnike",
+ "search_popout.tips.user": "uporabnik",
+ "search_results.accounts": "Ljudje",
+ "search_results.hashtags": "Ključniki",
"search_results.statuses": "Tuti",
- "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
- "status.admin_account": "Open moderation interface for @{name}",
- "status.admin_status": "Open this status in the moderation interface",
- "status.block": "Block @{name}",
- "status.cancel_reblog_private": "Unboost",
- "status.cannot_reblog": "This post cannot be boosted",
- "status.copy": "Copy link to status",
- "status.delete": "Delete",
- "status.detailed_status": "Detailed conversation view",
- "status.direct": "Direct message @{name}",
- "status.embed": "Embed",
- "status.favourite": "Favourite",
- "status.filtered": "Filtered",
- "status.load_more": "Load more",
- "status.media_hidden": "Media hidden",
- "status.mention": "Mention @{name}",
- "status.more": "More",
- "status.mute": "Mute @{name}",
- "status.mute_conversation": "Mute conversation",
- "status.open": "Expand this status",
- "status.pin": "Pin on profile",
+ "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultatov}}",
+ "status.admin_account": "Odpri vmesnik za moderiranje za @{name}",
+ "status.admin_status": "Odpri status v vmesniku za moderiranje",
+ "status.block": "Blokiraj @{name}",
+ "status.cancel_reblog_private": "Prekini spodbudo",
+ "status.cannot_reblog": "Te objave ni mogoče spodbuditi",
+ "status.copy": "Kopiraj povezavo do statusa",
+ "status.delete": "Izbriši",
+ "status.detailed_status": "Podroben pogled pogovora",
+ "status.direct": "Neposredno sporočilo @{name}",
+ "status.embed": "Vgradi",
+ "status.favourite": "Priljubljen",
+ "status.filtered": "Filtrirano",
+ "status.load_more": "Naloži več",
+ "status.media_hidden": "Mediji so skriti",
+ "status.mention": "Omeni @{name}",
+ "status.more": "Več",
+ "status.mute": "Utišaj @{name}",
+ "status.mute_conversation": "Utišaj pogovor",
+ "status.open": "Razširi ta status",
+ "status.pin": "Pripni na profil",
"status.pinned": "Pripeti tut",
- "status.read_more": "Read more",
- "status.reblog": "Suni",
- "status.reblog_private": "Suni v prvotno občinstvo",
- "status.reblogged_by": "{name} sunjen",
- "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
- "status.redraft": "Delete & re-draft",
+ "status.read_more": "Preberi več",
+ "status.reblog": "Spodbudi",
+ "status.reblog_private": "Spodbudi izvirnemu občinstvu",
+ "status.reblogged_by": "{name} spodbujen",
+ "status.reblogs.empty": "Nihče še ni spodbudil tega tuta. Ko se bo to zgodilo, se bodo pojavili tukaj.",
+ "status.redraft": "Izbriši in preoblikuj",
"status.reply": "Odgovori",
"status.replyAll": "Odgovori na objavo",
"status.report": "Prijavi @{name}",
- "status.sensitive_toggle": "Kliknite za ogled",
"status.sensitive_warning": "Občutljiva vsebina",
"status.share": "Deli",
"status.show_less": "Prikaži manj",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 89df633cc..13ce4e978 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -67,7 +67,7 @@
"community.column_settings.media_only": "Vetëm Media",
"compose_form.direct_message_warning": "Ky mesazh do t’u dërgohet përdoruesve të përmendur.",
"compose_form.direct_message_warning_learn_more": "Mësoni më tepër",
- "compose_form.hashtag_warning": "Ky mesazh s’do të paraqitet nën ndonjë hashtag, ngaqë s’i është caktuar ndonjë. Vetëm mesazhet publike mund të kërkohen sipas hashtagësh.",
+ "compose_form.hashtag_warning": "Ky mesazh s’do të paraqitet nën ndonjë hashtag, ngaqë s’i është caktuar ndonjë. Vetëm mesazhet publike mund të kërkohen sipas hashtagësh.",
"compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
"compose_form.lock_disclaimer.lock": "e bllokuar",
"compose_form.placeholder": "Ç’bluani në mendje?",
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Mesazh",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media është shënuar si rezervat",
"compose_form.sensitive.unmarked": "Media s’është shënuar si rezervat",
"compose_form.spoiler.marked": "Teksti është fshehur pas sinjalizimit",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "për kalim fokusi te kërkimi",
"keyboard_shortcuts.start": "për hapjen e shtyllës \"fillojani\"",
"keyboard_shortcuts.toggle_hidden": "për shfaqje/fshehje teksti pas CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "për të filluar një mesazh fringo të ri",
"keyboard_shortcuts.unfocus": "për heqjen e fokusit nga fusha e hartimit të mesazheve apo kërkimeve",
"keyboard_shortcuts.up": "për ngjitje sipër nëpër listë",
"lightbox.close": "Mbylle",
"lightbox.next": "Pasuesja",
"lightbox.previous": "E mëparshmja",
+ "lightbox.view_context": "View context",
"lists.account.add": "Shto në listë",
"lists.account.remove": "Hiqe nga lista",
"lists.delete": "Fshije listën",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Të parapëlqyer",
"navigation_bar.filters": "Fjalë të heshtuara",
"navigation_bar.follow_requests": "Kërkesa për ndjekje",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Mbi këtë shërbyes",
"navigation_bar.keyboard_shortcuts": "Taste përkatës",
"navigation_bar.lists": "Lista",
@@ -242,13 +246,14 @@
"navigation_bar.personal": "Personale",
"navigation_bar.pins": "Mesazhe të fiksuar",
"navigation_bar.preferences": "Parapëlqime",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Rrjedhë kohore të federuarish",
"navigation_bar.security": "Siguri",
"notification.favourite": "{name} parapëlqeu gjendjen tuaj",
"notification.follow": "{name} zuri t’ju ndjekë",
"notification.mention": "{name} ju ka përmendur",
"notification.poll": "A poll you have voted in has ended",
- "notification.reblog": "përforcoi gjendjen tuaj",
+ "notification.reblog": "{name} përforcoi gjendjen tuaj",
"notifications.clear": "Pastroji njoftimet",
"notifications.clear_confirmation": "Jeni i sigurt se doni të pastrohen përgjithmonë krejt njoftimet tuaja?",
"notifications.column_settings.alert": "Njoftime desktopi",
@@ -269,7 +274,7 @@
"notifications.filter.follows": "Ndjekje",
"notifications.filter.mentions": "Përmendje",
"notifications.filter.polls": "Poll results",
- "notifications.group": "%(count)s njoftime",
+ "notifications.group": "{count}s njoftime",
"poll.closed": "Closed",
"poll.refresh": "Refresh",
"poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
@@ -340,7 +345,6 @@
"status.reply": "Përgjigjuni",
"status.replyAll": "Përgjigjuni rrjedhës",
"status.report": "Raportojeni @{name}",
- "status.sensitive_toggle": "Klikoni që ta shihni",
"status.sensitive_warning": "Lëndë me spec",
"status.share": "Ndajeni me të tjerët",
"status.show_less": "Shfaq më pak",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 2fc5f985a..8f8ca7c30 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Tutni",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media is marked as sensitive",
"compose_form.sensitive.unmarked": "Media is not marked as sensitive",
"compose_form.spoiler.marked": "Text is hidden behind warning",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "da se prebacite na pretragu",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "da započnete skroz novi tut",
"keyboard_shortcuts.unfocus": "da ne budete više na pretrazi/pravljenju novog tuta",
"keyboard_shortcuts.up": "da se pomerite na gore u listi",
"lightbox.close": "Zatvori",
"lightbox.next": "Sledeći",
"lightbox.previous": "Prethodni",
+ "lightbox.view_context": "View context",
"lists.account.add": "Dodaj na listu",
"lists.account.remove": "Ukloni sa liste",
"lists.delete": "Obriši listu",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Omiljeni",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Zahtevi za praćenje",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "O ovoj instanci",
"navigation_bar.keyboard_shortcuts": "Prečice na tastaturi",
"navigation_bar.lists": "Liste",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Prikačeni tutovi",
"navigation_bar.preferences": "Podešavanja",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Federisana lajna",
"navigation_bar.security": "Security",
"notification.favourite": "{name} je stavio Vaš status kao omiljeni",
@@ -340,7 +345,6 @@
"status.reply": "Odgovori",
"status.replyAll": "Odgovori na diskusiju",
"status.report": "Prijavi korisnika @{name}",
- "status.sensitive_toggle": "Kliknite da vidite",
"status.sensitive_warning": "Osetljiv sadržaj",
"status.share": "Podeli",
"status.show_less": "Prikaži manje",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 2ae34adca..8ef18a774 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Труби",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Медији су означени као осетљиви",
"compose_form.sensitive.unmarked": "Медији су означени као не-осетљиви",
"compose_form.spoiler.marked": "Текст је сакривен иза упозорења",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "да се пребаците на претрагу",
"keyboard_shortcuts.start": "да отворите колону \"почнимо\"",
"keyboard_shortcuts.toggle_hidden": "да прикажете/сакријте текст иза CW-а",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "да започнете скроз нову трубу",
"keyboard_shortcuts.unfocus": "да одфокусирате/не будете више на претрази/прављењу нове трубе",
"keyboard_shortcuts.up": "да се померите на горе у листи",
"lightbox.close": "Затвори",
"lightbox.next": "Следећи",
"lightbox.previous": "Претходни",
+ "lightbox.view_context": "View context",
"lists.account.add": "Додај на листу",
"lists.account.remove": "Уклони са листе",
"lists.delete": "Обриши листу",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Омиљене",
"navigation_bar.filters": "Пригушене речи",
"navigation_bar.follow_requests": "Захтеви за праћење",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "О овој инстанци",
"navigation_bar.keyboard_shortcuts": "Пречице на тастатури",
"navigation_bar.lists": "Листе",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Прикачене трубе",
"navigation_bar.preferences": "Подешавања",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Здружена временска линија",
"navigation_bar.security": "Безбедност",
"notification.favourite": "{name} је ставио/ла Ваш статус као омиљени",
@@ -340,7 +345,6 @@
"status.reply": "Одговори",
"status.replyAll": "Одговори на дискусију",
"status.report": "Пријави корисника @{name}",
- "status.sensitive_toggle": "Кликните да видите",
"status.sensitive_warning": "Осетљив садржај",
"status.share": "Подели",
"status.show_less": "Прикажи мање",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 71264ba52..ab12be885 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -1,5 +1,5 @@
{
- "account.add_or_remove_from_list": "Add or Remove from lists",
+ "account.add_or_remove_from_list": "Lägg till eller ta bort från listor",
"account.badges.bot": "Robot",
"account.block": "Blockera @{name}",
"account.block_domain": "Dölj allt från {domain}",
@@ -10,7 +10,7 @@
"account.endorse": "Feature on profile",
"account.follow": "Följ",
"account.followers": "Följare",
- "account.followers.empty": "No one follows this user yet.",
+ "account.followers.empty": "Ingen följer denna användaren än.",
"account.follows": "Följer",
"account.follows.empty": "This user doesn't follow anyone yet.",
"account.follows_you": "Följer dig",
@@ -36,7 +36,7 @@
"account.unmute": "Ta bort tystad @{name}",
"account.unmute_notifications": "Återaktivera notifikationer från @{name}",
"alert.unexpected.message": "Ett oväntat fel uppstod.",
- "alert.unexpected.title": "Oops!",
+ "alert.unexpected.title": "Whups!",
"boost_modal.combo": "Du kan trycka {combo} för att slippa denna nästa gång",
"bundle_column_error.body": "Något gick fel när du laddade denna komponent.",
"bundle_column_error.retry": "Försök igen",
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Media har markerats som känsligt",
"compose_form.sensitive.unmarked": "Media har inte markerats som känsligt",
"compose_form.spoiler.marked": "Texten har dolts bakom en varning",
@@ -150,7 +151,7 @@
"hashtag.column_settings.select.placeholder": "Enter hashtags…",
"hashtag.column_settings.tag_mode.all": "All of these",
"hashtag.column_settings.tag_mode.any": "Any of these",
- "hashtag.column_settings.tag_mode.none": "None of these",
+ "hashtag.column_settings.tag_mode.none": "Ingen av dessa",
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"home.column_settings.basic": "Grundläggande",
"home.column_settings.show_reblogs": "Visa knuffar",
@@ -158,14 +159,14 @@
"intervals.full.days": "{number, plural, one {# day} other {# days}}",
"intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
"intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
- "introduction.federation.action": "Next",
+ "introduction.federation.action": "Nästa",
"introduction.federation.federated.headline": "Federated",
"introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
"introduction.federation.home.headline": "Home",
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,17 +204,19 @@
"keyboard_shortcuts.search": "att fokusera sökfältet",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "att visa/gömma text bakom CW",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "att börja en helt ny toot",
"keyboard_shortcuts.unfocus": "att avfokusera komponera text fält / sökfält",
"keyboard_shortcuts.up": "att flytta upp i listan",
"lightbox.close": "Stäng",
"lightbox.next": "Nästa",
"lightbox.previous": "Tidigare",
+ "lightbox.view_context": "View context",
"lists.account.add": "Lägg till i lista",
"lists.account.remove": "Ta bort från lista",
"lists.delete": "Radera lista",
"lists.edit": "Redigera lista",
- "lists.edit.submit": "Change title",
+ "lists.edit.submit": "Ändra titel",
"lists.new.create": "Lägg till lista",
"lists.new.title_placeholder": "Ny listrubrik",
"lists.search": "Sök bland personer du följer",
@@ -223,7 +226,7 @@
"missing_indicator.label": "Hittades inte",
"missing_indicator.sublabel": "Den här resursen kunde inte hittas",
"mute_modal.hide_notifications": "Dölj notifikationer från denna användare?",
- "navigation_bar.apps": "Mobile apps",
+ "navigation_bar.apps": "Mobilappar",
"navigation_bar.blocks": "Blockerade användare",
"navigation_bar.community_timeline": "Lokal tidslinje",
"navigation_bar.compose": "Compose new toot",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoriter",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "Följförfrågningar",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Om denna instans",
"navigation_bar.keyboard_shortcuts": "Tangentbordsgenvägar",
"navigation_bar.lists": "Listor",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "Nålade inlägg (toots)",
"navigation_bar.preferences": "Inställningar",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Förenad tidslinje",
"navigation_bar.security": "Säkerhet",
"notification.favourite": "{name} favoriserade din status",
@@ -265,15 +270,15 @@
"notifications.column_settings.sound": "Spela upp ljud",
"notifications.filter.all": "All",
"notifications.filter.boosts": "Boosts",
- "notifications.filter.favourites": "Favourites",
+ "notifications.filter.favourites": "Favoriter",
"notifications.filter.follows": "Follows",
"notifications.filter.mentions": "Mentions",
"notifications.filter.polls": "Poll results",
"notifications.group": "{count} aviseringar",
"poll.closed": "Closed",
- "poll.refresh": "Refresh",
+ "poll.refresh": "Ladda om",
"poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
- "poll.vote": "Vote",
+ "poll.vote": "Rösta",
"poll_button.add_poll": "Add a poll",
"poll_button.remove_poll": "Remove poll",
"privacy.change": "Justera sekretess",
@@ -331,7 +336,7 @@
"status.open": "Utvidga denna status",
"status.pin": "Fäst i profil",
"status.pinned": "Fäst toot",
- "status.read_more": "Read more",
+ "status.read_more": "Läs mer",
"status.reblog": "Knuff",
"status.reblog_private": "Knuffa till de ursprungliga åhörarna",
"status.reblogged_by": "{name} knuffade",
@@ -340,14 +345,13 @@
"status.reply": "Svara",
"status.replyAll": "Svara på tråden",
"status.report": "Rapportera @{name}",
- "status.sensitive_toggle": "Klicka för att se",
"status.sensitive_warning": "Känsligt innehåll",
"status.share": "Dela",
"status.show_less": "Visa mindre",
"status.show_less_all": "Visa mindre för alla",
"status.show_more": "Visa mer",
"status.show_more_all": "Visa mer för alla",
- "status.show_thread": "Show thread",
+ "status.show_thread": "Visa tråd",
"status.unmute_conversation": "Öppna konversation",
"status.unpin": "Ångra fäst i profil",
"suggestions.dismiss": "Dismiss suggestion",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 220cc86f9..637ca884a 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -1,384 +1,388 @@
{
- "account.add_or_remove_from_list": "Add or Remove from lists",
- "account.badges.bot": "Bot",
+ "account.add_or_remove_from_list": "பட்டியல்களில் இருந்து சேர் அல்லது நீக்குக",
+ "account.badges.bot": "பாட்",
"account.block": "Block @{name}",
- "account.block_domain": "Hide everything from {domain}",
- "account.blocked": "Blocked",
- "account.direct": "Direct message @{name}",
- "account.domain_blocked": "Domain hidden",
- "account.edit_profile": "Edit profile",
- "account.endorse": "Feature on profile",
- "account.follow": "Follow",
- "account.followers": "Followers",
- "account.followers.empty": "No one follows this user yet.",
- "account.follows": "Follows",
- "account.follows.empty": "This user doesn't follow anyone yet.",
- "account.follows_you": "Follows you",
- "account.hide_reblogs": "Hide boosts from @{name}",
- "account.link_verified_on": "Ownership of this link was checked on {date}",
- "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+ "account.block_domain": "எல்லாவற்றையும் மறைக்க {domain}",
+ "account.blocked": "தடைமுட்டுகள்",
+ "account.direct": "நேரடி செய்தி @{name}",
+ "account.domain_blocked": "டொமைன் மறைக்கப்பட்டது",
+ "account.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
+ "account.endorse": "சுயவிவரத்தில் அம்சம்",
+ "account.follow": "பின்பற்று",
+ "account.followers": "பின்பற்றுபவர்கள்",
+ "account.followers.empty": "இதுவரை யாரும் இந்த பயனரைப் பின்தொடரவில்லை.",
+ "account.follows": "பின்பற்று",
+ "account.follows.empty": "இந்த பயனர் இதுவரை யாரையும் பின்தொடரவில்லை.",
+ "account.follows_you": "நீ பின் தொடர்கிறாய்",
+ "account.hide_reblogs": "இருந்து ஊக்கியாக மறை @{name}",
+ "account.link_verified_on": "இந்த இணைப்பை உரிமையாளர் சரிபார்க்கப்பட்டது {date}",
+ "account.locked_info": "இந்தக் கணக்கு தனியுரிமை நிலை பூட்டப்பட்டுள்ளது. அவர்களைப் பின்தொடர்பவர் யார் என்பதை உரிமையாளர் கைமுறையாக மதிப்பாய்வு செய்கிறார்.",
"account.media": "Media",
- "account.mention": "Mention @{name}",
- "account.moved_to": "{name} has moved to:",
- "account.mute": "Mute @{name}",
- "account.mute_notifications": "Mute notifications from @{name}",
- "account.muted": "Muted",
+ "account.mention": "குறிப்பிடு @{name}",
+ "account.moved_to": "{name} நகர்த்தப்பட்டது:",
+ "account.mute": "ஊமையான @{name}",
+ "account.mute_notifications": "அறிவிப்புகளை முடக்கு @{name}",
+ "account.muted": "முடக்கியது",
"account.posts": "Toots",
- "account.posts_with_replies": "Toots and replies",
+ "account.posts_with_replies": "Toots மற்றும் பதில்கள்",
"account.report": "Report @{name}",
- "account.requested": "Awaiting approval. Click to cancel follow request",
- "account.share": "Share @{name}'s profile",
- "account.show_reblogs": "Show boosts from @{name}",
- "account.unblock": "Unblock @{name}",
- "account.unblock_domain": "Unhide {domain}",
- "account.unendorse": "Don't feature on profile",
- "account.unfollow": "Unfollow",
- "account.unmute": "Unmute @{name}",
- "account.unmute_notifications": "Unmute notifications from @{name}",
- "alert.unexpected.message": "An unexpected error occurred.",
- "alert.unexpected.title": "Oops!",
- "boost_modal.combo": "You can press {combo} to skip this next time",
- "bundle_column_error.body": "Something went wrong while loading this component.",
- "bundle_column_error.retry": "Try again",
+ "account.requested": "ஒப்புதலுக்காக காத்திருக்கிறது. கோரிக்கையை ரத்துசெய்ய கிளிக் செய்க",
+ "account.share": "பங்கிடு @{name}'s மனித முகத்தின்",
+ "account.show_reblogs": "காட்டு boosts இருந்து @{name}",
+ "account.unblock": "விடுவி @{name}",
+ "account.unblock_domain": "காண்பி {domain}",
+ "account.unendorse": "சுயவிவரத்தில் அம்சம் இல்லை",
+ "account.unfollow": "பின்தொடராட்",
+ "account.unmute": "தடுப்புநீக்கு @{name}",
+ "account.unmute_notifications": "அறிவிப்புகளை அகற்றவும் @{name}",
+ "alert.unexpected.message": "எதிர் பாராத பிழை ஏற்பட்டு விட்டது.",
+ "alert.unexpected.title": "அச்சச்சோ!",
+ "boost_modal.combo": "நீங்கள் அழுத்தவும் {combo} அடுத்த முறை தவிர்க்கவும்",
+ "bundle_column_error.body": "இந்த கூறுகளை ஏற்றும்போது ஏதோ தவறு ஏற்பட்டது.",
+ "bundle_column_error.retry": "மீண்டும் முயற்சி செய்",
"bundle_column_error.title": "Network error",
- "bundle_modal_error.close": "Close",
- "bundle_modal_error.message": "Something went wrong while loading this component.",
- "bundle_modal_error.retry": "Try again",
- "column.blocks": "Blocked users",
- "column.community": "Local timeline",
- "column.direct": "Direct messages",
- "column.domain_blocks": "Hidden domains",
- "column.favourites": "Favourites",
- "column.follow_requests": "Follow requests",
+ "bundle_modal_error.close": "நெருக்கமாக",
+ "bundle_modal_error.message": "இந்த கூறுகளை ஏற்றும்போது ஏதோ தவறு ஏற்பட்டது.",
+ "bundle_modal_error.retry": "மீண்டும் முயற்சி செய்",
+ "column.blocks": "தடுக்கப்பட்ட பயனர்கள்",
+ "column.community": "உள்ளூர் காலக்கெடு",
+ "column.direct": "நேரடி செய்திகள்",
+ "column.domain_blocks": "மறைந்த களங்கள்",
+ "column.favourites": "விருப்பத்துக்குகந்த",
+ "column.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
"column.home": "Home",
- "column.lists": "Lists",
- "column.mutes": "Muted users",
+ "column.lists": "குதிரை வீர்ர்கள்",
+ "column.mutes": "முடக்கப்பட்ட பயனர்கள்",
"column.notifications": "Notifications",
"column.pins": "Pinned toot",
- "column.public": "Federated timeline",
- "column_back_button.label": "Back",
- "column_header.hide_settings": "Hide settings",
- "column_header.moveLeft_settings": "Move column to the left",
- "column_header.moveRight_settings": "Move column to the right",
- "column_header.pin": "Pin",
- "column_header.show_settings": "Show settings",
- "column_header.unpin": "Unpin",
- "column_subheading.settings": "Settings",
- "community.column_settings.media_only": "Media Only",
+ "column.public": "கூட்டாட்சி காலக்கெடு",
+ "column_back_button.label": "ஆதரி",
+ "column_header.hide_settings": "அமைப்புகளை மறை",
+ "column_header.moveLeft_settings": "நெடுவரிசையை இடதுபுறமாக நகர்த்தவும்",
+ "column_header.moveRight_settings": "நெடுவரிசை வலது புறமாக நகர்த்து",
+ "column_header.pin": "குண்டூசி",
+ "column_header.show_settings": "அமைப்புகளைக் காட்டு",
+ "column_header.unpin": "பொருத்தப்படாத",
+ "column_subheading.settings": "அமைப்புகள்",
+ "community.column_settings.media_only": "மீடியா மட்டுமே",
"compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
- "compose_form.direct_message_warning_learn_more": "Learn more",
- "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
- "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
- "compose_form.lock_disclaimer.lock": "locked",
+ "compose_form.direct_message_warning_learn_more": "மேலும் அறிக",
+ "compose_form.hashtag_warning": "இந்த toot பட்டியலிடப்படாதது போல எந்த ஹேஸ்டேக்கின் கீழ் பட்டியலிடப்படாது. ஹேஸ்டேக் மூலம் பொது டோட்டல்கள் மட்டுமே தேட முடியும்.",
+ "compose_form.lock_disclaimer": "உங்கள் கணக்கு அல்ல {locked}. உங்களுடைய பின்தொடர்பவர் மட்டும் இடுகைகளை யாராவது காணலாம்.",
+ "compose_form.lock_disclaimer.lock": "தாழிடு",
"compose_form.placeholder": "What is on your mind?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "ஒரு விருப்பத்தைச் சேர்க்கவும்",
+ "compose_form.poll.duration": "வாக்கெடுப்பு காலம்",
+ "compose_form.poll.option_placeholder": "தேர்ந்தெடுப்ப {number}",
+ "compose_form.poll.remove_option": "இந்த விருப்பத்தை அகற்றவும்",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
- "compose_form.sensitive.marked": "Media is marked as sensitive",
- "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
- "compose_form.spoiler.marked": "Text is hidden behind warning",
- "compose_form.spoiler.unmarked": "Text is not hidden",
- "compose_form.spoiler_placeholder": "Write your warning here",
- "confirmation_modal.cancel": "Cancel",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
+ "compose_form.sensitive.marked": "ஊடகம் உணர்திறன் என குறிக்கப்பட்டுள்ளது",
+ "compose_form.sensitive.unmarked": "ஊடகம் உணர்திறன் என குறிக்கப்படவில்லை",
+ "compose_form.spoiler.marked": "எச்சரிக்கை பின்னால் உரை மறைக்கப்பட்டுள்ளது",
+ "compose_form.spoiler.unmarked": "உரை மறைக்கப்படவில்லை",
+ "compose_form.spoiler_placeholder": "இங்கே உங்கள் எச்சரிக்கையை எழுதுங்கள்",
+ "confirmation_modal.cancel": "எதிராணை",
"confirmations.block.block_and_report": "Block & Report",
"confirmations.block.confirm": "Block",
- "confirmations.block.message": "Are you sure you want to block {name}?",
+ "confirmations.block.message": "நீங்கள் நிச்சயமாக தடைசெய்ய விரும்புகிறீர்களா {name}?",
"confirmations.delete.confirm": "Delete",
- "confirmations.delete.message": "Are you sure you want to delete this status?",
+ "confirmations.delete.message": "இந்த நிலையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?",
"confirmations.delete_list.confirm": "Delete",
- "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
- "confirmations.domain_block.confirm": "Hide entire domain",
- "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
- "confirmations.mute.confirm": "Mute",
- "confirmations.mute.message": "Are you sure you want to mute {name}?",
- "confirmations.redraft.confirm": "Delete & redraft",
- "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
- "confirmations.reply.confirm": "Reply",
- "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
- "confirmations.unfollow.confirm": "Unfollow",
- "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
- "embed.instructions": "Embed this status on your website by copying the code below.",
- "embed.preview": "Here is what it will look like:",
- "emoji_button.activity": "Activity",
- "emoji_button.custom": "Custom",
- "emoji_button.flags": "Flags",
- "emoji_button.food": "Food & Drink",
+ "confirmations.delete_list.message": "இந்த பட்டியலில் நிரந்தரமாக நீக்க விரும்புகிறீர்களா?",
+ "confirmations.domain_block.confirm": "முழு டொமைனை மறை",
+ "confirmations.domain_block.message": "நீங்கள் உண்மையில், நிச்சயமாக நீங்கள் முழு தடுக்க வேண்டும் நிச்சயமாக {domain}? பெரும்பாலான சந்தர்ப்பங்களில் ஒரு சில இலக்குகள் அல்லது மியூட்கள் போதுமானவை மற்றும் சிறந்தவை. எந்த பொது நேரத்திலும் அல்லது உங்கள் அறிவிப்புகளிலும் அந்தக் களத்திலிருந்து உள்ளடக்கத்தை நீங்கள் பார்க்க மாட்டீர்கள். அந்த களத்தில் இருந்து உங்கள் ஆதரவாளர்கள் அகற்றப்படுவார்கள்.",
+ "confirmations.mute.confirm": "ஊமையான",
+ "confirmations.mute.message": "நிச்சயமாக நீங்கள் முடக்க விரும்புகிறீர்களா {name}?",
+ "confirmations.redraft.confirm": "நீக்கு & redraft",
+ "confirmations.redraft.message": "நிச்சயமாக இந்த நிலையை நீக்கி, அதை மறுபடியும் உருவாக்க வேண்டுமா? பிடித்தவை மற்றும் ஊக்கங்கள் இழக்கப்படும், மற்றும் அசல் இடுகையில் பதில்கள் அனாதையான இருக்கும்.",
+ "confirmations.reply.confirm": "பதில்",
+ "confirmations.reply.message": "இப்போது பதில், தற்போது நீங்கள் உருவாக்கும் செய்தி மேலெழுதப்படும். நீங்கள் தொடர விரும்புகிறீர்களா?",
+ "confirmations.unfollow.confirm": "பின்தொடராட்",
+ "confirmations.unfollow.message": "நிச்சயமாக நீங்கள் பின்தொடர விரும்புகிறீர்களா {name}?",
+ "embed.instructions": "கீழே உள்ள குறியீட்டை நகலெடுப்பதன் மூலம் உங்கள் இணையதளத்தில் இந்த நிலையை உட்பொதிக்கவும்.",
+ "embed.preview": "இது போன்ற தோற்றத்தை இங்கு காணலாம்:",
+ "emoji_button.activity": "நடவடிக்கை",
+ "emoji_button.custom": "வழக்கம்",
+ "emoji_button.flags": "கொடி",
+ "emoji_button.food": "உணவு மற்றும் பானம்",
"emoji_button.label": "Insert emoji",
- "emoji_button.nature": "Nature",
- "emoji_button.not_found": "No emojos!! (╯°□°)╯︵ ┻━┻",
- "emoji_button.objects": "Objects",
+ "emoji_button.nature": "இயற்கை",
+ "emoji_button.not_found": "எமோஜோஸ் இல்லை! (╯°□°)╯︵ ┻━┻",
+ "emoji_button.objects": "மறுப்ப கூறு",
"emoji_button.people": "People",
- "emoji_button.recent": "Frequently used",
- "emoji_button.search": "Search...",
- "emoji_button.search_results": "Search results",
+ "emoji_button.recent": "அடிக்கடி பயன்படுத்தப்படும்",
+ "emoji_button.search": "தேடல்...",
+ "emoji_button.search_results": "தேடல் முடிவுகள்",
"emoji_button.symbols": "Symbols",
- "emoji_button.travel": "Travel & Places",
- "empty_column.account_timeline": "No toots here!",
- "empty_column.account_unavailable": "Profile unavailable",
- "empty_column.blocks": "You haven't blocked any users yet.",
- "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
- "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
- "empty_column.domain_blocks": "There are no hidden domains yet.",
- "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
- "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
- "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
- "empty_column.hashtag": "There is nothing in this hashtag yet.",
- "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
- "empty_column.home.public_timeline": "the public timeline",
- "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
- "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
- "empty_column.mutes": "You haven't muted any users yet.",
- "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
- "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
- "follow_request.authorize": "Authorize",
- "follow_request.reject": "Reject",
- "getting_started.developers": "Developers",
- "getting_started.directory": "Profile directory",
+ "emoji_button.travel": "சுற்றுலா மற்றும் இடங்கள்",
+ "empty_column.account_timeline": "இல்லை toots இங்கே!",
+ "empty_column.account_unavailable": "சுயவிவரம் கிடைக்கவில்லை",
+ "empty_column.blocks": "இதுவரை எந்த பயனர்களும் தடுக்கவில்லை.",
+ "empty_column.community": "உள்ளூர் காலக்கெடு காலியாக உள்ளது. பந்தை உருட்டிக்கொள்வதற்கு பகிரங்கமாக ஒன்றை எழுதுங்கள்!",
+ "empty_column.direct": "உங்களிடம் நேரடியான செய்திகள் எதுவும் இல்லை. நீங்கள் ஒன்றை அனுப்பி அல்லது பெறும் போது, அது இங்கே காண்பிக்கும்.",
+ "empty_column.domain_blocks": "இன்னும் மறைந்த களங்கள் இல்லை.",
+ "empty_column.favourited_statuses": "இதுவரை உங்களுக்கு பிடித்த டோட்டுகள் இல்லை. உங்களுக்கு பிடித்த ஒரு போது, அது இங்கே காண்பிக்கும்.",
+ "empty_column.favourites": "இதுவரை யாரும் இந்தத் தட்டுக்கு ஆதரவில்லை. யாராவது செய்தால், அவர்கள் இங்கே காண்பார்கள்.",
+ "empty_column.follow_requests": "உங்களுக்கு இன்னும் எந்தவொரு கோரிக்கைகளும் இல்லை. நீங்கள் ஒன்றைப் பெற்றுக்கொண்டால், அது இங்கே காண்பிக்கும்.",
+ "empty_column.hashtag": "இன்னும் இந்த ஹேஸ்டேக்கில் எதுவும் இல்லை.",
+ "empty_column.home": "உங்கள் வீட்டுக் காலம் காலியாக உள்ளது! வருகை {public} அல்லது தொடங்குவதற்கு தேடலைப் பயன்படுத்தலாம் மற்றும் பிற பயனர்களை சந்திக்கவும்.",
+ "empty_column.home.public_timeline": "பொது காலக்கெடு",
+ "empty_column.list": "இந்த பட்டியலில் இதுவரை எதுவும் இல்லை. இந்த பட்டியலின் உறுப்பினர்கள் புதிய நிலைகளை இடுகையிடுகையில், அவை இங்கே தோன்றும்.",
+ "empty_column.lists": "உங்களுக்கு இதுவரை எந்த பட்டியலும் இல்லை. நீங்கள் ஒன்றை உருவாக்கினால், அது இங்கே காண்பிக்கும்.",
+ "empty_column.mutes": "நீங்கள் இதுவரை எந்த பயனர்களையும் முடக்கியிருக்கவில்லை.",
+ "empty_column.notifications": "உங்களிடம் எந்த அறிவிப்புகளும் இல்லை. உரையாடலைத் தொடங்க பிறருடன் தொடர்புகொள்ளவும்.",
+ "empty_column.public": "இங்கே எதுவும் இல்லை! பகிரங்கமாக ஒன்றை எழுதவும் அல்லது மற்ற நிகழ்வுகளிலிருந்து பயனர்களை அதை நிரப்புவதற்கு கைமுறையாக பின்பற்றவும்",
+ "follow_request.authorize": "அதிகாரமளி",
+ "follow_request.reject": "விலக்கு",
+ "getting_started.developers": "உருவாக்குநர்கள்",
+ "getting_started.directory": "சுயவிவர அடைவு",
"getting_started.documentation": "Documentation",
- "getting_started.heading": "Getting started",
- "getting_started.invite": "Invite people",
- "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
- "getting_started.security": "Security",
- "getting_started.terms": "Terms of service",
- "hashtag.column_header.tag_mode.all": "and {additional}",
- "hashtag.column_header.tag_mode.any": "or {additional}",
- "hashtag.column_header.tag_mode.none": "without {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
- "hashtag.column_settings.tag_mode.all": "All of these",
- "hashtag.column_settings.tag_mode.any": "Any of these",
- "hashtag.column_settings.tag_mode.none": "None of these",
- "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
- "home.column_settings.basic": "Basic",
- "home.column_settings.show_reblogs": "Show boosts",
- "home.column_settings.show_replies": "Show replies",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
- "introduction.federation.action": "Next",
+ "getting_started.heading": "தொடங்குதல்",
+ "getting_started.invite": "நபர்களை அழைக்கவும்",
+ "getting_started.open_source_notice": "Mastodon திறந்த மூல மென்பொருள். GitHub இல் நீங்கள் பங்களிக்கவோ அல்லது புகார் அளிக்கவோ முடியும் {github}.",
+ "getting_started.security": "பத்திரம்",
+ "getting_started.terms": "சேவை விதிமுறைகள்",
+ "hashtag.column_header.tag_mode.all": "மற்றும் {additional}",
+ "hashtag.column_header.tag_mode.any": "அல்லது {additional}",
+ "hashtag.column_header.tag_mode.none": "இல்லாமல் {additional}",
+ "hashtag.column_settings.select.no_options_message": "பரிந்துரைகள் எதுவும் இல்லை",
+ "hashtag.column_settings.select.placeholder": "ஹாஷ்டேகுகளை உள்ளிடவும் …",
+ "hashtag.column_settings.tag_mode.all": "இவை அனைத்தும்",
+ "hashtag.column_settings.tag_mode.any": "இவை எதையும்",
+ "hashtag.column_settings.tag_mode.none": "இவற்றில் ஏதுமில்லை",
+ "hashtag.column_settings.tag_toggle": "இந்த நெடுவரிசையில் கூடுதல் குறிச்சொற்களை சேர்க்கவும்",
+ "home.column_settings.basic": "அடிப்படையான",
+ "home.column_settings.show_reblogs": "காட்டு boosts",
+ "home.column_settings.show_replies": "பதில்களைக் காண்பி",
+ "intervals.full.days": "{number, plural, one {# day} மற்ற {# days}}",
+ "intervals.full.hours": "{number, plural, one {# hour} மற்ற {# hours}}",
+ "intervals.full.minutes": "{number, plural, one {# minute} மற்ற {# minutes}}",
+ "introduction.federation.action": "அடுத்த",
"introduction.federation.federated.headline": "Federated",
- "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+ "introduction.federation.federated.text": "கூட்டமைப்பின் பிற சேவையகங்களிலிருந்து பொது பதிவுகள் கூட்டப்பட்ட காலக்கெடுவில் தோன்றும்.",
"introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+ "introduction.federation.home.text": "நீங்கள் பின்பற்றும் நபர்களின் இடுகைகள் உங்கள் வீட்டு ஊட்டத்தில் தோன்றும். நீங்கள் எந்த சர்வரில் யாரையும் பின்பற்ற முடியும்!",
"introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
- "introduction.interactions.favourite.headline": "Favourite",
- "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
- "introduction.interactions.reblog.headline": "Boost",
- "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
- "introduction.interactions.reply.headline": "Reply",
- "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
- "introduction.welcome.action": "Let's go!",
- "introduction.welcome.headline": "First steps",
- "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
- "keyboard_shortcuts.back": "to navigate back",
- "keyboard_shortcuts.blocked": "to open blocked users list",
- "keyboard_shortcuts.boost": "to boost",
- "keyboard_shortcuts.column": "to focus a status in one of the columns",
- "keyboard_shortcuts.compose": "to focus the compose textarea",
+ "introduction.federation.local.text": "உள்ளூர் சேவையகத்தில் தோன்றும் அதே சர்வரில் உள்ளவர்களின் பொது இடுகைகள்.",
+ "introduction.interactions.action": "பயிற்சி முடிக்க!",
+ "introduction.interactions.favourite.headline": "விருப்பத்துக்குகந்த",
+ "introduction.interactions.favourite.text": "நீங்கள் ஒரு காப்பாற்ற முடியும் toot பின்னர், மற்றும் ஆசிரியர் அதை நீங்கள் பிடித்திருக்கிறது என்று, அதை பிடித்திருக்கிறது என்று தெரியப்படுத்துங்கள்.",
+ "introduction.interactions.reblog.headline": "மதிப்பை உயர்த்து",
+ "introduction.interactions.reblog.text": "மற்றவர்களின் பகிர்ந்து கொள்ளலாம் toots உங்கள் ஆதரவாளர்களுடன் அவர்களை அதிகரிக்கும்.",
+ "introduction.interactions.reply.headline": "மறுமொழி கூறு",
+ "introduction.interactions.reply.text": "நீங்கள் மற்றவர்களுக்கும் உங்கள் சொந்த டோட்ட்களிற்கும் பதிலளிப்பீர்கள், இது ஒரு உரையாடலில் சங்கிலி ஒன்றாகச் சேரும்.",
+ "introduction.welcome.action": "போகலாம்!",
+ "introduction.welcome.headline": "முதல் படிகள்",
+ "introduction.welcome.text": "கூட்டாளிக்கு வருக! ஒரு சில நிமிடங்களில், பலவிதமான சேவையகங்களில் செய்திகளை உரையாட மற்றும் உங்கள் நண்பர்களிடம் பேச முடியும். ஆனால் இந்த சர்வர், {domain}, சிறப்பு - இது உங்கள் சுயவிவரத்தை வழங்குகிறது, எனவே அதன் பெயரை நினைவில் கொள்ளுங்கள்.",
+ "keyboard_shortcuts.back": "மீண்டும் செல்லவும்",
+ "keyboard_shortcuts.blocked": "தடுக்கப்பட்ட பயனர்களின் பட்டியலைத் திறக்க",
+ "keyboard_shortcuts.boost": "அதிகரிக்கும்",
+ "keyboard_shortcuts.column": "நெடுவரிசைகளில் ஒன்றில் நிலைக்கு கவனம் செலுத்த வேண்டும்",
+ "keyboard_shortcuts.compose": "தொகு உரைப்பகுதியை கவனத்தில் கொள்ளவும்",
"keyboard_shortcuts.description": "Description",
- "keyboard_shortcuts.direct": "to open direct messages column",
- "keyboard_shortcuts.down": "to move down in the list",
+ "keyboard_shortcuts.direct": "நேரடி செய்திகள் பத்தி திறக்க",
+ "keyboard_shortcuts.down": "பட்டியலில் கீழே நகர்த்த",
"keyboard_shortcuts.enter": "to open status",
- "keyboard_shortcuts.favourite": "to favourite",
- "keyboard_shortcuts.favourites": "to open favourites list",
- "keyboard_shortcuts.federated": "to open federated timeline",
+ "keyboard_shortcuts.favourite": "பிடித்தது",
+ "keyboard_shortcuts.favourites": "பிடித்தவை பட்டியலை திறக்க",
+ "keyboard_shortcuts.federated": "ஒருங்கிணைந்த நேரத்தை திறக்க",
"keyboard_shortcuts.heading": "Keyboard Shortcuts",
- "keyboard_shortcuts.home": "to open home timeline",
- "keyboard_shortcuts.hotkey": "Hotkey",
- "keyboard_shortcuts.legend": "to display this legend",
- "keyboard_shortcuts.local": "to open local timeline",
- "keyboard_shortcuts.mention": "to mention author",
- "keyboard_shortcuts.muted": "to open muted users list",
- "keyboard_shortcuts.my_profile": "to open your profile",
- "keyboard_shortcuts.notifications": "to open notifications column",
- "keyboard_shortcuts.pinned": "to open pinned toots list",
- "keyboard_shortcuts.profile": "to open author's profile",
- "keyboard_shortcuts.reply": "to reply",
- "keyboard_shortcuts.requests": "to open follow requests list",
- "keyboard_shortcuts.search": "to focus search",
- "keyboard_shortcuts.start": "to open \"get started\" column",
- "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
- "keyboard_shortcuts.toot": "to start a brand new toot",
- "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
- "keyboard_shortcuts.up": "to move up in the list",
- "lightbox.close": "Close",
- "lightbox.next": "Next",
- "lightbox.previous": "Previous",
- "lists.account.add": "Add to list",
- "lists.account.remove": "Remove from list",
+ "keyboard_shortcuts.home": "வீட்டு நேரத்தை திறக்க",
+ "keyboard_shortcuts.hotkey": "ஹாட் கீ",
+ "keyboard_shortcuts.legend": "இந்த புராணத்தை காட்சிப்படுத்த",
+ "keyboard_shortcuts.local": "உள்ளூர் காலவரிசை திறக்க",
+ "keyboard_shortcuts.mention": "எழுத்தாளர் குறிப்பிட வேண்டும்",
+ "keyboard_shortcuts.muted": "முடக்கப்பட்ட பயனர்களின் பட்டியலைத் திறக்க",
+ "keyboard_shortcuts.my_profile": "உங்கள் சுயவிவரத்தை திறக்க",
+ "keyboard_shortcuts.notifications": "அறிவிப்பு நெடுவரிசையைத் திறக்க",
+ "keyboard_shortcuts.pinned": "திறக்க பொருத்தப்பட்டன toots பட்டியல்",
+ "keyboard_shortcuts.profile": "ஆசிரியரின் சுயவிவரத்தைத் திறக்க",
+ "keyboard_shortcuts.reply": "பதிலளிக்க",
+ "keyboard_shortcuts.requests": "கோரிக்கைகள் பட்டியலைத் திறக்க",
+ "keyboard_shortcuts.search": "தேடல் கவனம் செலுத்த",
+ "keyboard_shortcuts.start": "'தொடங்குவதற்கு' நெடுவரிசை திறக்க",
+ "keyboard_shortcuts.toggle_hidden": "CW க்கு பின்னால் உரையை மறைக்க / மறைக்க",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+ "keyboard_shortcuts.toot": "தொடங்க ஒரு புதிய toot",
+ "keyboard_shortcuts.unfocus": "உரை பகுதியை / தேடலை கவனம் செலுத்த வேண்டும்",
+ "keyboard_shortcuts.up": "பட்டியலில் மேலே செல்ல",
+ "lightbox.close": "நெருக்கமாக",
+ "lightbox.next": "அடுத்த",
+ "lightbox.previous": "சென்ற",
+ "lightbox.view_context": "View context",
+ "lists.account.add": "பட்டியலில் சேர்",
+ "lists.account.remove": "பட்டியலில் இருந்து அகற்று",
"lists.delete": "Delete list",
- "lists.edit": "Edit list",
- "lists.edit.submit": "Change title",
- "lists.new.create": "Add list",
- "lists.new.title_placeholder": "New list title",
- "lists.search": "Search among people you follow",
- "lists.subheading": "Your lists",
- "loading_indicator.label": "Loading...",
- "media_gallery.toggle_visible": "Toggle visibility",
- "missing_indicator.label": "Not found",
- "missing_indicator.sublabel": "This resource could not be found",
- "mute_modal.hide_notifications": "Hide notifications from this user?",
- "navigation_bar.apps": "Mobile apps",
- "navigation_bar.blocks": "Blocked users",
- "navigation_bar.community_timeline": "Local timeline",
- "navigation_bar.compose": "Compose new toot",
- "navigation_bar.direct": "Direct messages",
- "navigation_bar.discover": "Discover",
- "navigation_bar.domain_blocks": "Hidden domains",
- "navigation_bar.edit_profile": "Edit profile",
- "navigation_bar.favourites": "Favourites",
- "navigation_bar.filters": "Muted words",
- "navigation_bar.follow_requests": "Follow requests",
- "navigation_bar.info": "About this instance",
- "navigation_bar.keyboard_shortcuts": "Hotkeys",
- "navigation_bar.lists": "Lists",
- "navigation_bar.logout": "Logout",
- "navigation_bar.mutes": "Muted users",
+ "lists.edit": "பட்டியலை திருத்து",
+ "lists.edit.submit": "தலைப்பு மாற்றவும்",
+ "lists.new.create": "பட்டியலில் சேர்",
+ "lists.new.title_placeholder": "புதிய பட்டியல் தலைப்பு",
+ "lists.search": "நீங்கள் பின்தொடரும் நபர்கள் மத்தியில் தேடுதல்",
+ "lists.subheading": "உங்கள் பட்டியல்கள்",
+ "loading_indicator.label": "ஏற்றுதல்...",
+ "media_gallery.toggle_visible": "நிலைமாற்று தெரியும்",
+ "missing_indicator.label": "கிடைக்கவில்லை",
+ "missing_indicator.sublabel": "இந்த ஆதாரத்தை காண முடியவில்லை",
+ "mute_modal.hide_notifications": "இந்த பயனரின் அறிவிப்புகளை மறைக்கவா?",
+ "navigation_bar.apps": "மொபைல் பயன்பாடுகள்",
+ "navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
+ "navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
+ "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
+ "navigation_bar.direct": "நேரடி செய்திகள்",
+ "navigation_bar.discover": "கண்டு பிடி",
+ "navigation_bar.domain_blocks": "மறைந்த களங்கள்",
+ "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
+ "navigation_bar.favourites": "விருப்பத்துக்குகந்த",
+ "navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்",
+ "navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
+ "navigation_bar.follows_and_followers": "Follows and followers",
+ "navigation_bar.info": "இந்த நிகழ்வு பற்றி",
+ "navigation_bar.keyboard_shortcuts": "சுருக்குவிசைகள்",
+ "navigation_bar.lists": "குதிரை வீர்ர்கள்",
+ "navigation_bar.logout": "விடு பதிகை",
+ "navigation_bar.mutes": "முடக்கப்பட்ட பயனர்கள்",
"navigation_bar.personal": "Personal",
- "navigation_bar.pins": "Pinned toots",
- "navigation_bar.preferences": "Preferences",
- "navigation_bar.public_timeline": "Federated timeline",
- "navigation_bar.security": "Security",
- "notification.favourite": "{name} favourited your status",
- "notification.follow": "{name} followed you",
- "notification.mention": "{name} mentioned you",
- "notification.poll": "A poll you have voted in has ended",
- "notification.reblog": "{name} boosted your status",
- "notifications.clear": "Clear notifications",
- "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
- "notifications.column_settings.alert": "Desktop notifications",
- "notifications.column_settings.favourite": "Favourites:",
- "notifications.column_settings.filter_bar.advanced": "Display all categories",
- "notifications.column_settings.filter_bar.category": "Quick filter bar",
- "notifications.column_settings.filter_bar.show": "Show",
- "notifications.column_settings.follow": "New followers:",
- "notifications.column_settings.mention": "Mentions:",
- "notifications.column_settings.poll": "Poll results:",
+ "navigation_bar.pins": "பொருத்தப்பட்டன toots",
+ "navigation_bar.preferences": "விருப்பங்கள்",
+ "navigation_bar.profile_directory": "Profile directory",
+ "navigation_bar.public_timeline": "கூட்டாட்சி காலக்கெடு",
+ "navigation_bar.security": "பத்திரம்",
+ "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை",
+ "notification.follow": "{name} நீங்கள் தொடர்ந்து வந்தீர்கள்",
+ "notification.mention": "{name} நீங்கள் குறிப்பிட்டுள்ளீர்கள்",
+ "notification.poll": "நீங்கள் வாக்களித்த வாக்கெடுப்பு முடிவடைந்தது",
+ "notification.reblog": "{name} உங்கள் நிலை அதிகரித்தது",
+ "notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
+ "notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?",
+ "notifications.column_settings.alert": "டெஸ்க்டாப் அறிவிப்புகள்",
+ "notifications.column_settings.favourite": "பிடித்தவை:",
+ "notifications.column_settings.filter_bar.advanced": "எல்லா வகைகளையும் காட்டு",
+ "notifications.column_settings.filter_bar.category": "விரைவு வடிகட்டி பட்டை",
+ "notifications.column_settings.filter_bar.show": "காட்டு",
+ "notifications.column_settings.follow": "புதிய பின்பற்றுபவர்கள்:",
+ "notifications.column_settings.mention": "குறிப்பிடுகிறது:",
+ "notifications.column_settings.poll": "கருத்துக்கணிப்பு முடிவுகள்:",
"notifications.column_settings.push": "Push notifications",
- "notifications.column_settings.reblog": "Boosts:",
- "notifications.column_settings.show": "Show in column",
- "notifications.column_settings.sound": "Play sound",
- "notifications.filter.all": "All",
- "notifications.filter.boosts": "Boosts",
- "notifications.filter.favourites": "Favourites",
- "notifications.filter.follows": "Follows",
- "notifications.filter.mentions": "Mentions",
- "notifications.filter.polls": "Poll results",
+ "notifications.column_settings.reblog": "மதிப்பை உயர்த்து:",
+ "notifications.column_settings.show": "பத்தியில் காண்பி",
+ "notifications.column_settings.sound": "ஒலி விளையாட",
+ "notifications.filter.all": "எல்லா",
+ "notifications.filter.boosts": "மதிப்பை உயர்த்து",
+ "notifications.filter.favourites": "விருப்பத்துக்குகந்த",
+ "notifications.filter.follows": "பின்பற்று",
+ "notifications.filter.mentions": "குறிப்பிடுகிறார்",
+ "notifications.filter.polls": "கருத்துக்கணிப்பு முடிவுகள்",
"notifications.group": "{count} notifications",
- "poll.closed": "Closed",
- "poll.refresh": "Refresh",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
- "poll.vote": "Vote",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
- "privacy.change": "Adjust status privacy",
- "privacy.direct.long": "Post to mentioned users only",
- "privacy.direct.short": "Direct",
- "privacy.private.long": "Post to followers only",
- "privacy.private.short": "Followers-only",
- "privacy.public.long": "Post to public timelines",
+ "poll.closed": "மூடிய",
+ "poll.refresh": "பத்துயிர்ப்ப?ட்டு",
+ "poll.total_votes": "{count, plural, one {# vote} மற்ற {# votes}}",
+ "poll.vote": "வாக்களி",
+ "poll_button.add_poll": "வாக்கெடுப்பைச் சேர்க்கவும்",
+ "poll_button.remove_poll": "வாக்கெடுப்பை அகற்று",
+ "privacy.change": "நிலை தனியுரிமை",
+ "privacy.direct.long": "குறிப்பிடப்பட்ட பயனர்களுக்கு மட்டுமே இடுகையிடவும்",
+ "privacy.direct.short": "நடத்து",
+ "privacy.private.long": "பின்தொடர்பவர்களுக்கு மட்டுமே இடுகை",
+ "privacy.private.short": "பின்பற்றுபவர்கள் மட்டும்",
+ "privacy.public.long": "பொது நேரங்களுக்கான இடுகை",
"privacy.public.short": "Public",
"privacy.unlisted.long": "Do not show in public timelines",
- "privacy.unlisted.short": "Unlisted",
- "regeneration_indicator.label": "Loading…",
- "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+ "privacy.unlisted.short": "பட்டியலிடப்படாத",
+ "regeneration_indicator.label": "சுமையேற்றம்…",
+ "regeneration_indicator.sublabel": "உங்கள் வீட்டு ஊட்டம் தயார் செய்யப்படுகிறது!",
"relative_time.days": "{number}d",
"relative_time.hours": "{number}h",
- "relative_time.just_now": "now",
+ "relative_time.just_now": "இப்பொழுது",
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
- "reply_indicator.cancel": "Cancel",
- "report.forward": "Forward to {target}",
- "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
- "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
- "report.placeholder": "Additional comments",
+ "reply_indicator.cancel": "எதிராணை",
+ "report.forward": "முன்னோக்கி {target}",
+ "report.forward_hint": "கணக்கு மற்றொரு சேவையகத்திலிருந்து வருகிறது. அறிக்கையின் அநாமதேய பிரதி ஒன்றை அனுப்பவும்.?",
+ "report.hint": "அறிக்கை உங்கள் மாதிரியாக மாற்றியமைக்கப்படும். கீழே உள்ள கணக்கை நீங்கள் ஏன் புகாரளிக்கிறீர்கள் என்பதற்கான விளக்கத்தை வழங்கலாம்:",
+ "report.placeholder": "கூடுதல் கருத்துரைகள்",
"report.submit": "Submit",
"report.target": "Report {target}",
- "search.placeholder": "Search",
- "search_popout.search_format": "Advanced search format",
- "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
- "search_popout.tips.hashtag": "hashtag",
+ "search.placeholder": "தேடு",
+ "search_popout.search_format": "மேம்பட்ட தேடல் வடிவம்",
+ "search_popout.tips.full_text": "எளிமையான உரை நீங்கள் எழுதப்பட்ட, புகழ், அதிகரித்தது, அல்லது குறிப்பிட்டுள்ள, அதே போல் பயனர் பெயர்கள், காட்சி பெயர்கள், மற்றும் ஹேஸ்டேகைகளை கொண்டுள்ளது என்று நிலைகளை கொடுக்கிறது.",
+ "search_popout.tips.hashtag": "ஹேஸ்டேக்",
"search_popout.tips.status": "status",
- "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+ "search_popout.tips.text": "எளிய உரை காட்சி பெயர்கள், பயனர்பெயர்கள் மற்றும் ஹாஷ்டேட்களுடன் பொருந்துகிறது",
"search_popout.tips.user": "user",
"search_results.accounts": "People",
- "search_results.hashtags": "Hashtags",
+ "search_results.hashtags": "ஹாஷ்டேக்குகளைச்",
"search_results.statuses": "Toots",
- "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
- "status.admin_account": "Open moderation interface for @{name}",
- "status.admin_status": "Open this status in the moderation interface",
+ "search_results.total": "{count, number} {count, plural, one {result} மற்ற {results}}",
+ "status.admin_account": "மிதமான இடைமுகத்தை திறக்க @{name}",
+ "status.admin_status": "மிதமான இடைமுகத்தில் இந்த நிலையை திறக்கவும்",
"status.block": "Block @{name}",
- "status.cancel_reblog_private": "Unboost",
- "status.cannot_reblog": "This post cannot be boosted",
- "status.copy": "Copy link to status",
+ "status.cancel_reblog_private": "இல்லை பூஸ்ட்",
+ "status.cannot_reblog": "இந்த இடுகை அதிகரிக்க முடியாது",
+ "status.copy": "நிலைக்கு இணைப்பை நகலெடு",
"status.delete": "Delete",
- "status.detailed_status": "Detailed conversation view",
- "status.direct": "Direct message @{name}",
- "status.embed": "Embed",
- "status.favourite": "Favourite",
- "status.filtered": "Filtered",
- "status.load_more": "Load more",
- "status.media_hidden": "Media hidden",
- "status.mention": "Mention @{name}",
- "status.more": "More",
- "status.mute": "Mute @{name}",
- "status.mute_conversation": "Mute conversation",
- "status.open": "Expand this status",
- "status.pin": "Pin on profile",
- "status.pinned": "Pinned toot",
- "status.read_more": "Read more",
- "status.reblog": "Boost",
- "status.reblog_private": "Boost to original audience",
- "status.reblogged_by": "{name} boosted",
- "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
- "status.redraft": "Delete & re-draft",
- "status.reply": "Reply",
- "status.replyAll": "Reply to thread",
+ "status.detailed_status": "விரிவான உரையாடல் காட்சி",
+ "status.direct": "நேரடி செய்தி @{name}",
+ "status.embed": "கிடத்து",
+ "status.favourite": "விருப்பத்துக்குகந்த",
+ "status.filtered": "வடிகட்டு",
+ "status.load_more": "அதிகமாய் ஏற்று",
+ "status.media_hidden": "மீடியா மறைக்கப்பட்டது",
+ "status.mention": "குறிப்பிடு @{name}",
+ "status.more": "அதிக",
+ "status.mute": "ஊமையான @{name}",
+ "status.mute_conversation": "ஒலிதடு உரையாடல்",
+ "status.open": "இந்த நிலையை விரிவாக்கு",
+ "status.pin": "சுயவிவரத்தில் முள்",
+ "status.pinned": "பொருத்தப்பட்டன toot",
+ "status.read_more": "மேலும் வாசிக்க",
+ "status.reblog": "மதிப்பை உயர்த்து",
+ "status.reblog_private": "Boost அசல் பார்வையாளர்களுக்கு",
+ "status.reblogged_by": "{name} மதிப்பை உயர்த்து",
+ "status.reblogs.empty": "இதுவரை யாரும் இந்த மோதலை அதிகரிக்கவில்லை. யாராவது செய்தால், அவர்கள் இங்கே காண்பார்கள்.",
+ "status.redraft": "நீக்கு மற்றும் மீண்டும் வரைவு",
+ "status.reply": "பதில்",
+ "status.replyAll": "நூலுக்கு பதிலளிக்கவும்",
"status.report": "Report @{name}",
- "status.sensitive_toggle": "Click to view",
- "status.sensitive_warning": "Sensitive content",
- "status.share": "Share",
- "status.show_less": "Show less",
- "status.show_less_all": "Show less for all",
- "status.show_more": "Show more",
- "status.show_more_all": "Show more for all",
- "status.show_thread": "Show thread",
- "status.unmute_conversation": "Unmute conversation",
- "status.unpin": "Unpin from profile",
- "suggestions.dismiss": "Dismiss suggestion",
- "suggestions.header": "You might be interested in…",
+ "status.sensitive_warning": "உணர்திறன் உள்ளடக்கம்",
+ "status.share": "பங்கிடு",
+ "status.show_less": "குறைவாகக் காண்பி",
+ "status.show_less_all": "அனைத்தையும் குறைவாக காட்டு",
+ "status.show_more": "மேலும் காட்ட",
+ "status.show_more_all": "அனைவருக்கும் மேலும் காட்டு",
+ "status.show_thread": "நூல் காட்டு",
+ "status.unmute_conversation": "ஊமையாக உரையாடல் இல்லை",
+ "status.unpin": "சுயவிவரத்திலிருந்து நீக்கவும்",
+ "suggestions.dismiss": "பரிந்துரை விலக்க",
+ "suggestions.header": "நீங்கள் ஆர்வமாக இருக்கலாம் …",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Home",
"tabs_bar.local_timeline": "Local",
"tabs_bar.notifications": "Notifications",
- "tabs_bar.search": "Search",
- "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
- "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
- "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
- "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
- "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
- "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
- "upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
- "upload_error.limit": "File upload limit exceeded.",
- "upload_error.poll": "File upload not allowed with polls.",
- "upload_form.description": "Describe for the visually impaired",
- "upload_form.focus": "Crop",
+ "tabs_bar.search": "தேடு",
+ "time_remaining.days": "{number, plural, one {# day} மற்ற {# days}} left",
+ "time_remaining.hours": "{number, plural, one {# hour} மற்ற {# hours}} left",
+ "time_remaining.minutes": "{number, plural, one {# minute} மற்ற {# minutes}} left",
+ "time_remaining.moments": "தருணங்கள் மீதமுள்ளன",
+ "time_remaining.seconds": "{number, plural, one {# second} மற்ற {# seconds}} left",
+ "trends.count_by_accounts": "{count} {rawCount, plural, one {person} மற்ற {people}} உரையாடு",
+ "ui.beforeunload": "நீங்கள் வெளியே சென்றால் உங்கள் வரைவு இழக்கப்படும் மஸ்தோடோன்.",
+ "upload_area.title": "பதிவேற்ற & இழுக்கவும்",
+ "upload_button.label": "மீடியாவைச் சேர்க்கவும் (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_error.limit": "கோப்பு பதிவேற்ற வரம்பு மீறப்பட்டது.",
+ "upload_error.poll": "கோப்பு பதிவேற்றம் அனுமதிக்கப்படவில்லை.",
+ "upload_form.description": "பார்வையற்ற விவரிக்கவும்",
+ "upload_form.focus": "மாற்றம் முன்னோட்டம்",
"upload_form.undo": "Delete",
- "upload_progress.label": "Uploading...",
- "video.close": "Close video",
- "video.exit_fullscreen": "Exit full screen",
- "video.expand": "Expand video",
+ "upload_progress.label": "ஏற்றுகிறது ...",
+ "video.close": "வீடியோவை மூடு",
+ "video.exit_fullscreen": "முழு திரையில் இருந்து வெளியேறவும்",
+ "video.expand": "வீடியோவை விரிவாக்கு",
"video.fullscreen": "Full screen",
- "video.hide": "Hide video",
- "video.mute": "Mute sound",
+ "video.hide": "வீடியோவை மறை",
+ "video.mute": "ஒலி முடக்கவும்",
"video.pause": "Pause",
- "video.play": "Play",
- "video.unmute": "Unmute sound"
+ "video.play": "விளையாடு",
+ "video.unmute": "ஒலி மெளனமாக இல்லை"
}
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 7e818c787..269ea45c3 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "ఈ ఎంపికను తొలగించు",
"compose_form.publish": "టూట్",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "మీడియా సున్నితమైనదిగా గుర్తించబడింది",
"compose_form.sensitive.unmarked": "మీడియా సున్నితమైనదిగా గుర్తించబడలేదు",
"compose_form.spoiler.marked": "హెచ్చరిక వెనుక పాఠ్యం దాచబడింది",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "శోధనపై దృష్టి పెట్టండి",
"keyboard_shortcuts.start": "\"ఇక్కడ ప్రారంభించండి\" నిలువు వరుసను తెరవడానికి",
"keyboard_shortcuts.toggle_hidden": "CW వెనుక ఉన్న పాఠ్యాన్ని చూపడానికి / దాచడానికి",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "ఒక సరికొత్త టూట్ను ప్రారంభించడానికి",
"keyboard_shortcuts.unfocus": "పాఠ్యం వ్రాసే ఏరియా/శోధన పట్టిక నుండి బయటకు రావడానికి",
"keyboard_shortcuts.up": "జాబితాలో పైకి తరలించడానికి",
"lightbox.close": "మూసివేయు",
"lightbox.next": "తరువాత",
"lightbox.previous": "మునుపటి",
+ "lightbox.view_context": "View context",
"lists.account.add": "జాబితాకు జోడించు",
"lists.account.remove": "జాబితా నుండి తొలగించు",
"lists.delete": "జాబితాను తొలగించు",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "ఇష్టపడినవి",
"navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు",
"navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "ఈ సేవిక గురించి",
"navigation_bar.keyboard_shortcuts": "హాట్ కీలు",
"navigation_bar.lists": "జాబితాలు",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "వ్యక్తిగతం",
"navigation_bar.pins": "అతికించిన టూట్లు",
"navigation_bar.preferences": "ప్రాధాన్యతలు",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం",
"navigation_bar.security": "భద్రత",
"notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు",
@@ -340,7 +345,6 @@
"status.reply": "ప్రత్యుత్తరం",
"status.replyAll": "సంభాషణకు ప్రత్యుత్తరం ఇవ్వండి",
"status.report": "@{name}పై ఫిర్యాదుచేయు",
- "status.sensitive_toggle": "వీక్షించడానికి క్లిక్ చేయండి",
"status.sensitive_warning": "సున్నితమైన కంటెంట్",
"status.share": "పంచుకోండి",
"status.show_less": "తక్కువ చూపించు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 630543ada..3bcf389c7 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -11,12 +11,12 @@
"account.follow": "ติดตาม",
"account.followers": "ผู้ติดตาม",
"account.followers.empty": "ยังไม่มีใครติดตามผู้ใช้นี้",
- "account.follows": "ติดตาม",
+ "account.follows": "การติดตาม",
"account.follows.empty": "ผู้ใช้นี้ยังไม่ได้ติดตามใคร",
"account.follows_you": "ติดตามคุณ",
"account.hide_reblogs": "ซ่อนการดันจาก @{name}",
"account.link_verified_on": "ตรวจสอบความเป็นเจ้าของของลิงก์นี้เมื่อ {date}",
- "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+ "account.locked_info": "มีการตั้งสถานะความเป็นส่วนตัวของบัญชีนี้เป็นล็อคอยู่ เจ้าของตรวจทานผู้ที่สามารถติดตามเขาด้วยตนเอง",
"account.media": "สื่อ",
"account.mention": "กล่าวถึง @{name}",
"account.moved_to": "{name} ได้ย้ายไปยัง:",
@@ -37,7 +37,7 @@
"account.unmute_notifications": "เลิกปิดเสียงการแจ้งเตือนจาก @{name}",
"alert.unexpected.message": "เกิดข้อผิดพลาดที่ไม่คาดคิด",
"alert.unexpected.title": "อุปส์!",
- "boost_modal.combo": "You can press {combo} to skip this next time",
+ "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
"bundle_column_error.body": "มีบางอย่างผิดพลาดขณะโหลดส่วนประกอบนี้",
"bundle_column_error.retry": "ลองอีกครั้ง",
"bundle_column_error.title": "ข้อผิดพลาดเครือข่าย",
@@ -65,22 +65,23 @@
"column_header.unpin": "ถอนหมุด",
"column_subheading.settings": "การตั้งค่า",
"community.column_settings.media_only": "สื่อเท่านั้น",
- "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
+ "compose_form.direct_message_warning": "จะส่งโพสต์นี้ไปยังผู้ใช้ที่กล่าวถึงเท่านั้น",
"compose_form.direct_message_warning_learn_more": "เรียนรู้เพิ่มเติม",
- "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
- "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
- "compose_form.lock_disclaimer.lock": "locked",
- "compose_form.placeholder": "What is on your mind?",
- "compose_form.poll.add_option": "Add a choice",
+ "compose_form.hashtag_warning": "จะไม่แสดงรายการโพสต์นี้ภายใต้แฮชแท็กใด ๆ เนื่องจากไม่อยู่ในรายการ เฉพาะโพสต์สาธารณะเท่านั้นที่สามารถค้นหาโดยแฮชแท็ก",
+ "compose_form.lock_disclaimer": "บัญชีของคุณไม่ได้ {locked} ใครก็ตามสามารถติดตามคุณเพื่อดูโพสต์สำหรับผู้ติดตามเท่านั้นของคุณ",
+ "compose_form.lock_disclaimer.lock": "ล็อคอยู่",
+ "compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
+ "compose_form.poll.add_option": "เพิ่มทางเลือก",
"compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.option_placeholder": "ทางเลือก {number}",
+ "compose_form.poll.remove_option": "เอาทางเลือกนี้ออก",
"compose_form.publish": "โพสต์",
"compose_form.publish_loud": "{publish}!",
- "compose_form.sensitive.marked": "Media is marked as sensitive",
- "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
- "compose_form.spoiler.marked": "Text is hidden behind warning",
- "compose_form.spoiler.unmarked": "Text is not hidden",
+ "compose_form.sensitive.hide": "ทำเครื่องหมายสื่อว่าละเอียดอ่อน",
+ "compose_form.sensitive.marked": "มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน",
+ "compose_form.sensitive.unmarked": "ไม่มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน",
+ "compose_form.spoiler.marked": "มีการซ่อนข้อความอยู่หลังคำเตือน",
+ "compose_form.spoiler.unmarked": "ไม่มีการซ่อนข้อความ",
"compose_form.spoiler_placeholder": "เขียนคำเตือนของคุณที่นี่",
"confirmation_modal.cancel": "ยกเลิก",
"confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
@@ -90,25 +91,25 @@
"confirmations.delete.message": "คุณแน่ใจหรือไม่ว่าต้องการลบสถานะนี้?",
"confirmations.delete_list.confirm": "ลบ",
"confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
- "confirmations.domain_block.confirm": "Hide entire domain",
+ "confirmations.domain_block.confirm": "ซ่อนทั้งโดเมน",
"confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
"confirmations.mute.confirm": "ปิดเสียง",
"confirmations.mute.message": "คุณแน่ใจหรือไม่ว่าต้องการปิดเสียง {name}?",
"confirmations.redraft.confirm": "ลบแล้วร่างใหม่",
- "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.message": "คุณแน่ใจหรือไม่ว่าต้องการลบสถานะนี้แล้วร่างใหม่? รายการโปรดและการดันจะหายไป และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
"confirmations.reply.confirm": "ตอบกลับ",
- "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+ "confirmations.reply.message": "การตอบกลับตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
"confirmations.unfollow.confirm": "เลิกติดตาม",
"confirmations.unfollow.message": "คุณแน่ใจหรือไม่ว่าต้องการเลิกติดตาม {name}?",
- "embed.instructions": "Embed this status on your website by copying the code below.",
- "embed.preview": "Here is what it will look like:",
+ "embed.instructions": "ฝังสถานะนี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
+ "embed.preview": "นี่คือลักษณะที่จะปรากฏ:",
"emoji_button.activity": "กิจกรรม",
"emoji_button.custom": "กำหนดเอง",
"emoji_button.flags": "ธง",
"emoji_button.food": "อาหารและเครื่องดื่ม",
"emoji_button.label": "แทรกอีโมจิ",
"emoji_button.nature": "ธรรมชาติ",
- "emoji_button.not_found": "No emojos!! (╯°□°)╯︵ ┻━┻",
+ "emoji_button.not_found": "ไม่มีอีโมโจ!! (╯°□°)╯︵ ┻━┻",
"emoji_button.objects": "วัตถุ",
"emoji_button.people": "ผู้คน",
"emoji_button.recent": "ที่ใช้บ่อย",
@@ -117,22 +118,22 @@
"emoji_button.symbols": "สัญลักษณ์",
"emoji_button.travel": "การเดินทางและสถานที่",
"empty_column.account_timeline": "ไม่มีโพสต์ที่นี่!",
- "empty_column.account_unavailable": "Profile unavailable",
- "empty_column.blocks": "You haven't blocked any users yet.",
- "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
- "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+ "empty_column.account_unavailable": "ไม่มีโปรไฟล์",
+ "empty_column.blocks": "คุณยังไม่ได้ปิดกั้นผู้ใช้ใด ๆ",
+ "empty_column.community": "เส้นเวลาในเว็บว่างเปล่า เขียนบางอย่างเป็นสาธารณะเพื่อเริ่มต้น!",
+ "empty_column.direct": "คุณยังไม่มีข้อความโดยตรงใด ๆ เมื่อคุณส่งหรือรับข้อความ ข้อความจะปรากฏที่นี่",
"empty_column.domain_blocks": "ยังไม่มีโดเมนที่ซ่อนอยู่",
- "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
- "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
- "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
- "empty_column.hashtag": "There is nothing in this hashtag yet.",
- "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+ "empty_column.favourited_statuses": "คุณยังไม่มีโพสต์ที่ชื่นชอบใด ๆ เมื่อคุณชื่นชอบโพสต์ โพสต์จะปรากฏที่นี่",
+ "empty_column.favourites": "ยังไม่มีใครชื่นชอบโพสต์นี้ เมื่อใครสักคนชื่นชอบ เขาจะปรากฏที่นี่",
+ "empty_column.follow_requests": "คุณยังไม่มีคำขอติดตามใด ๆ เมื่อคุณได้รับคำขอ คำขอจะปรากฏที่นี่",
+ "empty_column.hashtag": "ยังไม่มีสิ่งใดในแฮชแท็กนี้",
+ "empty_column.home": "เส้นเวลาหน้าแรกของคุณว่างเปล่า! เยี่ยมชม {public} หรือใช้การค้นหาเพื่อเริ่มต้นใช้งานและพบปะผู้ใช้อื่น ๆ",
"empty_column.home.public_timeline": "เส้นเวลาสาธารณะ",
- "empty_column.list": "There is nothing in this list yet.",
- "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
- "empty_column.mutes": "You haven't muted any users yet.",
- "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
- "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
+ "empty_column.list": "ยังไม่มีสิ่งใดในรายการนี้ เมื่อสมาชิกของรายการนี้โพสต์สถานะใหม่ สถานะจะปรากฏที่นี่",
+ "empty_column.lists": "คุณยังไม่มีรายการใด ๆ เมื่อคุณสร้างรายการ รายการจะปรากฏที่นี่",
+ "empty_column.mutes": "คุณยังไม่ได้ปิดเสียงผู้ใช้ใด ๆ",
+ "empty_column.notifications": "คุณยังไม่มีการแจ้งเตือนใด ๆ โต้ตอบกับผู้อื่นเพื่อเริ่มการสนทนา",
+ "empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมให้เต็ม",
"follow_request.authorize": "อนุญาต",
"follow_request.reject": "ปฏิเสธ",
"getting_started.developers": "นักพัฒนา",
@@ -140,7 +141,7 @@
"getting_started.documentation": "เอกสารประกอบ",
"getting_started.heading": "เริ่มต้นใช้งาน",
"getting_started.invite": "เชิญผู้คน",
- "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+ "getting_started.open_source_notice": "Mastodon เป็นซอฟต์แวร์เปิดต้นฉบับ คุณสามารถมีส่วนร่วมหรือรายงานปัญหาใน GitHub ที่ {github}",
"getting_started.security": "ความปลอดภัย",
"getting_started.terms": "เงื่อนไขการให้บริการ",
"hashtag.column_header.tag_mode.all": "และ {additional}",
@@ -148,10 +149,10 @@
"hashtag.column_header.tag_mode.none": "โดยไม่มี {additional}",
"hashtag.column_settings.select.no_options_message": "ไม่พบข้อเสนอแนะ",
"hashtag.column_settings.select.placeholder": "ป้อนแฮชแท็ก…",
- "hashtag.column_settings.tag_mode.all": "All of these",
- "hashtag.column_settings.tag_mode.any": "Any of these",
- "hashtag.column_settings.tag_mode.none": "None of these",
- "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+ "hashtag.column_settings.tag_mode.all": "ทั้งหมดนี้",
+ "hashtag.column_settings.tag_mode.any": "ใดก็ตามนี้",
+ "hashtag.column_settings.tag_mode.none": "ไม่ใช่ทั้งหมดนี้",
+ "hashtag.column_settings.tag_toggle": "รวมแท็กเพิ่มเติมสำหรับคอลัมน์นี้",
"home.column_settings.basic": "พื้นฐาน",
"home.column_settings.show_reblogs": "แสดงการดัน",
"home.column_settings.show_replies": "แสดงการตอบกลับ",
@@ -159,56 +160,58 @@
"intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
"intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
"introduction.federation.action": "ถัดไป",
- "introduction.federation.federated.headline": "Federated",
- "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
- "introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
- "introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
- "introduction.interactions.favourite.headline": "Favourite",
+ "introduction.federation.federated.headline": "ที่ติดต่อกับภายนอก",
+ "introduction.federation.federated.text": "โพสต์สาธารณะจากเซิร์ฟเวอร์อื่น ๆ ของ Fediverse จะปรากฏในเส้นเวลาที่ติดต่อกับภายนอก",
+ "introduction.federation.home.headline": "หน้าแรก",
+ "introduction.federation.home.text": "โพสต์จากผู้คนที่คุณติดตามจะปรากฏในฟีดหน้าแรกของคุณ คุณสามารถติดตามใครก็ตามในเซิร์ฟเวอร์ใดก็ตาม!",
+ "introduction.federation.local.headline": "ในเว็บ",
+ "introduction.federation.local.text": "โพสต์สาธารณะจากผู้คนในเซิร์ฟเวอร์เดียวกันกับคุณจะปรากฏในเส้นเวลาในเว็บ",
+ "introduction.interactions.action": "เสร็จสิ้นบทช่วยสอน!",
+ "introduction.interactions.favourite.headline": "ชื่นชอบ",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
- "introduction.interactions.reblog.headline": "Boost",
+ "introduction.interactions.reblog.headline": "ดัน",
"introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
- "introduction.interactions.reply.headline": "Reply",
+ "introduction.interactions.reply.headline": "ตอบกลับ",
"introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
- "introduction.welcome.action": "Let's go!",
- "introduction.welcome.headline": "First steps",
+ "introduction.welcome.action": "ไปกันเลย!",
+ "introduction.welcome.headline": "ขั้นตอนแรก",
"introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
- "keyboard_shortcuts.back": "to navigate back",
- "keyboard_shortcuts.blocked": "to open blocked users list",
- "keyboard_shortcuts.boost": "to boost",
- "keyboard_shortcuts.column": "to focus a status in one of the columns",
- "keyboard_shortcuts.compose": "to focus the compose textarea",
+ "keyboard_shortcuts.back": "เพื่อนำทางย้อนกลับ",
+ "keyboard_shortcuts.blocked": "เพื่อเปิดรายการผู้ใช้ที่ปิดกั้นอยู่",
+ "keyboard_shortcuts.boost": "เพื่อดัน",
+ "keyboard_shortcuts.column": "เพื่อโฟกัสสถานะในหนึ่งในคอลัมน์",
+ "keyboard_shortcuts.compose": "เพื่อโฟกัสพื้นที่เขียนข้อความ",
"keyboard_shortcuts.description": "คำอธิบาย",
- "keyboard_shortcuts.direct": "to open direct messages column",
- "keyboard_shortcuts.down": "to move down in the list",
- "keyboard_shortcuts.enter": "to open status",
- "keyboard_shortcuts.favourite": "to favourite",
- "keyboard_shortcuts.favourites": "to open favourites list",
- "keyboard_shortcuts.federated": "to open federated timeline",
- "keyboard_shortcuts.heading": "Keyboard Shortcuts",
- "keyboard_shortcuts.home": "to open home timeline",
+ "keyboard_shortcuts.direct": "เพื่อเปิดคอลัมน์ข้อความโดยตรง",
+ "keyboard_shortcuts.down": "เพื่อย้ายลงในรายการ",
+ "keyboard_shortcuts.enter": "เพื่อเปิดสถานะ",
+ "keyboard_shortcuts.favourite": "เพื่อชื่นชอบ",
+ "keyboard_shortcuts.favourites": "เพื่อเปิดรายการโปรด",
+ "keyboard_shortcuts.federated": "เพื่อเปิดเส้นเวลาที่ติดต่อกับภายนอก",
+ "keyboard_shortcuts.heading": "แป้นพิมพ์ลัด",
+ "keyboard_shortcuts.home": "เพื่อเปิดเส้นเวลาหน้าแรก",
"keyboard_shortcuts.hotkey": "ปุ่มลัด",
- "keyboard_shortcuts.legend": "to display this legend",
- "keyboard_shortcuts.local": "to open local timeline",
- "keyboard_shortcuts.mention": "to mention author",
- "keyboard_shortcuts.muted": "to open muted users list",
- "keyboard_shortcuts.my_profile": "to open your profile",
- "keyboard_shortcuts.notifications": "to open notifications column",
- "keyboard_shortcuts.pinned": "to open pinned toots list",
- "keyboard_shortcuts.profile": "to open author's profile",
- "keyboard_shortcuts.reply": "to reply",
- "keyboard_shortcuts.requests": "to open follow requests list",
- "keyboard_shortcuts.search": "to focus search",
- "keyboard_shortcuts.start": "to open \"get started\" column",
- "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
- "keyboard_shortcuts.toot": "to start a brand new toot",
- "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
- "keyboard_shortcuts.up": "to move up in the list",
+ "keyboard_shortcuts.legend": "เพื่อแสดงคำอธิบายนี้",
+ "keyboard_shortcuts.local": "เพื่อเปิดเส้นเวลาในเว็บ",
+ "keyboard_shortcuts.mention": "เพื่อกล่าวถึงผู้สร้าง",
+ "keyboard_shortcuts.muted": "เพื่อเปิดรายการผู้ใช้ที่ปิดเสียงอยู่",
+ "keyboard_shortcuts.my_profile": "เพื่อเปิดโปรไฟล์ของคุณ",
+ "keyboard_shortcuts.notifications": "เพื่อเปิดคอลัมน์การแจ้งเตือน",
+ "keyboard_shortcuts.pinned": "เพื่อเปิดรายการโพสต์ที่ปักหมุด",
+ "keyboard_shortcuts.profile": "เพื่อเปิดโปรไฟล์ของผู้สร้าง",
+ "keyboard_shortcuts.reply": "เพื่อตอบกลับ",
+ "keyboard_shortcuts.requests": "เพื่อเปิดรายการคำขอติดตาม",
+ "keyboard_shortcuts.search": "เพื่อโฟกัสการค้นหา",
+ "keyboard_shortcuts.start": "เพื่อเปิดคอลัมน์ \"เริ่มต้นใช้งาน\"",
+ "keyboard_shortcuts.toggle_hidden": "เพื่อแสดง/ซ่อนข้อความที่อยู่หลังคำเตือนเนื้อหา",
+ "keyboard_shortcuts.toggle_sensitivity": "เพื่อแสดง/ซ่อนสื่อ",
+ "keyboard_shortcuts.toot": "เพื่อเริ่มโพสต์ใหม่",
+ "keyboard_shortcuts.unfocus": "เพื่อเลิกโฟกัสพื้นที่เขียนข้อความ/การค้นหา",
+ "keyboard_shortcuts.up": "เพื่อย้ายขึ้นในรายการ",
"lightbox.close": "ปิด",
"lightbox.next": "ถัดไป",
"lightbox.previous": "ก่อนหน้า",
+ "lightbox.view_context": "ดูบริบท",
"lists.account.add": "เพิ่มไปยังรายการ",
"lists.account.remove": "เอาออกจากรายการ",
"lists.delete": "ลบรายการ",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "รายการโปรด",
"navigation_bar.filters": "คำที่ปิดเสียงอยู่",
"navigation_bar.follow_requests": "คำขอติดตาม",
+ "navigation_bar.follows_and_followers": "การติดตามและผู้ติดตาม",
"navigation_bar.info": "เกี่ยวกับเซิร์ฟเวอร์นี้",
"navigation_bar.keyboard_shortcuts": "ปุ่มลัด",
"navigation_bar.lists": "รายการ",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "ส่วนบุคคล",
"navigation_bar.pins": "โพสต์ที่ปักหมุด",
"navigation_bar.preferences": "การกำหนดลักษณะ",
+ "navigation_bar.profile_directory": "ไดเรกทอรีโปรไฟล์",
"navigation_bar.public_timeline": "เส้นเวลาที่ติดต่อกับภายนอก",
"navigation_bar.security": "ความปลอดภัย",
"notification.favourite": "{name} ได้ชื่นชอบสถานะของคุณ",
@@ -251,7 +256,7 @@
"notification.reblog": "{name} ได้ดันสถานะของคุณ",
"notifications.clear": "ล้างการแจ้งเตือน",
"notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
- "notifications.column_settings.alert": "Desktop notifications",
+ "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
"notifications.column_settings.favourite": "รายการโปรด:",
"notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
"notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
@@ -271,12 +276,12 @@
"notifications.filter.polls": "Poll results",
"notifications.group": "{count} การแจ้งเตือน",
"poll.closed": "ปิดแล้ว",
- "poll.refresh": "Refresh",
+ "poll.refresh": "รีเฟรช",
"poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
"poll.vote": "Vote",
"poll_button.add_poll": "Add a poll",
"poll_button.remove_poll": "Remove poll",
- "privacy.change": "Adjust status privacy",
+ "privacy.change": "ปรับเปลี่ยนความเป็นส่วนตัวของสถานะ",
"privacy.direct.long": "โพสต์ไปยังผู้ใช้ที่กล่าวถึงเท่านั้น",
"privacy.direct.short": "โดยตรง",
"privacy.private.long": "โพสต์ไปยังผู้ติดตามเท่านั้น",
@@ -286,7 +291,7 @@
"privacy.unlisted.long": "ไม่โพสต์ไปยังเส้นเวลาสาธารณะ",
"privacy.unlisted.short": "ไม่อยู่ในรายการ",
"regeneration_indicator.label": "กำลังโหลด…",
- "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+ "regeneration_indicator.sublabel": "กำลังเตรียมฟีดหน้าแรกของคุณ!",
"relative_time.days": "{number} วัน",
"relative_time.hours": "{number} ชั่วโมง",
"relative_time.just_now": "ตอนนี้",
@@ -294,17 +299,17 @@
"relative_time.seconds": "{number} วินาที",
"reply_indicator.cancel": "ยกเลิก",
"report.forward": "ส่งต่อไปยัง {target}",
- "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
- "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+ "report.forward_hint": "บัญชีมาจากเซิร์ฟเวอร์อื่น ส่งสำเนาของรายงานที่ไม่ระบุตัวตนไปที่นั่นด้วย?",
+ "report.hint": "จะส่งรายงานไปยังผู้ควบคุมเซิร์ฟเวอร์ของคุณ คุณสามารถให้คำอธิบายเหตุผลที่คุณรายงานบัญชีนี้ด้านล่าง:",
"report.placeholder": "ความคิดเห็นเพิ่มเติม",
"report.submit": "ส่ง",
"report.target": "กำลังรายงาน {target}",
"search.placeholder": "ค้นหา",
"search_popout.search_format": "รูปแบบการค้นหาขั้นสูง",
- "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+ "search_popout.tips.full_text": "ข้อความแบบง่ายส่งคืนสถานะที่คุณได้เขียน ชื่นชอบ ดัน หรือได้รับการกล่าวถึง ตลอดจนชื่อผู้ใช้, ชื่อที่แสดง และแฮชแท็กที่ตรงกัน",
"search_popout.tips.hashtag": "แฮชแท็ก",
"search_popout.tips.status": "สถานะ",
- "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+ "search_popout.tips.text": "ข้อความแบบง่ายส่งคืนชื่อที่แสดง, ชื่อผู้ใช้ และแฮชแท็กที่ตรงกัน",
"search_popout.tips.user": "ผู้ใช้",
"search_results.accounts": "ผู้คน",
"search_results.hashtags": "แฮชแท็ก",
@@ -319,7 +324,7 @@
"status.delete": "ลบ",
"status.detailed_status": "มุมมองการสนทนาโดยละเอียด",
"status.direct": "ส่งข้อความโดยตรงถึง @{name}",
- "status.embed": "Embed",
+ "status.embed": "ฝัง",
"status.favourite": "ชื่นชอบ",
"status.filtered": "กรองอยู่",
"status.load_more": "โหลดเพิ่มเติม",
@@ -335,12 +340,11 @@
"status.reblog": "ดัน",
"status.reblog_private": "ดันไปยังผู้ชมดั้งเดิม",
"status.reblogged_by": "{name} ได้ดัน",
- "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+ "status.reblogs.empty": "ยังไม่มีใครดันโพสต์นี้ เมื่อใครสักคนดัน เขาจะปรากฏที่นี่",
"status.redraft": "ลบแล้วร่างใหม่",
"status.reply": "ตอบกลับ",
"status.replyAll": "ตอบกลับกระทู้",
"status.report": "รายงาน @{name}",
- "status.sensitive_toggle": "คลิกเพื่อดู",
"status.sensitive_warning": "เนื้อหาที่ละเอียดอ่อน",
"status.share": "แบ่งปัน",
"status.show_less": "แสดงน้อยลง",
@@ -360,15 +364,15 @@
"time_remaining.days": "{number, plural, one {# day} other {# days}} left",
"time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
"time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
+ "time_remaining.moments": "ช่วงเวลาที่เหลือ",
"time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
"ui.beforeunload": "แบบร่างของคุณจะหายไปหากคุณออกจาก Mastodon",
"upload_area.title": "ลากแล้วปล่อยเพื่ออัปโหลด",
"upload_button.label": "เพิ่มสื่อ (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_error.limit": "เกินขีดจำกัดการอัปโหลดไฟล์",
- "upload_error.poll": "File upload not allowed with polls.",
- "upload_form.description": "Describe for the visually impaired",
+ "upload_error.poll": "ไม่อนุญาตให้อัปโหลดไฟล์กับการลงคะแนน",
+ "upload_form.description": "อธิบายสำหรับผู้บกพร่องทางการมองเห็น",
"upload_form.focus": "ตัวอย่างการเปลี่ยนแปลง",
"upload_form.undo": "ลบ",
"upload_progress.label": "กำลังอัปโหลด...",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 26eca8239..ec4657b9b 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Bu seçimi kaldır",
"compose_form.publish": "Gönder",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Medya hassas olarak işaretlendi",
"compose_form.sensitive.unmarked": "Medya hassas olarak işaretlenmemiş",
"compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "aramaya odaklanmak için",
"keyboard_shortcuts.start": "\"başlayın\" sütununu açmak için",
"keyboard_shortcuts.toggle_hidden": "CW'den önceki yazıyı göstermek/gizlemek için",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "yeni bir gönderiye başlamak için",
"keyboard_shortcuts.unfocus": "aramada bir gönderiye odaklanmamak için",
"keyboard_shortcuts.up": "listede yukarıya çıkmak için",
"lightbox.close": "Kapat",
"lightbox.next": "Sonraki",
"lightbox.previous": "Önceli",
+ "lightbox.view_context": "View context",
"lists.account.add": "Listeye ekle",
"lists.account.remove": "Listeden kaldır",
"lists.delete": "Listeyi sil",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Favoriler",
"navigation_bar.filters": "Susturulmuş kelimeler",
"navigation_bar.follow_requests": "Takip istekleri",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Genişletilmiş bilgi",
"navigation_bar.keyboard_shortcuts": "Klavye kısayolları",
"navigation_bar.lists": "Listeler",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Kişisel",
"navigation_bar.pins": "Sabitlenmiş gönderiler",
"navigation_bar.preferences": "Tercihler",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Federe zaman tüneli",
"navigation_bar.security": "Güvenlik",
"notification.favourite": "{name} senin durumunu favorilere ekledi",
@@ -340,7 +345,6 @@
"status.reply": "Cevapla",
"status.replyAll": "Konuşmayı cevapla",
"status.report": "@{name}'i raporla",
- "status.sensitive_toggle": "Görmek için tıklayınız",
"status.sensitive_warning": "Hassas içerik",
"status.share": "Paylaş",
"status.show_less": "Daha az göster",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 51a48a2b2..124b9fb07 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "Дмухнути",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "Медіа відмічене несприйнятливим",
"compose_form.sensitive.unmarked": "Медіа відмічене сприйнятливим",
"compose_form.spoiler.marked": "Текст приховано за попередженням",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "сфокусуватися на пошуку",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "показати/приховати прихований текст",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "почати писати новий дмух",
"keyboard_shortcuts.unfocus": "розфокусуватися з нового допису чи пошуку",
"keyboard_shortcuts.up": "рухатися вверх списком",
"lightbox.close": "Закрити",
"lightbox.next": "Далі",
"lightbox.previous": "Назад",
+ "lightbox.view_context": "View context",
"lists.account.add": "Додати до списку",
"lists.account.remove": "Видалити зі списку",
"lists.delete": "Видалити список",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "Вподобане",
"navigation_bar.filters": "Приховані слова",
"navigation_bar.follow_requests": "Запити на підписку",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "Про сайт",
"navigation_bar.keyboard_shortcuts": "Гарячі клавіши",
"navigation_bar.lists": "Списки",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Особисте",
"navigation_bar.pins": "Закріплені дмухи",
"navigation_bar.preferences": "Налаштування",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "Глобальна стрічка",
"navigation_bar.security": "Безпека",
"notification.favourite": "{name} вподобав(-ла) ваш допис",
@@ -340,7 +345,6 @@
"status.reply": "Відповісти",
"status.replyAll": "Відповісти на тред",
"status.report": "Поскаржитися",
- "status.sensitive_toggle": "Натисніть, щоб подивитися",
"status.sensitive_warning": "Непристойний зміст",
"status.share": "Share",
"status.show_less": "Згорнути",
diff --git a/app/javascript/mastodon/locales/whitelist_de.json b/app/javascript/mastodon/locales/whitelist_de.json
index 0d4f101c7..6c9617e60 100644
--- a/app/javascript/mastodon/locales/whitelist_de.json
+++ b/app/javascript/mastodon/locales/whitelist_de.json
@@ -1,2 +1,9 @@
[
+ "relative_time.seconds",
+ "relative_time.minutes",
+ "relative_time.hours",
+ "relative_time.days",
+ "account.badges.bot",
+ "compose_form.publish_loud",
+ "search_results.hashtags"
]
diff --git a/app/javascript/mastodon/locales/whitelist_lt.json b/app/javascript/mastodon/locales/whitelist_lt.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_lt.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index f9c6b4d41..865d3a514 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,5 +1,5 @@
{
- "account.add_or_remove_from_list": "Add or Remove from lists",
+ "account.add_or_remove_from_list": "从列表中添加或删除",
"account.badges.bot": "机器人",
"account.block": "屏蔽 @{name}",
"account.block_domain": "隐藏来自 {domain} 的内容",
@@ -7,16 +7,16 @@
"account.direct": "发送私信给 @{name}",
"account.domain_blocked": "网站已屏蔽",
"account.edit_profile": "修改个人资料",
- "account.endorse": "Feature on profile",
+ "account.endorse": "在个人资料中推荐此用户",
"account.follow": "关注",
"account.followers": "关注者",
- "account.followers.empty": "No one follows this user yet.",
+ "account.followers.empty": "目前无人关注此用户。",
"account.follows": "正在关注",
- "account.follows.empty": "This user doesn't follow anyone yet.",
+ "account.follows.empty": "此用户目前没有关注任何人。",
"account.follows_you": "关注了你",
"account.hide_reblogs": "隐藏来自 @{name} 的转嘟",
- "account.link_verified_on": "Ownership of this link was checked on {date}",
- "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+ "account.link_verified_on": "此链接的所有权已在 {date} 检查",
+ "account.locked_info": "此账户已锁嘟。账户的主人会手动审核关注者。",
"account.media": "媒体",
"account.mention": "提及 @{name}",
"account.moved_to": "{name} 已经迁移到:",
@@ -29,9 +29,9 @@
"account.requested": "正在等待对方同意。点击以取消发送关注请求",
"account.share": "分享 @{name} 的个人资料",
"account.show_reblogs": "显示来自 @{name} 的转嘟",
- "account.unblock": "不再屏蔽 @{name}",
+ "account.unblock": "解除屏蔽 @{name}",
"account.unblock_domain": "不再隐藏来自 {domain} 的内容",
- "account.unendorse": "Don't feature on profile",
+ "account.unendorse": "不在个人资料中推荐此用户",
"account.unfollow": "取消关注",
"account.unmute": "不再隐藏 @{name}",
"account.unmute_notifications": "不再隐藏来自 @{name} 的通知",
@@ -71,19 +71,20 @@
"compose_form.lock_disclaimer": "你的帐户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
"compose_form.lock_disclaimer.lock": "开启保护",
"compose_form.placeholder": "在想啥?",
- "compose_form.poll.add_option": "Add a choice",
- "compose_form.poll.duration": "Poll duration",
- "compose_form.poll.option_placeholder": "Choice {number}",
- "compose_form.poll.remove_option": "Remove this choice",
+ "compose_form.poll.add_option": "添加一个选项",
+ "compose_form.poll.duration": "投票持续时间",
+ "compose_form.poll.option_placeholder": "选项 {number}",
+ "compose_form.poll.remove_option": "移除这个选项",
"compose_form.publish": "嘟嘟",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "标记媒体为敏感内容",
"compose_form.sensitive.marked": "媒体已被标记为敏感内容",
"compose_form.sensitive.unmarked": "媒体未被标记为敏感内容",
"compose_form.spoiler.marked": "正文已被折叠在警告信息之后",
"compose_form.spoiler.unmarked": "正文未被折叠",
"compose_form.spoiler_placeholder": "折叠部分的警告消息",
"confirmation_modal.cancel": "取消",
- "confirmations.block.block_and_report": "Block & Report",
+ "confirmations.block.block_and_report": "屏蔽与举报",
"confirmations.block.confirm": "屏蔽",
"confirmations.block.message": "你确定要屏蔽 {name} 吗?",
"confirmations.delete.confirm": "删除",
@@ -95,9 +96,9 @@
"confirmations.mute.confirm": "隐藏",
"confirmations.mute.message": "你确定要隐藏 {name} 吗?",
"confirmations.redraft.confirm": "删除并重新编辑",
- "confirmations.redraft.message": "你确定要删除这条嘟文并重新编辑它吗?所有相关的回复、转嘟和收藏都会被清除。",
- "confirmations.reply.confirm": "Reply",
- "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+ "confirmations.redraft.message": "你确定要删除这条嘟文并重新编辑它吗?所有相关的转嘟和收藏都会被清除,回复将会被孤立。",
+ "confirmations.reply.confirm": "回复",
+ "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗?",
"confirmations.unfollow.confirm": "取消关注",
"confirmations.unfollow.message": "你确定要取消关注 {name} 吗?",
"embed.instructions": "要在你的网站上嵌入这条嘟文,请复制以下代码。",
@@ -116,104 +117,106 @@
"emoji_button.search_results": "搜索结果",
"emoji_button.symbols": "符号",
"emoji_button.travel": "旅行和地点",
- "empty_column.account_timeline": "No toots here!",
- "empty_column.account_unavailable": "Profile unavailable",
- "empty_column.blocks": "You haven't blocked any users yet.",
+ "empty_column.account_timeline": "这里没有嘟文!",
+ "empty_column.account_unavailable": "个人资料不可用",
+ "empty_column.blocks": "你目前没有屏蔽任何用户。",
"empty_column.community": "本站时间轴暂时没有内容,快嘟几个来抢头香啊!",
"empty_column.direct": "你还没有使用过私信。当你发出或者收到私信时,它会在这里显示。",
- "empty_column.domain_blocks": "There are no hidden domains yet.",
- "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
- "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
- "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+ "empty_column.domain_blocks": "目前没有被隐藏的站点。",
+ "empty_column.favourited_statuses": "你还没有收藏过任何嘟文。收藏过的嘟文会显示在这里。",
+ "empty_column.favourites": "没人收藏过这条嘟文。假如有人收藏了,就会显示在这里。",
+ "empty_column.follow_requests": "你没有收到新的关注请求。收到了之后就会显示在这里。",
"empty_column.hashtag": "这个话题标签下暂时没有内容。",
"empty_column.home": "你还没有关注任何用户。快看看{public},向其他用户搭讪吧。",
"empty_column.home.public_timeline": "公共时间轴",
"empty_column.list": "这个列表中暂时没有内容。列表中用户所发送的的新嘟文将会在这里显示。",
- "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
- "empty_column.mutes": "You haven't muted any users yet.",
+ "empty_column.lists": "你没有创建过列表。你创建的列表会在这里显示。",
+ "empty_column.mutes": "你没有隐藏任何用户。",
"empty_column.notifications": "你还没有收到过任何通知,快向其他用户搭讪吧。",
- "empty_column.public": "这里神马都没有!写一些公开的嘟文,或者关注其他实例的用户后,这里就会有嘟文出现了哦!",
+ "empty_column.public": "这里什么都没有!写一些公开的嘟文,或者关注其他服务器的用户后,这里就会有嘟文出现了",
"follow_request.authorize": "同意",
"follow_request.reject": "拒绝",
"getting_started.developers": "开发",
- "getting_started.directory": "Profile directory",
+ "getting_started.directory": "用户资料目录",
"getting_started.documentation": "文档",
"getting_started.heading": "开始使用",
"getting_started.invite": "邀请用户",
"getting_started.open_source_notice": "Mastodon 是一个开源软件。欢迎前往 GitHub({github})贡献代码或反馈问题。",
"getting_started.security": "帐户安全",
"getting_started.terms": "使用条款",
- "hashtag.column_header.tag_mode.all": "and {additional}",
- "hashtag.column_header.tag_mode.any": "or {additional}",
- "hashtag.column_header.tag_mode.none": "without {additional}",
- "hashtag.column_settings.select.no_options_message": "No suggestions found",
- "hashtag.column_settings.select.placeholder": "Enter hashtags…",
- "hashtag.column_settings.tag_mode.all": "All of these",
- "hashtag.column_settings.tag_mode.any": "Any of these",
- "hashtag.column_settings.tag_mode.none": "None of these",
- "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+ "hashtag.column_header.tag_mode.all": "以及 {additional}",
+ "hashtag.column_header.tag_mode.any": "或是 {additional}",
+ "hashtag.column_header.tag_mode.none": "而不用 {additional}",
+ "hashtag.column_settings.select.no_options_message": "没有找到建议",
+ "hashtag.column_settings.select.placeholder": "输入话题标签…",
+ "hashtag.column_settings.tag_mode.all": "全部",
+ "hashtag.column_settings.tag_mode.any": "任一",
+ "hashtag.column_settings.tag_mode.none": "全都不要",
+ "hashtag.column_settings.tag_toggle": "在此栏加入额外的标签",
"home.column_settings.basic": "基本设置",
"home.column_settings.show_reblogs": "显示转嘟",
"home.column_settings.show_replies": "显示回复",
- "intervals.full.days": "{number, plural, one {# day} other {# days}}",
- "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
- "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
- "introduction.federation.action": "Next",
- "introduction.federation.federated.headline": "Federated",
- "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
- "introduction.federation.home.headline": "Home",
- "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
- "introduction.federation.local.headline": "Local",
- "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
- "introduction.interactions.favourite.headline": "Favourite",
- "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
- "introduction.interactions.reblog.headline": "Boost",
- "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
- "introduction.interactions.reply.headline": "Reply",
- "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
- "introduction.welcome.action": "Let's go!",
- "introduction.welcome.headline": "First steps",
- "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+ "intervals.full.days": "{number} 天",
+ "intervals.full.hours": "{number} 小时",
+ "intervals.full.minutes": "{number} 分钟",
+ "introduction.federation.action": "下一步",
+ "introduction.federation.federated.headline": "跨站",
+ "introduction.federation.federated.text": "其他跨站服务器的公共动态会显示在跨站时间线中。",
+ "introduction.federation.home.headline": "主页",
+ "introduction.federation.home.text": "你所关注的用户的动态会显示在主页里。你可以关注任何服务器上的任何人!",
+ "introduction.federation.local.headline": "本站",
+ "introduction.federation.local.text": "你所关注的用户的动态会显示在主页里,你可以关注任何服务器上的任何人。",
+ "introduction.interactions.action": "教程结束!",
+ "introduction.interactions.favourite.headline": "收藏",
+ "introduction.interactions.favourite.text": "你可以保存嘟文以便以后阅读。或者通过收藏功能告诉作者你点了个赞。",
+ "introduction.interactions.reblog.headline": "转嘟",
+ "introduction.interactions.reblog.text": "通过转嘟,你可以向你的关注者分享其他人的嘟文。",
+ "introduction.interactions.reply.headline": "回复",
+ "introduction.interactions.reply.text": "你可以向其他人回复,这些回复会像对话一样串在一起。",
+ "introduction.welcome.action": "让我们开始吧!",
+ "introduction.welcome.headline": "首先",
+ "introduction.welcome.text": "欢迎来到联邦!稍后,您将可以广播消息并和您的朋友交流,这些消息将穿越于联邦中的各式服务器。但是这台服务器,{domain},是特殊的——它保存了你的个人资料,所以请记住它的名字。",
"keyboard_shortcuts.back": "返回上一页",
- "keyboard_shortcuts.blocked": "to open blocked users list",
+ "keyboard_shortcuts.blocked": "打开被屏蔽用户列表",
"keyboard_shortcuts.boost": "转嘟",
- "keyboard_shortcuts.column": "选择第 X 栏中的嘟文",
+ "keyboard_shortcuts.column": "选择某一栏中的嘟文",
"keyboard_shortcuts.compose": "选择嘟文撰写框",
"keyboard_shortcuts.description": "说明",
- "keyboard_shortcuts.direct": "to open direct messages column",
+ "keyboard_shortcuts.direct": "打开私信栏",
"keyboard_shortcuts.down": "在列表中让光标下移",
"keyboard_shortcuts.enter": "展开嘟文",
"keyboard_shortcuts.favourite": "收藏嘟文",
- "keyboard_shortcuts.favourites": "to open favourites list",
- "keyboard_shortcuts.federated": "to open federated timeline",
+ "keyboard_shortcuts.favourites": "打开收藏列表",
+ "keyboard_shortcuts.federated": "打开跨站时间轴",
"keyboard_shortcuts.heading": "快捷键列表",
- "keyboard_shortcuts.home": "to open home timeline",
+ "keyboard_shortcuts.home": "打开主页时间轴",
"keyboard_shortcuts.hotkey": "快捷键",
"keyboard_shortcuts.legend": "显示此列表",
- "keyboard_shortcuts.local": "to open local timeline",
+ "keyboard_shortcuts.local": "打开本站时间轴",
"keyboard_shortcuts.mention": "提及嘟文作者",
- "keyboard_shortcuts.muted": "to open muted users list",
- "keyboard_shortcuts.my_profile": "to open your profile",
- "keyboard_shortcuts.notifications": "to open notifications column",
- "keyboard_shortcuts.pinned": "to open pinned toots list",
- "keyboard_shortcuts.profile": "to open author's profile",
+ "keyboard_shortcuts.muted": "打开屏蔽用户列表",
+ "keyboard_shortcuts.my_profile": "打开你的个人资料",
+ "keyboard_shortcuts.notifications": "打卡通知栏",
+ "keyboard_shortcuts.pinned": "打开置顶嘟文列表",
+ "keyboard_shortcuts.profile": "打开作者的个人资料",
"keyboard_shortcuts.reply": "回复嘟文",
- "keyboard_shortcuts.requests": "to open follow requests list",
+ "keyboard_shortcuts.requests": "打开关注请求列表",
"keyboard_shortcuts.search": "选择搜索框",
- "keyboard_shortcuts.start": "to open \"get started\" column",
+ "keyboard_shortcuts.start": "打开“开始使用”栏",
"keyboard_shortcuts.toggle_hidden": "显示或隐藏被折叠的正文",
+ "keyboard_shortcuts.toggle_sensitivity": "显示/隐藏媒体",
"keyboard_shortcuts.toot": "发送新嘟文",
"keyboard_shortcuts.unfocus": "取消输入",
"keyboard_shortcuts.up": "在列表中让光标上移",
"lightbox.close": "关闭",
- "lightbox.next": "下一步",
- "lightbox.previous": "上一步",
+ "lightbox.next": "下一个",
+ "lightbox.previous": "上一个",
+ "lightbox.view_context": "查看上下文",
"lists.account.add": "添加到列表",
"lists.account.remove": "从列表中删除",
"lists.delete": "删除列表",
"lists.edit": "编辑列表",
- "lists.edit.submit": "Change title",
+ "lists.edit.submit": "更改标题",
"lists.new.create": "新建列表",
"lists.new.title_placeholder": "新列表的标题",
"lists.search": "搜索你关注的人",
@@ -222,18 +225,19 @@
"media_gallery.toggle_visible": "切换显示/隐藏",
"missing_indicator.label": "找不到内容",
"missing_indicator.sublabel": "无法找到此资源",
- "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知",
- "navigation_bar.apps": "Mobile apps",
+ "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知?",
+ "navigation_bar.apps": "移动应用",
"navigation_bar.blocks": "已屏蔽的用户",
"navigation_bar.community_timeline": "本站时间轴",
- "navigation_bar.compose": "Compose new toot",
+ "navigation_bar.compose": "撰写新嘟文",
"navigation_bar.direct": "私信",
"navigation_bar.discover": "发现",
"navigation_bar.domain_blocks": "已屏蔽的网站",
"navigation_bar.edit_profile": "修改个人资料",
"navigation_bar.favourites": "收藏的内容",
- "navigation_bar.filters": "Muted words",
+ "navigation_bar.filters": "被隐藏的词",
"navigation_bar.follow_requests": "关注请求",
+ "navigation_bar.follows_and_followers": "正在关注以及关注者",
"navigation_bar.info": "关于本站",
"navigation_bar.keyboard_shortcuts": "快捷键列表",
"navigation_bar.lists": "列表",
@@ -242,40 +246,41 @@
"navigation_bar.personal": "个人",
"navigation_bar.pins": "置顶嘟文",
"navigation_bar.preferences": "首选项",
+ "navigation_bar.profile_directory": "用户资料目录",
"navigation_bar.public_timeline": "跨站公共时间轴",
"navigation_bar.security": "安全",
"notification.favourite": "{name} 收藏了你的嘟文",
"notification.follow": "{name} 开始关注你",
"notification.mention": "{name} 提及你",
- "notification.poll": "A poll you have voted in has ended",
- "notification.reblog": "{name} 转嘟了你的嘟文",
+ "notification.poll": "你参与的一个投票已经结束",
+ "notification.reblog": "{name} 转了你的嘟文",
"notifications.clear": "清空通知列表",
"notifications.clear_confirmation": "你确定要永久清空通知列表吗?",
"notifications.column_settings.alert": "桌面通知",
- "notifications.column_settings.favourite": "当你的嘟文被收藏时:",
- "notifications.column_settings.filter_bar.advanced": "Display all categories",
- "notifications.column_settings.filter_bar.category": "Quick filter bar",
- "notifications.column_settings.filter_bar.show": "Show",
+ "notifications.column_settings.favourite": "你的嘟文被收藏时:",
+ "notifications.column_settings.filter_bar.advanced": "显示所有类别",
+ "notifications.column_settings.filter_bar.category": "快速过滤栏",
+ "notifications.column_settings.filter_bar.show": "显示",
"notifications.column_settings.follow": "当有人关注你时:",
"notifications.column_settings.mention": "当有人在嘟文中提及你时:",
- "notifications.column_settings.poll": "Poll results:",
+ "notifications.column_settings.poll": "投票结果:",
"notifications.column_settings.push": "推送通知",
"notifications.column_settings.reblog": "当有人转嘟了你的嘟文时:",
"notifications.column_settings.show": "在通知栏显示",
"notifications.column_settings.sound": "播放音效",
- "notifications.filter.all": "All",
- "notifications.filter.boosts": "Boosts",
- "notifications.filter.favourites": "Favourites",
- "notifications.filter.follows": "Follows",
- "notifications.filter.mentions": "Mentions",
- "notifications.filter.polls": "Poll results",
+ "notifications.filter.all": "全部",
+ "notifications.filter.boosts": "转嘟",
+ "notifications.filter.favourites": "收藏",
+ "notifications.filter.follows": "关注",
+ "notifications.filter.mentions": "提及",
+ "notifications.filter.polls": "投票结果",
"notifications.group": "{count} 条通知",
- "poll.closed": "Closed",
- "poll.refresh": "Refresh",
- "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
- "poll.vote": "Vote",
- "poll_button.add_poll": "Add a poll",
- "poll_button.remove_poll": "Remove poll",
+ "poll.closed": "已关闭",
+ "poll.refresh": "刷新",
+ "poll.total_votes": "{count} 票",
+ "poll.vote": "投票",
+ "poll_button.add_poll": "发起投票",
+ "poll_button.remove_poll": "移除投票",
"privacy.change": "设置嘟文可见范围",
"privacy.direct.long": "只有被提及的用户能看到",
"privacy.direct.short": "私信",
@@ -294,8 +299,8 @@
"relative_time.seconds": "{number}秒",
"reply_indicator.cancel": "取消",
"report.forward": "发送举报至 {target}",
- "report.forward_hint": "这名用户来自另一个实例。是否要向那个实例发送一条匿名的举报?",
- "report.hint": "举报将会发送给你所在实例的监察员。你可以在下面填写举报这个用户的理由:",
+ "report.forward_hint": "这名用户来自另一个服务器。是否要向那个服务器发送一条匿名的举报?",
+ "report.hint": "举报将会发送给你所在服务器的监察员。你可以在下面填写举报该用户的理由:",
"report.placeholder": "附言",
"report.submit": "提交",
"report.target": "举报 {target}",
@@ -310,18 +315,18 @@
"search_results.hashtags": "话题标签",
"search_results.statuses": "嘟文",
"search_results.total": "共 {count, number} 个结果",
- "status.admin_account": "Open moderation interface for @{name}",
- "status.admin_status": "Open this status in the moderation interface",
+ "status.admin_account": "打开 @{name} 的管理界面",
+ "status.admin_status": "打开这条嘟文的管理界面",
"status.block": "屏蔽 @{name}",
"status.cancel_reblog_private": "取消转嘟",
"status.cannot_reblog": "无法转嘟这条嘟文",
- "status.copy": "Copy link to status",
+ "status.copy": "复制嘟文链接",
"status.delete": "删除",
- "status.detailed_status": "Detailed conversation view",
+ "status.detailed_status": "对话详情",
"status.direct": "发送私信给 @{name}",
"status.embed": "嵌入",
"status.favourite": "收藏",
- "status.filtered": "Filtered",
+ "status.filtered": "已过滤",
"status.load_more": "加载更多",
"status.media_hidden": "隐藏媒体内容",
"status.mention": "提及 @{name}",
@@ -331,46 +336,45 @@
"status.open": "展开嘟文",
"status.pin": "在个人资料页面置顶",
"status.pinned": "置顶嘟文",
- "status.read_more": "Read more",
+ "status.read_more": "阅读全文",
"status.reblog": "转嘟",
"status.reblog_private": "转嘟给原有关注者",
"status.reblogged_by": "{name} 转嘟了",
- "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+ "status.reblogs.empty": "无人转嘟此条。如果有人转嘟了,就会显示在这里。",
"status.redraft": "删除并重新编辑",
"status.reply": "回复",
"status.replyAll": "回复所有人",
"status.report": "举报 @{name}",
- "status.sensitive_toggle": "点击显示",
"status.sensitive_warning": "敏感内容",
"status.share": "分享",
"status.show_less": "隐藏内容",
"status.show_less_all": "隐藏所有内容",
"status.show_more": "显示内容",
"status.show_more_all": "显示所有内容",
- "status.show_thread": "Show thread",
+ "status.show_thread": "显示全部对话",
"status.unmute_conversation": "不再隐藏此对话",
"status.unpin": "在个人资料页面取消置顶",
- "suggestions.dismiss": "Dismiss suggestion",
- "suggestions.header": "You might be interested in…",
+ "suggestions.dismiss": "关闭建议",
+ "suggestions.header": "您可能会感兴趣…",
"tabs_bar.federated_timeline": "跨站",
"tabs_bar.home": "主页",
"tabs_bar.local_timeline": "本站",
"tabs_bar.notifications": "通知",
"tabs_bar.search": "搜索",
- "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
- "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
- "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
- "time_remaining.moments": "Moments remaining",
- "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+ "time_remaining.days": "剩余 {number, plural, one {# 天} other {# 天}}",
+ "time_remaining.hours": "剩余 {number, plural, one {# 小时} other {# 小时}}",
+ "time_remaining.minutes": "剩余 {number, plural, one {# 分钟} other {# 分钟}}",
+ "time_remaining.moments": "即将结束",
+ "time_remaining.seconds": "剩余 {number, plural, one {# 秒} other {# 秒}}",
"trends.count_by_accounts": "{count} 人正在讨论",
"ui.beforeunload": "如果你现在离开 Mastodon,你的草稿内容将会被丢弃。",
"upload_area.title": "将文件拖放到此处开始上传",
- "upload_button.label": "上传媒体文件",
- "upload_error.limit": "File upload limit exceeded.",
- "upload_error.poll": "File upload not allowed with polls.",
+ "upload_button.label": "上传媒体文件 (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_error.limit": "超过文件上传限制。",
+ "upload_error.poll": "投票中不允许上传文件。",
"upload_form.description": "为视觉障碍人士添加文字说明",
"upload_form.focus": "剪裁",
- "upload_form.undo": "取消上传",
+ "upload_form.undo": "删除",
"upload_progress.label": "上传中…",
"video.close": "关闭视频",
"video.exit_fullscreen": "退出全屏",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index ed448f65a..2cfc11703 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.publish": "發文",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "媒體被標示為敏感",
"compose_form.sensitive.unmarked": "媒體沒有被標示為敏感",
"compose_form.spoiler.marked": "文字被警告隱藏",
@@ -165,7 +166,7 @@
"introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
"introduction.federation.local.headline": "Local",
"introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
- "introduction.interactions.action": "Finish tutorial!",
+ "introduction.interactions.action": "Finish toot-orial!",
"introduction.interactions.favourite.headline": "Favourite",
"introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
"introduction.interactions.reblog.headline": "Boost",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "把標示移動到搜索",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "顯示或隱藏被標為敏感的文字",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "新的推文",
"keyboard_shortcuts.unfocus": "把標示移離文字輸入和搜索",
"keyboard_shortcuts.up": "在列表往上移動",
"lightbox.close": "關閉",
"lightbox.next": "繼續",
"lightbox.previous": "回退",
+ "lightbox.view_context": "View context",
"lists.account.add": "新增到列表",
"lists.account.remove": "從列表刪除",
"lists.delete": "刪除列表",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "最愛的內容",
"navigation_bar.filters": "Muted words",
"navigation_bar.follow_requests": "關注請求",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "關於本服務站",
"navigation_bar.keyboard_shortcuts": "鍵盤快速鍵",
"navigation_bar.lists": "列表",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "Personal",
"navigation_bar.pins": "置頂文章",
"navigation_bar.preferences": "偏好設定",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "跨站時間軸",
"navigation_bar.security": "安全",
"notification.favourite": "{name} 收藏了你的文章",
@@ -340,7 +345,6 @@
"status.reply": "回應",
"status.replyAll": "回應所有人",
"status.report": "舉報 @{name}",
- "status.sensitive_toggle": "點擊顯示",
"status.sensitive_warning": "敏感內容",
"status.share": "分享",
"status.show_less": "減少顯示",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index b43a0b72c..5715ef01a 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -77,6 +77,7 @@
"compose_form.poll.remove_option": "移除此選擇",
"compose_form.publish": "嘟掉",
"compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.hide": "Mark media as sensitive",
"compose_form.sensitive.marked": "此媒體被標記為敏感內容",
"compose_form.sensitive.unmarked": "此媒體未被標記為敏感內容",
"compose_form.spoiler.marked": "正文已隱藏在警告之後",
@@ -203,12 +204,14 @@
"keyboard_shortcuts.search": "將焦點移至搜尋框",
"keyboard_shortcuts.start": "開啟「開始使用」欄位",
"keyboard_shortcuts.toggle_hidden": "顯示/隱藏在內容警告之後的正文",
+ "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
"keyboard_shortcuts.toot": "開始發出新嘟文",
"keyboard_shortcuts.unfocus": "取消輸入文字區塊 / 搜尋的焦點",
"keyboard_shortcuts.up": "在名單中往上移動",
"lightbox.close": "關閉",
"lightbox.next": "下一步",
"lightbox.previous": "上一步",
+ "lightbox.view_context": "View context",
"lists.account.add": "新增至名單",
"lists.account.remove": "從名單中移除",
"lists.delete": "刪除名單",
@@ -234,6 +237,7 @@
"navigation_bar.favourites": "最愛內容",
"navigation_bar.filters": "靜音詞彙",
"navigation_bar.follow_requests": "關注請求",
+ "navigation_bar.follows_and_followers": "Follows and followers",
"navigation_bar.info": "關於此伺服器",
"navigation_bar.keyboard_shortcuts": "快速鍵",
"navigation_bar.lists": "名單",
@@ -242,6 +246,7 @@
"navigation_bar.personal": "個人",
"navigation_bar.pins": "釘選的嘟文",
"navigation_bar.preferences": "偏好設定",
+ "navigation_bar.profile_directory": "Profile directory",
"navigation_bar.public_timeline": "聯邦時間軸",
"navigation_bar.security": "安全性",
"notification.favourite": "{name} 把你的嘟文加入了最愛",
@@ -340,7 +345,6 @@
"status.reply": "回覆",
"status.replyAll": "回覆所有人",
"status.report": "檢舉 @{name}",
- "status.sensitive_toggle": "點擊顯示",
"status.sensitive_warning": "敏感內容",
"status.share": "分享",
"status.show_less": "減少顯示",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index b45def281..29c691144 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -131,13 +131,15 @@ function removeMedia(state, mediaId) {
});
};
-const insertSuggestion = (state, position, token, completion) => {
+const insertSuggestion = (state, position, token, completion, path) => {
return state.withMutations(map => {
- map.update('text', oldText => `${oldText.slice(0, position)}${completion} ${oldText.slice(position + token.length)}`);
+ map.updateIn(path, oldText => `${oldText.slice(0, position)}${completion} ${oldText.slice(position + token.length)}`);
map.set('suggestion_token', null);
- map.update('suggestions', ImmutableList(), list => list.clear());
- map.set('focusDate', new Date());
- map.set('caretPosition', position + completion.length + 1);
+ map.set('suggestions', ImmutableList());
+ if (path.length === 1 && path[0] === 'text') {
+ map.set('focusDate', new Date());
+ map.set('caretPosition', position + completion.length + 1);
+ }
map.set('idempotencyKey', uuid());
});
};
@@ -304,7 +306,7 @@ export default function compose(state = initialState, action) {
case COMPOSE_SUGGESTIONS_READY:
return state.set('suggestions', ImmutableList(action.accounts ? action.accounts.map(item => item.id) : action.emojis)).set('suggestion_token', action.token);
case COMPOSE_SUGGESTION_SELECT:
- return insertSuggestion(state, action.position, action.token, action.completion);
+ return insertSuggestion(state, action.position, action.token, action.completion, action.path);
case COMPOSE_SUGGESTION_TAGS_UPDATE:
return updateSuggestionTags(state, action.token);
case COMPOSE_TAG_HISTORY_UPDATE:
@@ -329,13 +331,14 @@ export default function compose(state = initialState, action) {
}));
case REDRAFT:
return state.withMutations(map => {
- map.set('text', unescapeHTML(expandMentions(action.status)));
+ map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status)));
map.set('in_reply_to', action.status.get('in_reply_to_id'));
map.set('privacy', action.status.get('visibility'));
map.set('media_attachments', action.status.get('media_attachments'));
map.set('focusDate', new Date());
map.set('caretPosition', null);
map.set('idempotencyKey', uuid());
+ map.set('sensitive', action.status.get('sensitive'));
if (action.status.get('spoiler_text').length > 0) {
map.set('spoiler', true);
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index c891f4a52..4d9604de9 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -18,7 +18,7 @@ import compareId from '../compare_id';
const initialState = ImmutableMap({
items: ImmutableList(),
hasMore: true,
- top: true,
+ top: false,
unread: 0,
isLoading: false,
});
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 6a972f967..309a95a19 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -35,14 +35,12 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
if (!next && !isLoadingRecent) mMap.set('hasMore', false);
- if (!statuses.isEmpty()) {
+ if (timeline.endsWith(':pinned')) {
+ mMap.set('items', statuses.map(status => status.get('id')));
+ } else if (!statuses.isEmpty()) {
mMap.update('items', ImmutableList(), oldIds => {
const newIds = statuses.map(status => status.get('id'));
- if (timeline.indexOf(':pinned') !== -1) {
- return newIds;
- }
-
const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1;
const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0);
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 70f08a8eb..ff6c7fdfb 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -84,8 +84,13 @@ export const makeGetStatus = () => {
statusReblog = null;
}
- const regex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters);
- const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
+ const dropRegex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters.filter(filter => filter.get('irreversible')));
+ if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) {
+ return null;
+ }
+
+ const regex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters);
+ const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
return statusBase.withMutations(map => {
map.set('reblog', statusReblog);
diff --git a/app/javascript/mastodon/stream.js b/app/javascript/mastodon/stream.js
index 306a068b7..c4642344f 100644
--- a/app/javascript/mastodon/stream.js
+++ b/app/javascript/mastodon/stream.js
@@ -71,11 +71,7 @@ export function connectStream(path, pollingRefresh = null, callbacks = () => ({
export default function getStream(streamingAPIBaseURL, accessToken, stream, { connected, received, disconnected, reconnected }) {
const params = [ `stream=${stream}` ];
- if (accessToken !== null) {
- params.push(`access_token=${accessToken}`);
- }
-
- const ws = new WebSocketClient(`${streamingAPIBaseURL}/api/v1/streaming/?${params.join('&')}`);
+ const ws = new WebSocketClient(`${streamingAPIBaseURL}/api/v1/streaming/?${params.join('&')}`, accessToken);
ws.onopen = connected;
ws.onmessage = e => received(JSON.parse(e.data));
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 93379cdb3..3135636cf 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -126,15 +126,15 @@ function main() {
return false;
});
- delegate(document, '.status__content__spoiler-link', 'click', ({ target }) => {
- const contentEl = target.parentNode.parentNode.querySelector('.e-content');
+ delegate(document, '.status__content__spoiler-link', 'click', function() {
+ const contentEl = this.parentNode.parentNode.querySelector('.e-content');
if (contentEl.style.display === 'block') {
contentEl.style.display = 'none';
- target.parentNode.style.marginBottom = 0;
+ this.parentNode.style.marginBottom = 0;
} else {
contentEl.style.display = 'block';
- target.parentNode.style.marginBottom = null;
+ this.parentNode.style.marginBottom = null;
}
return false;
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index 8429103b8..5a40e7d79 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -5,7 +5,7 @@
&-description {
input {
&::placeholder {
- opacity: 1.0;
+ opacity: 1;
}
}
}
@@ -67,3 +67,11 @@
text-decoration: none;
}
}
+
+.nothing-here {
+ color: $darker-text-color;
+}
+
+.public-layout .public-account-header__tabs__tabs .counter.active::after {
+ border-bottom: 4px solid $ui-highlight-color;
+}
diff --git a/app/javascript/styles/contrast/variables.scss b/app/javascript/styles/contrast/variables.scss
index f6cadf029..cfe3b21db 100644
--- a/app/javascript/styles/contrast/variables.scss
+++ b/app/javascript/styles/contrast/variables.scss
@@ -20,5 +20,5 @@ $highlight-text-color: $classic-highlight-color !default;
$action-button-color: #8d9ac2;
$inverted-text-color: $black !default;
-$lighter-text-color: darken($ui-base-color,6%) !default;
+$lighter-text-color: darken($ui-base-color, 6%) !default;
$light-text-color: darken($ui-primary-color, 40%) !default;
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index 74d1df8ed..b4fb1d709 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -279,6 +279,8 @@ h5 {
}
.hero-with-button {
+ padding-bottom: 16px;
+
h1 {
margin-bottom: 4px;
}
@@ -286,8 +288,6 @@ h5 {
p.lead {
margin-bottom: 32px;
}
-
- padding-bottom: 16px;
}
.header {
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index de03cf1a6..ee8a7d265 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -1,6 +1,10 @@
// Notes!
// Sass color functions, "darken" and "lighten" are automatically replaced.
+html {
+ scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25);
+}
+
// Change the colors of button texts
.button {
color: $white;
@@ -11,18 +15,139 @@
}
// Change default background colors of columns
-.column {
- > .scrollable {
+.column > .scrollable,
+.getting-started,
+.column-inline-form {
+ background: $white;
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-top: 0;
+}
+
+.column-back-button,
+.column-header {
+ background: $white;
+ border: 1px solid lighten($ui-base-color, 8%);
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border-top: 0;
+ }
+
+ &--slim-button {
+ border: 0;
+ top: -49px;
+ right: 1px;
+ }
+}
+
+.column-header__back-button,
+.column-header__button,
+.column-header__button.active,
+.account__header__bar {
+ background: $white;
+}
+
+.column-header__button.active {
+ color: $ui-highlight-color;
+
+ &:hover,
+ &:active,
+ &:focus {
+ color: $ui-highlight-color;
background: $white;
}
}
-.drawer__inner {
+.account__header__bar .avatar .account__avatar {
+ border-color: $white;
+}
+
+.getting-started__footer a {
+ color: $ui-secondary-color;
+ text-decoration: underline;
+}
+
+.column-subheading {
+ background: darken($ui-base-color, 4%);
+ border-bottom: 1px solid lighten($ui-base-color, 8%);
+}
+
+.getting-started,
+.scrollable {
+ .column-link {
+ background: $white;
+ border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+ &:hover,
+ &:active,
+ &:focus {
+ background: $ui-base-color;
+ }
+ }
+}
+
+.getting-started .navigation-bar {
+ border-top: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border-top: 0;
+ }
+}
+
+.compose-form__autosuggest-wrapper,
+.poll__text input[type="text"],
+.compose-form .spoiler-input__input,
+.compose-form__poll-wrapper select,
+.search__input,
+.setting-text,
+.box-widget input[type="text"],
+.box-widget input[type="email"],
+.box-widget input[type="password"],
+.box-widget textarea,
+.statuses-grid .detailed-status {
+ border: 1px solid lighten($ui-base-color, 8%);
+}
+
+.search__input {
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border-top: 0;
+ border-bottom: 0;
+ }
+}
+
+.list-editor .search .search__input {
+ border-top: 0;
+ border-bottom: 0;
+}
+
+.compose-form__poll-wrapper select {
+ background: $simple-background-color url("data:image/svg+xml;utf8,") no-repeat right 8px center / auto 16px;
+}
+
+.compose-form__poll-wrapper,
+.compose-form__poll-wrapper .poll__footer {
+ border-top-color: lighten($ui-base-color, 8%);
+}
+
+.notification__filter-bar {
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-top: 0;
+}
+
+.compose-form .compose-form__buttons-wrapper {
background: $ui-base-color;
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-top: 0;
+}
+
+.drawer__header,
+.drawer__inner {
+ background: $white;
+ border: 1px solid lighten($ui-base-color, 8%);
}
.drawer__inner__mastodon {
- background: $ui-base-color url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto;
+ background: $white url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto;
}
// Change the colors used in compose-form
@@ -93,16 +218,16 @@
.detailed-status,
.detailed-status__action-bar {
- background: darken($ui-base-color, 6%);
+ background: $white;
}
// Change the background colors of status__content__spoiler-link
.reply-indicator__content .status__content__spoiler-link,
.status__content .status__content__spoiler-link {
- background: $ui-base-lighter-color;
+ background: $ui-base-color;
&:hover {
- background: lighten($ui-base-lighter-color, 6%);
+ background: lighten($ui-base-color, 4%);
}
}
@@ -112,41 +237,47 @@
background: $ui-base-color;
}
+.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
+ color: $white;
+}
+
.account-gallery__item a {
background-color: $ui-base-color;
}
// Change the colors used in the dropdown menu
.dropdown-menu {
- background: $ui-base-color;
+ background: $white;
&__arrow {
&.left {
- border-left-color: $ui-base-color;
+ border-left-color: $white;
}
&.top {
- border-top-color: $ui-base-color;
+ border-top-color: $white;
}
&.bottom {
- border-bottom-color: $ui-base-color;
+ border-bottom-color: $white;
}
&.right {
- border-right-color: $ui-base-color;
+ border-right-color: $white;
}
}
&__item {
a {
- background: $ui-base-color;
+ background: $white;
color: $darker-text-color;
}
}
}
// Change the text colors on inverted background
+.privacy-dropdown__option.active,
+.privacy-dropdown__option:hover,
.privacy-dropdown__option.active .privacy-dropdown__option__content,
.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
.privacy-dropdown__option:hover .privacy-dropdown__option__content,
@@ -162,7 +293,7 @@
.actions-modal ul li:not(:empty) a:focus button,
.actions-modal ul li:not(:empty) a:hover,
.actions-modal ul li:not(:empty) a:hover button,
-.admin-wrapper .sidebar ul ul a.selected,
+.admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
.simple_form .block-button,
.simple_form .button,
.simple_form button {
@@ -170,7 +301,7 @@
}
.dropdown-menu__separator {
- border-bottom-color: lighten($ui-base-color, 12%);
+ border-bottom-color: lighten($ui-base-color, 4%);
}
// Change the background colors of modals
@@ -185,6 +316,12 @@
background: $ui-base-color;
}
+.column-header__collapsible-inner {
+ background: darken($ui-base-color, 4%);
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-top: 0;
+}
+
.boost-modal__action-bar,
.confirmation-modal__action-bar,
.mute-modal__action-bar,
@@ -230,6 +367,38 @@
.empty-column-indicator,
.error-column {
color: $primary-text-color;
+ background: $white;
+}
+
+.tabs-bar {
+ background: $white;
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-bottom: 0;
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border-top: 0;
+ }
+
+ &__link {
+ padding-bottom: 14px;
+ border-bottom-width: 1px;
+ border-bottom-color: lighten($ui-base-color, 8%);
+
+ &:hover,
+ &:active,
+ &:focus {
+ background: $ui-base-color;
+ }
+
+ &.active {
+ &:hover,
+ &:active,
+ &:focus {
+ background: transparent;
+ border-bottom-color: $ui-highlight-color;
+ }
+ }
+ }
}
// Change the default colors used on some parts of the profile pages
@@ -238,7 +407,102 @@
border-bottom-color: lighten($ui-base-color, 8%);
}
+.box-widget,
+.nothing-here,
+.page-header,
+.directory__tag > a,
+.directory__tag > div,
+.landing-page__call-to-action,
+.contact-widget,
+.landing .hero-widget__text,
+.landing-page__information.contact-widget {
+ background: $white;
+ border: 1px solid lighten($ui-base-color, 8%);
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border-left: 0;
+ border-right: 0;
+ border-top: 0;
+ }
+}
+
+.landing .hero-widget__text {
+ border-top: 0;
+ border-bottom: 0;
+}
+
+.simple_form {
+ input[type=text],
+ input[type=number],
+ input[type=email],
+ input[type=password],
+ textarea {
+ &:hover {
+ border-color: lighten($ui-base-color, 12%);
+ }
+ }
+}
+
+.landing .hero-widget__footer {
+ background: $white;
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-top: 0;
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border: 0;
+ }
+}
+
+.brand__tagline {
+ color: $ui-secondary-color;
+}
+
+.directory__tag > a {
+ &:hover,
+ &:active,
+ &:focus {
+ background: $ui-base-color;
+ }
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border: 0;
+ }
+}
+
+.directory__tag.active > a,
+.directory__tag.active > div {
+ border-color: $ui-highlight-color;
+
+ &,
+ h4,
+ h4 small,
+ .fa,
+ .trends__item__current {
+ color: $white;
+ }
+
+ &:hover,
+ &:active,
+ &:focus {
+ background: $ui-highlight-color;
+ }
+}
+
+.batch-table {
+ &__toolbar,
+ &__row,
+ .nothing-here {
+ border-color: lighten($ui-base-color, 8%);
+ }
+}
+
.activity-stream {
+ border: 1px solid lighten($ui-base-color, 8%);
+
+ &--under-tabs {
+ border-top: 0;
+ }
+
.entry {
background: $account-background-color;
@@ -293,6 +557,22 @@
background: rgba($error-red, 0.5);
text-shadow: none;
}
+
+ .recommended {
+ border-color: $ui-highlight-color;
+ color: $ui-highlight-color;
+ background-color: rgba($ui-highlight-color, 0.1);
+ }
+}
+
+.compose-form .compose-form__warning {
+ border-color: $ui-highlight-color;
+ background-color: rgba($ui-highlight-color, 0.1);
+
+ &,
+ a {
+ color: $ui-highlight-color;
+ }
}
.status__content,
@@ -305,20 +585,47 @@
.button.logo-button {
color: $white;
- svg path:first-child {
+ svg {
fill: $white;
}
}
.public-layout {
+ .account__section-headline {
+ border: 1px solid lighten($ui-base-color, 8%);
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border-top: 0;
+ }
+ }
+
.header,
.public-account-header,
.public-account-bio {
box-shadow: none;
}
+ .public-account-bio,
+ .hero-widget__text {
+ background: $account-background-color;
+ border: 1px solid lighten($ui-base-color, 8%);
+ }
+
.header {
- background: lighten($ui-base-color, 12%);
+ background: $ui-base-color;
+ border: 1px solid lighten($ui-base-color, 8%);
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ border: 0;
+ }
+
+ .brand {
+ &:hover,
+ &:focus,
+ &:active {
+ background: lighten($ui-base-color, 4%);
+ }
+ }
}
.public-account-header {
@@ -330,17 +637,50 @@
}
}
+ &__bar {
+ &::before {
+ background: $account-background-color;
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-top: 0;
+ }
+
+ .avatar img {
+ border-color: $account-background-color;
+ }
+
+ @media screen and (max-width: $no-columns-breakpoint) {
+ background: $account-background-color;
+ border: 1px solid lighten($ui-base-color, 8%);
+ border-top: 0;
+ }
+ }
+
&__tabs {
&__name {
h1,
h1 small {
color: $white;
+
+ @media screen and (max-width: $no-columns-breakpoint) {
+ color: $primary-text-color;
+ }
}
}
}
+
+ &__extra {
+ .public-account-bio {
+ border: 0;
+ }
+
+ .public-account-bio .account__header__fields {
+ border-color: lighten($ui-base-color, 8%);
+ }
+ }
}
}
+.notification__filter-bar button.active::after,
.account__section-headline a.active::after {
border-color: transparent transparent $white;
}
@@ -354,6 +694,9 @@
.activity-stream,
.nothing-here,
.directory__tag > a,
-.directory__tag > div {
+.directory__tag > div,
+.card > a,
+.page-header,
+.compose-form .compose-form__warning {
box-shadow: none;
}
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index 08806599e..faaffb30f 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -1,21 +1,21 @@
-@mixin avatar-radius() {
+@mixin avatar-radius {
border-radius: 4px;
background: transparent no-repeat;
background-position: 50%;
background-clip: padding-box;
}
-@mixin avatar-size($size:48px) {
+@mixin avatar-size($size: 48px) {
width: $size;
height: $size;
background-size: $size $size;
}
-@mixin search-input() {
+@mixin search-input {
outline: 0;
box-sizing: border-box;
width: 100%;
- border: none;
+ border: 0;
box-shadow: none;
font-family: inherit;
background: $ui-base-color;
@@ -42,7 +42,7 @@
}
}
-@mixin search-popout() {
+@mixin search-popout {
background: $simple-background-color;
border-radius: 4px;
padding: 10px 14px;
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 6ac21ab1a..9f7955fac 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -659,7 +659,8 @@ $small-breakpoint: 960px;
align-items: center;
padding: 50px;
- img {
+ svg {
+ fill: $primary-text-color;
height: 52px;
}
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index a790251f4..f95313a25 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -68,6 +68,7 @@
margin: 0;
border-radius: 4px;
background: darken($ui-base-color, 8%);
+ object-fit: cover;
}
}
@@ -196,7 +197,8 @@
}
}
-.account-role {
+.account-role,
+.simple_form .recommended {
display: inline-block;
padding: 4px 6px;
cursor: default;
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index dd3b47a8f..373a10260 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -171,7 +171,7 @@ $content-width: 840px;
text-transform: none;
padding-bottom: 0;
margin-bottom: 0;
- border-bottom: none;
+ border-bottom: 0;
}
& > p {
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 4411ca0b4..b5a77ce94 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -2,7 +2,8 @@
@if type-of($color) == 'color' {
$color: str-slice(ie-hex-str($color), 4);
}
- @return '%23' + unquote($color)
+
+ @return '%23' + unquote($color);
}
body {
@@ -15,7 +16,7 @@ body {
text-rendering: optimizelegibility;
font-feature-settings: "kern";
text-size-adjust: none;
- -webkit-tap-highlight-color: rgba(0,0,0,0);
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
&.system-font {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index cf8fa9392..4a0d64ad3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -128,7 +128,7 @@
display: inline-block;
padding: 0;
color: $action-button-color;
- border: none;
+ border: 0;
background: transparent;
cursor: pointer;
transition: color 100ms ease-in;
@@ -196,7 +196,7 @@
.text-icon-button {
color: $lighter-text-color;
- border: none;
+ border: 0;
background: transparent;
cursor: pointer;
font-weight: 600;
@@ -268,9 +268,34 @@
padding: 10px;
padding-top: 0;
- .icon-button {
- font-size: 14px;
- font-weight: 500;
+ font-size: 14px;
+ font-weight: 500;
+
+ &.active {
+ color: $highlight-text-color;
+ }
+
+ input[type=checkbox] {
+ display: none;
+ }
+
+ .checkbox {
+ display: inline-block;
+ position: relative;
+ border: 1px solid $ui-primary-color;
+ box-sizing: border-box;
+ width: 18px;
+ height: 18px;
+ flex: 0 0 auto;
+ margin-right: 10px;
+ top: -1px;
+ border-radius: 4px;
+ vertical-align: middle;
+
+ &.active {
+ border-color: $highlight-text-color;
+ background: $highlight-text-color;
+ }
}
}
@@ -308,17 +333,18 @@
}
}
+ .emoji-picker-dropdown {
+ position: absolute;
+ top: 5px;
+ right: 5px;
+ }
+
.compose-form__autosuggest-wrapper {
position: relative;
-
- .emoji-picker-dropdown {
- position: absolute;
- right: 5px;
- top: 5px;
- }
}
.autosuggest-textarea,
+ .autosuggest-input,
.spoiler-input {
position: relative;
}
@@ -326,11 +352,12 @@
.spoiler-input {
height: 0;
transform-origin: bottom;
- opacity: 0.0;
+ opacity: 0;
&.spoiler-input--visible {
- height: 47px;
- opacity: 1.0;
+ height: 36px;
+ margin-bottom: 11px;
+ opacity: 1;
}
}
@@ -380,6 +407,11 @@
}
}
+ .autosuggest-textarea__suggestions-wrapper {
+ position: relative;
+ height: 0;
+ }
+
.autosuggest-textarea__suggestions {
box-sizing: border-box;
display: none;
@@ -525,6 +557,7 @@
.compose-form__upload-thumbnail {
border-radius: 4px;
+ background-color: $base-shadow-color;
background-position: center;
background-size: cover;
background-repeat: no-repeat;
@@ -540,6 +573,7 @@
border-radius: 0 0 4px 4px;
display: flex;
justify-content: space-between;
+ flex: 0 0 auto;
.compose-form__buttons {
display: flex;
@@ -588,6 +622,7 @@
display: flex;
justify-content: flex-end;
min-width: 0;
+ flex: 0 0 auto;
.compose-form__publish-button-wrapper {
overflow: hidden;
@@ -618,6 +653,9 @@
margin-bottom: 10px;
background: $ui-primary-color;
padding: 10px;
+ min-height: 23px;
+ overflow-y: auto;
+ flex: 0 2 auto;
}
.reply-indicator__header {
@@ -684,7 +722,7 @@
white-space: pre-wrap;
&:last-child {
- margin-bottom: 0;
+ margin-bottom: 2px;
}
}
@@ -1146,7 +1184,7 @@
}
.account__avatar {
- @include avatar-radius();
+ @include avatar-radius;
position: relative;
&-inline {
@@ -1156,11 +1194,11 @@
}
&-composite {
- @include avatar-radius();
+ @include avatar-radius;
overflow: hidden;
& > div {
- @include avatar-radius();
+ @include avatar-radius;
float: left;
position: relative;
box-sizing: border-box;
@@ -1176,12 +1214,12 @@ a .account__avatar {
@include avatar-size(48px);
&-base {
- @include avatar-radius();
+ @include avatar-radius;
@include avatar-size(36px);
}
&-overlay {
- @include avatar-radius();
+ @include avatar-radius;
@include avatar-size(24px);
position: absolute;
@@ -1386,6 +1424,15 @@ a.account__display-name {
width: 48px;
}
+.status__expand {
+ width: 68px;
+ position: absolute;
+ left: 0;
+ top: 0;
+ height: 100%;
+ cursor: pointer;
+}
+
.muted {
.status__content p,
.status__content a {
@@ -1550,13 +1597,13 @@ a.account__display-name {
.icon-button.close {
position: absolute;
pointer-events: none;
- transform: scale(0.0, 1.0) translate(-100%, 0);
+ transform: scale(0, 1) translate(-100%, 0);
opacity: 0;
}
.compose__action-bar .icon-button {
pointer-events: auto;
- transform: scale(1.0, 1.0) translate(0, 0);
+ transform: scale(1, 1) translate(0, 0);
opacity: 1;
}
}
@@ -1751,15 +1798,42 @@ a.account__display-name {
&.unscrollable {
overflow-x: hidden;
}
-}
-@media screen and (min-width: 360px) {
- .columns-area {
- padding: 10px;
- }
+ &__panels {
+ display: flex;
+ justify-content: center;
+ width: 100%;
+ height: 100%;
- .react-swipeable-view-container .columns-area {
- height: calc(100% - 20px) !important;
+ &__pane {
+ height: 100%;
+ overflow: hidden;
+ pointer-events: none;
+ display: flex;
+ justify-content: flex-end;
+
+ &--start {
+ justify-content: flex-start;
+ }
+
+ &__inner {
+ width: 285px;
+ pointer-events: auto;
+ height: 100%;
+ }
+ }
+
+ &__main {
+ box-sizing: border-box;
+ width: 100%;
+ max-width: 600px;
+ display: flex;
+ flex-direction: column;
+
+ @media screen and (min-width: $no-gap-breakpoint) {
+ padding: 0 10px;
+ }
+ }
}
}
@@ -1825,36 +1899,6 @@ a.account__display-name {
overflow: hidden;
}
-@media screen and (min-width: 360px) {
- .tabs-bar {
- margin: 10px;
- margin-bottom: 0;
- }
-
- .getting-started__wrapper,
- .getting-started__trends,
- .search {
- margin-bottom: 10px;
- }
-}
-
-@media screen and (max-width: 630px) {
- .column,
- .drawer {
- width: 100%;
- padding: 0;
- }
-
- .columns-area {
- flex-direction: column;
- }
-
- .search__input,
- .autosuggest-textarea__textarea {
- font-size: 16px;
- }
-}
-
@media screen and (min-width: 631px) {
.columns-area {
padding: 0;
@@ -1885,6 +1929,331 @@ a.account__display-name {
}
}
+.tabs-bar {
+ box-sizing: border-box;
+ display: flex;
+ background: lighten($ui-base-color, 8%);
+ flex: 0 0 auto;
+ overflow-y: auto;
+}
+
+.tabs-bar__link {
+ display: block;
+ flex: 1 1 auto;
+ padding: 15px 10px;
+ padding-bottom: 13px;
+ color: $primary-text-color;
+ text-decoration: none;
+ text-align: center;
+ font-size: 14px;
+ font-weight: 500;
+ border-bottom: 2px solid lighten($ui-base-color, 8%);
+ transition: all 50ms linear;
+ transition-property: border-bottom, background, color;
+
+ .fa {
+ font-weight: 400;
+ font-size: 16px;
+ }
+
+ &:hover,
+ &:focus,
+ &:active {
+ @media screen and (min-width: 631px) {
+ background: lighten($ui-base-color, 14%);
+ border-bottom-color: lighten($ui-base-color, 14%);
+ }
+ }
+
+ &.active {
+ border-bottom: 2px solid $highlight-text-color;
+ color: $highlight-text-color;
+ }
+
+ span {
+ margin-left: 5px;
+ display: none;
+ }
+}
+
+@media screen and (min-width: 600px) {
+ .tabs-bar__link {
+ span {
+ display: inline;
+ }
+ }
+}
+
+.columns-area--mobile {
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ margin: 0 auto;
+
+ .column,
+ .drawer {
+ width: 100%;
+ height: 100%;
+ padding: 0;
+ }
+
+ .autosuggest-textarea__textarea {
+ font-size: 16px;
+ }
+
+ .search__input {
+ line-height: 18px;
+ font-size: 16px;
+ padding: 15px;
+ padding-right: 30px;
+ }
+
+ .search__icon .fa {
+ top: 15px;
+ }
+
+ @media screen and (min-width: $no-gap-breakpoint) {
+ padding: 10px 0;
+ }
+
+ @media screen and (min-width: 630px) {
+ .detailed-status {
+ padding: 15px;
+
+ .media-gallery,
+ .video-player {
+ margin-top: 15px;
+ }
+ }
+
+ .account__header__bar {
+ padding: 5px 10px;
+ }
+
+ .navigation-bar,
+ .compose-form {
+ padding: 15px;
+ }
+
+ .compose-form .compose-form__publish .compose-form__publish-button-wrapper {
+ padding-top: 15px;
+ }
+
+ .status {
+ padding: 15px 15px 15px (48px + 15px * 2);
+ min-height: 48px + 2px;
+
+ &__avatar {
+ left: 15px;
+ top: 17px;
+ }
+
+ &__content {
+ padding-top: 5px;
+ }
+
+ &__prepend {
+ margin-left: 48px + 15px * 2;
+ padding-top: 15px;
+ }
+
+ &__prepend-icon-wrapper {
+ left: -32px;
+ }
+
+ .media-gallery,
+ &__action-bar,
+ .video-player {
+ margin-top: 10px;
+ }
+ }
+
+ .account {
+ padding: 15px 10px;
+
+ &__header__bio {
+ margin: 0 -10px;
+ }
+ }
+
+ .notification {
+ &__message {
+ margin-left: 48px + 15px * 2;
+ padding-top: 15px;
+ }
+
+ &__favourite-icon-wrapper {
+ left: -32px;
+ }
+
+ .status {
+ padding-top: 8px;
+ }
+
+ .account {
+ padding-top: 8px;
+ }
+
+ .account__avatar-wrapper {
+ margin-left: 17px;
+ margin-right: 15px;
+ }
+ }
+ }
+}
+
+.floating-action-button {
+ position: fixed;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 3.9375rem;
+ height: 3.9375rem;
+ bottom: 1.3125rem;
+ right: 1.3125rem;
+ background: darken($ui-highlight-color, 3%);
+ color: $white;
+ border-radius: 50%;
+ font-size: 21px;
+ line-height: 21px;
+ text-decoration: none;
+ box-shadow: 2px 3px 9px rgba($base-shadow-color, 0.4);
+
+ &:hover,
+ &:focus,
+ &:active {
+ background: lighten($ui-highlight-color, 7%);
+ }
+}
+
+@media screen and (min-width: $no-gap-breakpoint) {
+ .tabs-bar {
+ margin: 10px auto;
+ margin-bottom: 0;
+ width: 100%;
+ }
+
+ .react-swipeable-view-container .columns-area--mobile {
+ height: calc(100% - 20px) !important;
+ }
+
+ .getting-started__wrapper,
+ .getting-started__trends,
+ .search {
+ margin-bottom: 10px;
+ }
+}
+
+@media screen and (max-width: 600px + (285px * 1) + (10px * 1)) {
+ .columns-area__panels__pane--compositional {
+ display: none;
+ }
+}
+
+@media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {
+ .floating-action-button,
+ .tabs-bar__link.optional {
+ display: none;
+ }
+
+ .search-page .search {
+ display: none;
+ }
+}
+
+@media screen and (max-width: 600px + (285px * 2) + (10px * 2)) {
+ .columns-area__panels__pane--navigational {
+ display: none;
+ }
+}
+
+@media screen and (min-width: 600px + (285px * 2) + (10px * 2)) {
+ .tabs-bar {
+ display: none;
+ }
+}
+
+.icon-with-badge {
+ position: relative;
+
+ &__badge {
+ position: absolute;
+ left: 9px;
+ top: -13px;
+ background: $ui-highlight-color;
+ border: 2px solid lighten($ui-base-color, 8%);
+ padding: 1px 6px;
+ border-radius: 6px;
+ font-size: 10px;
+ font-weight: 500;
+ line-height: 14px;
+ color: $primary-text-color;
+ }
+}
+
+.column-link--transparent .icon-with-badge__badge {
+ border-color: darken($ui-base-color, 8%);
+}
+
+.compose-panel {
+ width: 285px;
+ margin-top: 10px;
+ display: flex;
+ flex-direction: column;
+ height: calc(100% - 10px);
+ overflow-y: hidden;
+
+ .navigation-bar {
+ padding-top: 20px;
+ padding-bottom: 20px;
+ flex: 0 1 48px;
+ min-height: 20px;
+ }
+
+ .flex-spacer {
+ background: transparent;
+ }
+
+ .compose-form {
+ flex: 1;
+ overflow-y: hidden;
+ display: flex;
+ flex-direction: column;
+ min-height: 310px;
+ padding-bottom: 71px;
+ margin-bottom: -71px;
+ }
+
+ .compose-form__autosuggest-wrapper {
+ overflow-y: auto;
+ background-color: $white;
+ border-radius: 4px 4px 0 0;
+ flex: 0 1 auto;
+ }
+
+ .autosuggest-textarea__textarea {
+ overflow-y: hidden;
+ }
+
+ .compose-form__upload-thumbnail {
+ height: 80px;
+ }
+}
+
+.navigation-panel {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ height: calc(100% - 20px);
+ overflow-y: auto;
+
+ hr {
+ border: 0;
+ background: transparent;
+ border-top: 1px solid lighten($ui-base-color, 4%);
+ margin: 10px 0;
+ }
+}
+
.drawer__pager {
box-sizing: border-box;
padding: 0;
@@ -1917,6 +2286,7 @@ a.account__display-name {
background: lighten($ui-base-color, 13%) url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto;
flex: 1;
min-height: 47px;
+ display: none;
> img {
display: block;
@@ -1928,6 +2298,10 @@ a.account__display-name {
user-drag: none;
user-select: none;
}
+
+ @media screen and (min-height: 640px) {
+ display: block;
+ }
}
.pseudo-drawer {
@@ -1954,64 +2328,6 @@ a.account__display-name {
}
}
-.tabs-bar {
- display: flex;
- background: lighten($ui-base-color, 8%);
- flex: 0 0 auto;
- overflow-y: auto;
-}
-
-.tabs-bar__link {
- display: block;
- flex: 1 1 auto;
- padding: 15px 10px;
- color: $primary-text-color;
- text-decoration: none;
- text-align: center;
- font-size: 14px;
- font-weight: 500;
- border-bottom: 2px solid lighten($ui-base-color, 8%);
- transition: all 50ms linear;
- transition-property: border-bottom, background, color;
-
- .fa {
- font-weight: 400;
- font-size: 16px;
- }
-
- &.active {
- border-bottom: 2px solid $highlight-text-color;
- color: $highlight-text-color;
- }
-
- &:hover,
- &:focus,
- &:active {
- @media screen and (min-width: 631px) {
- background: lighten($ui-base-color, 14%);
- }
- }
-
- span {
- margin-left: 5px;
- display: none;
- }
-}
-
-@media screen and (min-width: 600px) {
- .tabs-bar__link {
- span {
- display: inline;
- }
- }
-}
-
-@media screen and (min-width: 631px) {
- .tabs-bar {
- display: none;
- }
-}
-
.scrollable {
overflow-y: scroll;
overflow-x: hidden;
@@ -2217,9 +2533,31 @@ a.account__display-name {
padding: 15px;
text-decoration: none;
- &:hover {
+ &:hover,
+ &:focus,
+ &:active {
background: lighten($ui-base-color, 11%);
}
+
+ &:focus {
+ outline: 0;
+ }
+
+ &--transparent {
+ background: transparent;
+ color: $ui-secondary-color;
+
+ &:hover,
+ &:focus,
+ &:active {
+ background: transparent;
+ color: $primary-text-color;
+ }
+
+ &.active {
+ color: $ui-highlight-color;
+ }
+ }
}
.column-link__icon {
@@ -2351,21 +2689,22 @@ a.account__display-name {
}
.setting-text {
- color: $darker-text-color;
- background: transparent;
- border: none;
- border-bottom: 2px solid $ui-primary-color;
- box-sizing: border-box;
display: block;
- font-family: inherit;
- margin-bottom: 10px;
- padding: 7px 0;
+ box-sizing: border-box;
width: 100%;
+ margin: 0;
+ color: $inverted-text-color;
+ background: $simple-background-color;
+ padding: 10px;
+ font-family: inherit;
+ font-size: 14px;
+ resize: vertical;
+ border: 0;
+ outline: 0;
+ border-radius: 4px;
- &:focus,
- &:active {
- color: $primary-text-color;
- border-bottom-color: $highlight-text-color;
+ &:focus {
+ outline: 0;
}
@media screen and (max-width: 600px) {
@@ -2691,7 +3030,7 @@ a.status-card.compact:hover {
& > button {
margin: 0;
- border: none;
+ border: 0;
padding: 15px 0 15px 15px;
color: inherit;
background: transparent;
@@ -2727,6 +3066,10 @@ a.status-card.compact:hover {
display: flex;
}
+.column-header__links {
+ margin-bottom: 14px;
+}
+
.column-header__links .text-btn {
margin-right: 10px;
}
@@ -2856,11 +3199,11 @@ a.status-card.compact:hover {
}
.no-reduce-motion .loading-indicator span {
- animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
+ animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.61, 0.355, 1);
}
.no-reduce-motion .loading-indicator__figure {
- animation: loader-figure 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
+ animation: loader-figure 1.15s infinite cubic-bezier(0.215, 0.61, 0.355, 1);
}
@keyframes loader-figure {
@@ -3027,7 +3370,7 @@ a.status-card.compact:hover {
.column-select {
&__control {
- @include search-input();
+ @include search-input;
}
&__placeholder {
@@ -3078,7 +3421,7 @@ a.status-card.compact:hover {
}
&__menu {
- @include search-popout();
+ @include search-popout;
padding: 0;
background: $ui-secondary-color;
}
@@ -3155,6 +3498,10 @@ a.status-card.compact:hover {
contain: strict;
}
+ & > span {
+ max-width: 400px;
+ }
+
a {
color: $highlight-text-color;
text-decoration: none;
@@ -3235,7 +3582,7 @@ a.status-card.compact:hover {
.no-reduce-motion .shake-bottom {
transform-origin: 50% 100%;
- animation: shake-bottom 0.8s cubic-bezier(0.455, 0.030, 0.515, 0.955) 2s 2 both;
+ animation: shake-bottom 0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955) 2s 2 both;
}
.emoji-picker-dropdown__menu {
@@ -3244,6 +3591,7 @@ a.status-card.compact:hover {
box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
border-radius: 4px;
margin-top: 5px;
+ z-index: 2;
.emoji-mart-scroll {
transition: opacity 200ms ease;
@@ -3529,10 +3877,13 @@ a.status-card.compact:hover {
}
.search__input {
+ @include search-input;
+
display: block;
- padding: 10px;
+ padding: 15px;
padding-right: 30px;
- @include search-input();
+ line-height: 18px;
+ font-size: 16px;
}
.search__icon {
@@ -3547,7 +3898,7 @@ a.status-card.compact:hover {
.fa {
position: absolute;
- top: 10px;
+ top: 16px;
right: 10px;
z-index: 2;
display: inline-block;
@@ -3577,7 +3928,7 @@ a.status-card.compact:hover {
}
.fa-times-circle {
- top: 11px;
+ top: 17px;
transform: rotate(0deg);
color: $action-button-color;
cursor: pointer;
@@ -4140,14 +4491,14 @@ a.status-card.compact:hover {
}
.actions-modal {
+ max-height: 80vh;
+ max-width: 80vw;
+
.status {
overflow-y: auto;
max-height: 300px;
}
- max-height: 80vh;
- max-width: 80vw;
-
.actions-modal__item-label {
font-weight: 500;
}
@@ -4362,7 +4713,7 @@ a.status-card.compact:hover {
}
.media-gallery__item {
- border: none;
+ border: 0;
box-sizing: border-box;
display: block;
float: left;
@@ -4383,7 +4734,6 @@ a.status-card.compact:hover {
display: block;
text-decoration: none;
color: $secondary-text-color;
- line-height: 0;
position: relative;
z-index: 1;
@@ -4822,13 +5172,21 @@ a.status-card.compact:hover {
}
.account-gallery__item {
- border: none;
+ border: 0;
box-sizing: border-box;
display: block;
position: relative;
border-radius: 4px;
overflow: hidden;
margin: 2px;
+
+ &__icons {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ font-size: 24px;
+ }
}
.notification__filter-bar,
@@ -4888,7 +5246,7 @@ a.status-card.compact:hover {
}
.search-popout {
- @include search-popout();
+ @include search-popout;
}
noscript {
@@ -4990,14 +5348,14 @@ noscript {
.icon-button.close {
pointer-events: auto;
opacity: 1;
- transform: scale(1.0, 1.0) translate(0, 0);
+ transform: scale(1, 1) translate(0, 0);
bottom: 5px;
}
.compose__action-bar .icon-button {
pointer-events: none;
opacity: 0;
- transform: scale(0.0, 1.0) translate(100%, 0);
+ transform: scale(0, 1) translate(100%, 0);
}
}
}
@@ -5027,7 +5385,7 @@ noscript {
box-sizing: border-box;
display: block;
width: 100%;
- border: none;
+ border: 0;
padding: 10px;
font-family: $font-monospace, monospace;
background: $ui-base-color;
@@ -5102,8 +5460,8 @@ noscript {
}
.column-inline-form {
- padding: 7px 15px;
- padding-right: 5px;
+ padding: 15px;
+ padding-right: 0;
display: flex;
justify-content: flex-start;
align-items: center;
@@ -5114,7 +5472,6 @@ noscript {
input {
width: 100%;
- margin-bottom: 6px;
&:focus {
outline: 0;
@@ -5124,7 +5481,7 @@ noscript {
.icon-button {
flex: 0 0 auto;
- margin: 0 5px;
+ margin: 0 10px;
}
}
@@ -5275,30 +5632,6 @@ noscript {
}
}
-.floating-action-button {
- position: fixed;
- display: flex;
- justify-content: center;
- align-items: center;
- width: 3.9375rem;
- height: 3.9375rem;
- bottom: 1.3125rem;
- right: 1.3125rem;
- background: darken($ui-highlight-color, 3%);
- color: $white;
- border-radius: 50%;
- font-size: 21px;
- line-height: 21px;
- text-decoration: none;
- box-shadow: 2px 3px 9px rgba($base-shadow-color, 0.4);
-
- &:hover,
- &:focus,
- &:active {
- background: lighten($ui-highlight-color, 7%);
- }
-}
-
.account__header__content {
color: $darker-text-color;
font-size: 14px;
@@ -5567,3 +5900,49 @@ noscript {
}
}
}
+
+.layout-toggle {
+ display: flex;
+ padding: 5px;
+
+ button {
+ box-sizing: border-box;
+ flex: 0 0 50%;
+ background: transparent;
+ padding: 5px;
+ border: 0;
+ position: relative;
+
+ &:hover,
+ &:focus,
+ &:active {
+ svg path:first-child {
+ fill: lighten($ui-base-color, 16%);
+ }
+ }
+ }
+
+ svg {
+ width: 100%;
+ height: auto;
+
+ path:first-child {
+ fill: lighten($ui-base-color, 12%);
+ }
+
+ path:last-child {
+ fill: darken($ui-base-color, 14%);
+ }
+ }
+
+ &__active {
+ color: $ui-highlight-color;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ background: lighten($ui-base-color, 12%);
+ border-radius: 50%;
+ padding: 0.35rem;
+ }
+}
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 368c2304b..3564bf07b 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -21,7 +21,8 @@
justify-content: center;
align-items: center;
- img {
+ svg {
+ fill: $primary-text-color;
height: 42px;
margin-right: 10px;
}
@@ -121,7 +122,7 @@
grid-auto-rows: max-content;
.column-0 {
- grid-column: 1/3;
+ grid-column: 1 / 3;
grid-row: 1;
}
@@ -136,7 +137,7 @@
}
.column-3 {
- grid-column: 1/3;
+ grid-column: 1 / 3;
grid-row: 3;
}
@@ -256,12 +257,13 @@
display: block;
padding: 15px;
- img {
+ svg {
display: block;
height: 18px;
width: auto;
position: relative;
bottom: -2px;
+ fill: $primary-text-color;
@media screen and (max-width: $no-gap-breakpoint) {
height: 20px;
@@ -359,10 +361,6 @@
.logo-button {
background-color: $secondary-text-color;
-
- svg path:last-child {
- fill: $secondary-text-color;
- }
}
}
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index e49084b5f..4bfd66504 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -1,14 +1,14 @@
.emoji-mart {
+ font-size: 13px;
+ display: inline-block;
+ color: $inverted-text-color;
+
&,
* {
box-sizing: border-box;
line-height: 1.15;
}
- font-size: 13px;
- display: inline-block;
- color: $inverted-text-color;
-
.emoji-mart-emoji {
padding: 6px;
}
diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss
index 4d75477e0..f74c004e9 100644
--- a/app/javascript/styles/mastodon/footer.scss
+++ b/app/javascript/styles/mastodon/footer.scss
@@ -122,10 +122,7 @@
height: 36px;
width: auto;
margin: 0 auto;
-
- path {
- fill: lighten($ui-base-color, 34%);
- }
+ fill: lighten($ui-base-color, 34%);
}
&:hover,
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 2b8d7a682..456ee4e0d 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -79,6 +79,12 @@ code {
text-decoration: none;
}
}
+
+ .recommended {
+ position: absolute;
+ margin: 0 4px;
+ margin-top: -2px;
+ }
}
}
@@ -443,6 +449,10 @@ code {
height: 41px;
}
+ h4 {
+ margin-bottom: 15px !important;
+ }
+
.label_input {
&__wrapper {
position: relative;
@@ -553,7 +563,7 @@ code {
box-sizing: border-box;
display: block;
width: 100%;
- border: none;
+ border: 0;
padding: 10px;
font-family: $font-monospace, monospace;
background: $ui-base-color;
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index d8bc5473a..12f57b7a9 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -37,14 +37,16 @@
display: none;
}
+ .autossugest-input {
+ flex: 1 1 auto;
+ }
+
input[type=text] {
display: block;
box-sizing: border-box;
- flex: 1 1 auto;
- width: 20px;
+ width: 100%;
font-size: 14px;
color: $inverted-text-color;
- display: block;
outline: 0;
font-family: inherit;
background: $simple-background-color;
@@ -64,6 +66,7 @@
&.editable {
display: flex;
align-items: center;
+ overflow: visible;
}
}
@@ -114,11 +117,14 @@
text-decoration: underline;
font-size: inherit;
- &:hover,
- &:focus,
- &:active {
+ &:hover {
text-decoration: none;
}
+
+ &:active,
+ &:focus {
+ background-color: rgba($dark-text-color, .1);
+ }
}
.button {
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index 940dc8af2..58bc53b14 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -43,6 +43,10 @@ body.rtl {
left: 10px;
}
+ .columns-area {
+ direction: rtl;
+ }
+
.column-header__buttons {
left: 0;
right: auto;
@@ -180,7 +184,6 @@ body.rtl {
}
.fa-ul {
- margin-left: 0;
margin-left: 2.14285714em;
}
diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss
index 63eeffe25..19ce0ab8f 100644
--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@@ -4,6 +4,10 @@
overflow: hidden;
margin-bottom: 10px;
+ &--under-tabs {
+ border-radius: 0 0 4px 4px;
+ }
+
@media screen and (max-width: $no-gap-breakpoint) {
margin-bottom: 0;
border-radius: 0;
@@ -89,40 +93,21 @@
height: auto;
vertical-align: middle;
margin-right: 5px;
-
- path:first-child {
- fill: $primary-text-color;
- }
-
- path:last-child {
- fill: $ui-highlight-color;
- }
+ fill: $primary-text-color;
}
&:active,
&:focus,
&:hover {
background: lighten($ui-highlight-color, 10%);
-
- svg path:last-child {
- fill: lighten($ui-highlight-color, 10%);
- }
}
&:disabled,
&.disabled {
- svg path:last-child {
- fill: $ui-primary-color;
- }
-
&:active,
&:focus,
&:hover {
background: $ui-primary-color;
-
- svg path:last-child {
- fill: $ui-primary-color;
- }
}
}
@@ -131,10 +116,6 @@
&:focus,
&:hover {
background: $error-red;
-
- svg path:last-child {
- fill: $error-red;
- }
}
}
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 54b175613..66b5763a9 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -143,7 +143,7 @@ class ActivityPub::Activity
# If the boosted toot is embedded and it is a self-boost, handle it like a Create
unless unsupported_object_type?
- actor_id = value_or_id(first_of_value(@object['attributedTo'])) || @account.uri
+ actor_id = value_or_id(first_of_value(@object['attributedTo']))
if actor_id == @account.uri
return ActivityPub::Activity.factory({ 'type' => 'Create', 'actor' => actor_id, 'object' => @object }, @account).perform
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index fc0c8224d..dc9837caf 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -234,7 +234,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
@account.polls.new(
multiple: multiple,
expires_at: expires_at,
- options: items.map { |item| item['name'].presence || item['content'] },
+ options: items.map { |item| item['name'].presence || item['content'] }.compact,
cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 }
)
end
@@ -267,7 +267,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
def conversation_from_uri(uri)
return nil if uri.nil?
return Conversation.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')) if OStatus::TagManager.instance.local_id?(uri)
- Conversation.find_by(uri: uri) || Conversation.create(uri: uri)
+ begin
+ Conversation.find_or_create_by!(uri: uri)
+ rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+ retry
+ end
end
def visibility_from_audience
@@ -366,7 +370,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
def unsupported_media_type?(mime_type)
- mime_type.present? && !(MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES).include?(mime_type)
+ mime_type.present? && !MediaAttachment.supported_mime_types.include?(mime_type)
end
def supported_blurhash?(blurhash)
@@ -376,7 +380,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
def skip_download?
return @skip_download if defined?(@skip_download)
- @skip_download ||= DomainBlock.find_by(domain: @account.domain)&.reject_media?
+ @skip_download ||= DomainBlock.reject_media?(@account.domain)
end
def reply_to_local?
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index 4236af071..0eb14b89c 100644
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -45,7 +45,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
rebloggers_ids = @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)
inboxes = Account.where(id: ::Follow.where(target_account_id: rebloggers_ids).select(:account_id)).inboxes - [@account.preferred_inbox_url]
- ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
+ ActivityPub::LowPriorityDeliveryWorker.push_bulk(inboxes) do |inbox_url|
[payload, rebloggers_ids.first, inbox_url]
end
end
@@ -61,7 +61,12 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
def forward_for_reply
return unless @json['signature'].present? && reply_to_local?
- ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url])
+
+ inboxes = replied_to_status.account.followers.inboxes - [@account.preferred_inbox_url]
+
+ ActivityPub::LowPriorityDeliveryWorker.push_bulk(inboxes) do |inbox_url|
+ [payload, replied_to_status.account_id, inbox_url]
+ end
end
def delete_now!
diff --git a/app/lib/activitypub/activity/flag.rb b/app/lib/activitypub/activity/flag.rb
index f73b93058..1659bc61f 100644
--- a/app/lib/activitypub/activity/flag.rb
+++ b/app/lib/activitypub/activity/flag.rb
@@ -23,7 +23,7 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
private
def skip_reports?
- DomainBlock.find_by(domain: @account.domain)&.reject_reports?
+ DomainBlock.reject_reports?(@account.domain)
end
def object_uris
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb
index 1e805c0d1..3eb88339a 100644
--- a/app/lib/activitypub/activity/follow.rb
+++ b/app/lib/activitypub/activity/follow.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class ActivityPub::Activity::Follow < ActivityPub::Activity
+ include Payloadable
+
def perform
target_account = account_from_uri(object_uri)
@@ -28,7 +30,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
end
def reject_follow_request!(target_account)
- json = ActiveModelSerializers::SerializableResource.new(FollowRequest.new(account: @account, target_account: target_account, uri: @json['id']), serializer: ActivityPub::RejectFollowSerializer, adapter: ActivityPub::Adapter).to_json
+ json = Oj.dump(serialize_payload(FollowRequest.new(account: @account, target_account: target_account, uri: @json['id']), ActivityPub::RejectFollowSerializer))
ActivityPub::DeliveryWorker.perform_async(json, target_account.id, @account.inbox_url)
end
end
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 892bb9974..595291342 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -65,7 +65,14 @@ class ActivityPub::TagManager
when 'unlisted', 'private'
[account_followers_url(status.account)]
when 'direct', 'limited'
- status.active_mentions.map { |mention| uri_for(mention.account) }
+ if status.account.silenced?
+ # Only notify followers if the account is locally silenced
+ account_ids = status.active_mentions.pluck(:account_id)
+ to = status.account.followers.where(id: account_ids).map { |account| uri_for(account) }
+ to.concat(FollowRequest.where(target_account_id: status.account_id, account_id: account_ids).map { |request| uri_for(request.account) })
+ else
+ status.active_mentions.map { |mention| uri_for(mention.account) }
+ end
end
end
@@ -86,7 +93,16 @@ class ActivityPub::TagManager
cc << COLLECTIONS[:public]
end
- cc.concat(status.active_mentions.map { |mention| uri_for(mention.account) }) unless status.direct_visibility? || status.limited_visibility?
+ unless status.direct_visibility? || status.limited_visibility?
+ if status.account.silenced?
+ # Only notify followers if the account is locally silenced
+ account_ids = status.active_mentions.pluck(:account_id)
+ cc.concat(status.account.followers.where(id: account_ids).map { |account| uri_for(account) })
+ cc.concat(FollowRequest.where(target_account_id: status.account_id, account_id: account_ids).map { |request| uri_for(request.account) })
+ else
+ cc.concat(status.active_mentions.map { |mention| uri_for(mention.account) })
+ end
+ end
cc
end
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 59dfc9004..8a1aad41a 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -187,7 +187,7 @@ class Formatter
end
def rewrite(text, entities)
- chars = text.to_s.to_char_a
+ text = text.to_s
# Sort by start index
entities = entities.sort_by do |entity|
@@ -199,12 +199,12 @@ class Formatter
last_index = entities.reduce(0) do |index, entity|
indices = entity.respond_to?(:indices) ? entity.indices : entity[:indices]
- result << encode(chars[index...indices.first].join)
+ result << encode(text[index...indices.first])
result << yield(entity)
indices.last
end
- result << encode(chars[last_index..-1].join)
+ result << encode(text[last_index..-1])
result.flatten.join
end
@@ -231,23 +231,14 @@ class Formatter
# Note: I couldn't obtain list_slug with @user/list-name format
# for mention so this requires additional check
special = Extractor.extract_urls_with_indices(escaped, options).map do |extract|
- # exactly one of :url, :hashtag, :screen_name, :cashtag keys is present
- key = (extract.keys & [:url, :hashtag, :screen_name, :cashtag]).first
-
new_indices = [
old_to_new_index.find_index(extract[:indices].first),
old_to_new_index.find_index(extract[:indices].last),
]
- has_prefix_char = [:hashtag, :screen_name, :cashtag].include?(key)
- value_indices = [
- new_indices.first + (has_prefix_char ? 1 : 0), # account for #, @ or $
- new_indices.last - 1,
- ]
-
next extract.merge(
- :indices => new_indices,
- key => text[value_indices.first..value_indices.last]
+ indices: new_indices,
+ url: text[new_indices.first..new_indices.last - 1]
)
end
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb
index 3840c8fbf..60de712db 100644
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@@ -148,7 +148,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
end
def save_media
- do_not_download = DomainBlock.find_by(domain: @account.domain)&.reject_media?
+ do_not_download = DomainBlock.reject_media?(@account.domain)
media_attachments = []
@xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: OStatus::TagManager::XMLNS).each do |link|
@@ -176,7 +176,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
end
def save_emojis(parent)
- do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
+ do_not_download = DomainBlock.reject_media?(parent.account.domain)
return if do_not_download
diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
index 1bba4a5a6..e82a2a33a 100644
--- a/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@ -19,6 +19,20 @@ class Sanitize
node['class'] = class_list.join(' ')
end
+ UNSUPPORTED_ELEMENTS_TRANSFORMER = lambda do |env|
+ return unless %w(h1 h2 h3 h4 h5 h6 blockquote pre ul ol li).include?(env[:node_name])
+
+ case env[:node_name]
+ when 'li'
+ env[:node].traverse do |node|
+ node.add_next_sibling(' ') if node.next_sibling
+ node.replace(node.children) unless node.text?
+ end
+ else
+ env[:node].name = 'p'
+ end
+ end
+
MASTODON_STRICT ||= freeze_config(
elements: %w(p br span a),
@@ -40,6 +54,7 @@ class Sanitize
transformers: [
CLASS_WHITELIST_TRANSFORMER,
+ UNSUPPORTED_ELEMENTS_TRANSFORMER,
]
)
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index daeb3d936..bf2e5a962 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -33,6 +33,7 @@ class UserSettingsDecorator
user.settings['hide_network'] = hide_network_preference if change?('setting_hide_network')
user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
user.settings['show_application'] = show_application_preference if change?('setting_show_application')
+ user.settings['advanced_layout'] = advanced_layout_preference if change?('setting_advanced_layout')
end
def merged_notification_emails
@@ -107,6 +108,10 @@ class UserSettingsDecorator
boolean_cast_setting 'setting_aggregate_reblogs'
end
+ def advanced_layout_preference
+ boolean_cast_setting 'setting_advanced_layout'
+ end
+
def boolean_cast_setting(key)
ActiveModel::Type::Boolean.new.cast(settings[key])
end
diff --git a/app/models/account.rb b/app/models/account.rb
index 51e01246e..c588451fc 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -28,8 +28,6 @@
# header_updated_at :datetime
# avatar_remote_url :string
# subscription_expires_at :datetime
-# silenced :boolean default(FALSE), not null
-# suspended :boolean default(FALSE), not null
# locked :boolean default(FALSE), not null
# header_remote_url :string default(""), not null
# last_webfingered_at :datetime
@@ -45,6 +43,8 @@
# actor_type :string
# discoverable :boolean
# also_known_as :string is an Array
+# silenced_at :datetime
+# suspended_at :datetime
#
class Account < ApplicationRecord
@@ -75,17 +75,17 @@ class Account < ApplicationRecord
validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
- validates :note, note_length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
+ validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
scope :remote, -> { where.not(domain: nil) }
scope :local, -> { where(domain: nil) }
scope :expiring, ->(time) { remote.where.not(subscription_expires_at: nil).where('subscription_expires_at < ?', time) }
scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
- scope :silenced, -> { where(silenced: true) }
- scope :suspended, -> { where(suspended: true) }
- scope :without_suspended, -> { where(suspended: false) }
- scope :without_silenced, -> { where(silenced: false) }
+ scope :silenced, -> { where.not(silenced_at: nil) }
+ scope :suspended, -> { where.not(suspended_at: nil) }
+ scope :without_suspended, -> { where(suspended_at: nil) }
+ scope :without_silenced, -> { where(silenced_at: nil) }
scope :recent, -> { reorder(id: :desc) }
scope :bots, -> { where(actor_type: %w(Application Service)) }
scope :alphabetic, -> { order(domain: :asc, username: :asc) }
@@ -98,6 +98,7 @@ class Account < ApplicationRecord
scope :tagged_with, ->(tag) { joins(:accounts_tags).where(accounts_tags: { tag_id: tag }) }
scope :by_recent_status, -> { order(Arel.sql('(case when account_stats.last_status_at is null then 1 else 0 end) asc, account_stats.last_status_at desc')) }
scope :popular, -> { order('account_stats.followers_count desc') }
+ scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) }
delegate :email,
:unconfirmed_email,
@@ -106,6 +107,8 @@ class Account < ApplicationRecord
:confirmed?,
:approved?,
:pending?,
+ :disabled?,
+ :role,
:admin?,
:moderator?,
:staff?,
@@ -165,25 +168,35 @@ class Account < ApplicationRecord
ResolveAccountService.new.call(acct)
end
- def silence!
- update!(silenced: true)
+ def silenced?
+ silenced_at.present?
+ end
+
+ def silence!(date = nil)
+ date ||= Time.now.utc
+ update!(silenced_at: date)
end
def unsilence!
- update!(silenced: false)
+ update!(silenced_at: nil)
end
- def suspend!
+ def suspended?
+ suspended_at.present?
+ end
+
+ def suspend!(date = nil)
+ date ||= Time.now.utc
transaction do
user&.disable! if local?
- update!(suspended: true)
+ update!(suspended_at: date)
end
end
def unsuspend!
transaction do
user&.enable! if local?
- update!(suspended: false)
+ update!(suspended_at: nil)
end
end
@@ -194,6 +207,10 @@ class Account < ApplicationRecord
end
end
+ def sign?
+ true
+ end
+
def keypair
@keypair ||= OpenSSL::PKey::RSA.new(private_key || public_key)
end
@@ -399,7 +416,7 @@ class Account < ApplicationRecord
ts_rank_cd(#{textsearch}, #{query}, 32) AS rank
FROM accounts
WHERE #{query} @@ #{textsearch}
- AND accounts.suspended = false
+ AND accounts.suspended_at IS NULL
AND accounts.moved_to_account_id IS NULL
ORDER BY rank DESC
LIMIT ? OFFSET ?
@@ -427,7 +444,7 @@ class Account < ApplicationRecord
LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?) OR (accounts.id = f.target_account_id AND f.account_id = ?)
WHERE accounts.id IN (SELECT * FROM first_degree)
AND #{query} @@ #{textsearch}
- AND accounts.suspended = false
+ AND accounts.suspended_at IS NULL
AND accounts.moved_to_account_id IS NULL
GROUP BY accounts.id
ORDER BY rank DESC
@@ -443,7 +460,7 @@ class Account < ApplicationRecord
FROM accounts
LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?) OR (accounts.id = f.target_account_id AND f.account_id = ?)
WHERE #{query} @@ #{textsearch}
- AND accounts.suspended = false
+ AND accounts.suspended_at IS NULL
AND accounts.moved_to_account_id IS NULL
GROUP BY accounts.id
ORDER BY rank DESC
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index d2503100c..c3b1fe08d 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -37,6 +37,8 @@ class AccountFilter
Account.without_suspended
when 'pending'
accounts_with_users.merge User.pending
+ when 'disabled'
+ accounts_with_users.merge User.disabled
when 'silenced'
Account.silenced
when 'suspended'
diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb
index 0ac49cc12..ccd7bfa12 100644
--- a/app/models/concerns/account_finder_concern.rb
+++ b/app/models/concerns/account_finder_concern.rb
@@ -13,7 +13,7 @@ module AccountFinderConcern
end
def representative
- find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')) || Account.local.find_by(suspended: false)
+ find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')) || Account.local.without_suspended.first
end
def find_local(username)
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index de4cf8775..24f5968de 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'mime/types'
+require 'mime/types/columnar'
module Attachmentable
extend ActiveSupport::Concern
@@ -10,10 +10,21 @@ module Attachmentable
included do
before_post_process :set_file_extensions
before_post_process :check_image_dimensions
+ before_post_process :set_file_content_type
end
private
+ def set_file_content_type
+ self.class.attachment_definitions.each_key do |attachment_name|
+ attachment = send(attachment_name)
+
+ next if attachment.blank? || attachment.queued_for_write[:original].blank?
+
+ attachment.instance_write :content_type, calculated_content_type(attachment)
+ end
+ end
+
def set_file_extensions
self.class.attachment_definitions.each_key do |attachment_name|
attachment = send(attachment_name)
@@ -47,4 +58,10 @@ module Attachmentable
extension
end
+
+ def calculated_content_type(attachment)
+ Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp
+ rescue Terrapin::CommandLineError
+ ''
+ end
end
diff --git a/app/models/concerns/user_roles.rb b/app/models/concerns/user_roles.rb
index 58dffdc46..a42b4a172 100644
--- a/app/models/concerns/user_roles.rb
+++ b/app/models/concerns/user_roles.rb
@@ -13,6 +13,20 @@ module UserRoles
admin? || moderator?
end
+ def role=(value)
+ case value
+ when 'admin'
+ self.admin = true
+ self.moderator = false
+ when 'moderator'
+ self.admin = false
+ self.moderator = true
+ else
+ self.admin = false
+ self.moderator = false
+ end
+ end
+
def role
if admin?
'admin'
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index d3cc70504..e73cd9bd2 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -39,6 +39,7 @@ class CustomEmoji < ApplicationRecord
scope :local, -> { where(domain: nil) }
scope :remote, -> { where.not(domain: nil) }
scope :alphabetic, -> { order(domain: :asc, shortcode: :asc) }
+ scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) }
remotable_attachment :image, LIMIT
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 0b12617c6..25d3b87ef 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -17,8 +17,6 @@ class DomainBlock < ApplicationRecord
enum severity: [:silence, :suspend, :noop]
- attr_accessor :retroactive
-
validates :domain, presence: true, uniqueness: true
has_many :accounts, foreign_key: :domain, primary_key: :domain
@@ -26,14 +24,46 @@ class DomainBlock < ApplicationRecord
scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
- def self.blocked?(domain)
- where(domain: domain, severity: :suspend).exists?
+ class << self
+ def suspend?(domain)
+ !!rule_for(domain)&.suspend?
+ end
+
+ def silence?(domain)
+ !!rule_for(domain)&.silence?
+ end
+
+ def reject_media?(domain)
+ !!rule_for(domain)&.reject_media?
+ end
+
+ def reject_reports?(domain)
+ !!rule_for(domain)&.reject_reports?
+ end
+
+ alias blocked? suspend?
+
+ def rule_for(domain)
+ return if domain.blank?
+
+ uri = Addressable::URI.new.tap { |u| u.host = domain.gsub(/[\/]/, '') }
+ segments = uri.normalized_host.split('.')
+ variants = segments.map.with_index { |_, i| segments[i..-1].join('.') }
+
+ where(domain: variants[0..-2]).order(Arel.sql('char_length(domain) desc')).first
+ end
end
def stricter_than?(other_block)
- return true if suspend?
+ return true if suspend?
return false if other_block.suspend? && (silence? || noop?)
return false if other_block.silence? && noop?
+
(reject_media || !other_block.reject_media) && (reject_reports || !other_block.reject_reports)
end
+
+ def affected_accounts_count
+ scope = suspend? ? accounts.where(suspended_at: created_at) : accounts.where(silenced_at: created_at)
+ scope.count
+ end
end
diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb
index 5bc44e809..f1b7a4566 100644
--- a/app/models/form/account_batch.rb
+++ b/app/models/form/account_batch.rb
@@ -3,6 +3,7 @@
class Form::AccountBatch
include ActiveModel::Model
include Authorization
+ include Payloadable
attr_accessor :account_ids, :action, :current_account
@@ -54,13 +55,7 @@ class Form::AccountBatch
return unless follow.account.activitypub?
- json = ActiveModelSerializers::SerializableResource.new(
- follow,
- serializer: ActivityPub::RejectFollowSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
-
- ActivityPub::DeliveryWorker.perform_async(json, current_account.id, follow.account.inbox_url)
+ ActivityPub::DeliveryWorker.perform_async(Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), current_account.id, follow.account.inbox_url)
end
def approve!
diff --git a/app/models/form/status_batch.rb b/app/models/form/status_batch.rb
index 898728067..933dfdaca 100644
--- a/app/models/form/status_batch.rb
+++ b/app/models/form/status_batch.rb
@@ -35,6 +35,7 @@ class Form::StatusBatch
def delete_statuses
Status.where(id: status_ids).reorder(nil).find_each do |status|
RemovalWorker.perform_async(status.id)
+ Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true)
log_action :destroy, status
end
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 7bf000d40..797a191e0 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -8,15 +8,11 @@ class Instance
def initialize(resource)
@domain = resource.domain
@accounts_count = resource.is_a?(DomainBlock) ? nil : resource.accounts_count
- @domain_block = resource.is_a?(DomainBlock) ? resource : DomainBlock.find_by(domain: domain)
+ @domain_block = resource.is_a?(DomainBlock) ? resource : DomainBlock.rule_for(domain)
end
- def cached_sample_accounts
- Rails.cache.fetch("#{cache_key}/sample_accounts", expires_in: 12.hours) { Account.where(domain: domain).searchable.joins(:account_stat).popular.limit(3) }
- end
-
- def cached_accounts_count
- @accounts_count || Rails.cache.fetch("#{cache_key}/count", expires_in: 12.hours) { Account.where(domain: domain).count }
+ def countable?
+ @accounts_count.present?
end
def to_param
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index ab794faa0..30d9a9851 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -24,14 +24,16 @@
class MediaAttachment < ApplicationRecord
self.inheritance_column = nil
- enum type: [:image, :gifv, :video, :unknown]
+ enum type: [:image, :gifv, :video, :unknown, :audio]
IMAGE_FILE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif', '.webp'].freeze
VIDEO_FILE_EXTENSIONS = ['.webm', '.mp4', '.m4v', '.mov'].freeze
+ AUDIO_FILE_EXTENSIONS = ['.ogg', '.oga', '.mp3', '.wav', '.flac', '.opus'].freeze
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
- VIDEO_MIME_TYPES = ['video/webm', 'video/mp4', 'video/quicktime'].freeze
+ VIDEO_MIME_TYPES = ['video/webm', 'video/mp4', 'video/quicktime', 'video/ogg'].freeze
VIDEO_CONVERTIBLE_MIME_TYPES = ['video/webm', 'video/quicktime'].freeze
+ AUDIO_MIME_TYPES = ['audio/wave', 'audio/wav', 'audio/x-wav', 'audio/x-pn-wave', 'audio/ogg', 'audio/mpeg', 'audio/mp3', 'audio/webm', 'audio/flac'].freeze
BLURHASH_OPTIONS = {
x_comp: 4,
@@ -65,8 +67,21 @@ class MediaAttachment < ApplicationRecord
},
}.freeze
+ AUDIO_STYLES = {
+ original: {
+ format: 'mp3',
+ content_type: 'audio/mpeg',
+ convert_options: {
+ output: {
+ 'q:a' => 2,
+ },
+ },
+ },
+ }.freeze
+
VIDEO_FORMAT = {
format: 'mp4',
+ content_type: 'video/mp4',
convert_options: {
output: {
'loglevel' => 'fatal',
@@ -83,6 +98,11 @@ class MediaAttachment < ApplicationRecord
},
}.freeze
+ VIDEO_CONVERTED_STYLES = {
+ small: VIDEO_STYLES[:small],
+ original: VIDEO_FORMAT,
+ }.freeze
+
IMAGE_LIMIT = 8.megabytes
VIDEO_LIMIT = 40.megabytes
@@ -95,9 +115,9 @@ class MediaAttachment < ApplicationRecord
processors: ->(f) { file_processors f },
convert_options: { all: '-quality 90 -strip' }
- validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES
- validates_attachment_size :file, less_than: IMAGE_LIMIT, unless: :video_or_gifv?
- validates_attachment_size :file, less_than: VIDEO_LIMIT, if: :video_or_gifv?
+ validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES + AUDIO_MIME_TYPES
+ validates_attachment_size :file, less_than: IMAGE_LIMIT, unless: :larger_media_format?
+ validates_attachment_size :file, less_than: VIDEO_LIMIT, if: :larger_media_format?
remotable_attachment :file, VIDEO_LIMIT
include Attachmentable
@@ -120,8 +140,12 @@ class MediaAttachment < ApplicationRecord
file.blank? && remote_url.present?
end
- def video_or_gifv?
- video? || gifv?
+ def larger_media_format?
+ video? || gifv? || audio?
+ end
+
+ def audio_or_video?
+ audio? || video?
end
def to_param
@@ -153,33 +177,37 @@ class MediaAttachment < ApplicationRecord
before_save :set_meta
class << self
+ def supported_mime_types
+ IMAGE_MIME_TYPES + VIDEO_MIME_TYPES + AUDIO_MIME_TYPES
+ end
+
+ def supported_file_extensions
+ IMAGE_FILE_EXTENSIONS + VIDEO_FILE_EXTENSIONS + AUDIO_FILE_EXTENSIONS
+ end
+
private
def file_styles(f)
- if f.instance.file_content_type == 'image/gif'
- {
- small: IMAGE_STYLES[:small],
- original: VIDEO_FORMAT,
- }
- elsif IMAGE_MIME_TYPES.include? f.instance.file_content_type
+ if f.instance.file_content_type == 'image/gif' || VIDEO_CONVERTIBLE_MIME_TYPES.include?(f.instance.file_content_type)
+ VIDEO_CONVERTED_STYLES
+ elsif IMAGE_MIME_TYPES.include?(f.instance.file_content_type)
IMAGE_STYLES
- elsif VIDEO_CONVERTIBLE_MIME_TYPES.include?(f.instance.file_content_type)
- {
- small: VIDEO_STYLES[:small],
- original: VIDEO_FORMAT,
- }
- else
+ elsif VIDEO_MIME_TYPES.include?(f.instance.file_content_type)
VIDEO_STYLES
+ else
+ AUDIO_STYLES
end
end
def file_processors(f)
if f.file_content_type == 'image/gif'
[:gif_transcoder, :blurhash_transcoder]
- elsif VIDEO_MIME_TYPES.include? f.file_content_type
- [:video_transcoder, :blurhash_transcoder]
+ elsif VIDEO_MIME_TYPES.include?(f.file_content_type)
+ [:video_transcoder, :blurhash_transcoder, :type_corrector]
+ elsif AUDIO_MIME_TYPES.include?(f.file_content_type)
+ [:transcoder, :type_corrector]
else
- [:lazy_thumbnail, :blurhash_transcoder]
+ [:lazy_thumbnail, :blurhash_transcoder, :type_corrector]
end
end
end
@@ -202,7 +230,15 @@ class MediaAttachment < ApplicationRecord
end
def set_type_and_extension
- self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
+ self.type = begin
+ if VIDEO_MIME_TYPES.include?(file_content_type)
+ :video
+ elsif AUDIO_MIME_TYPES.include?(file_content_type)
+ :audio
+ else
+ :image
+ end
+ end
end
def set_meta
@@ -245,7 +281,7 @@ class MediaAttachment < ApplicationRecord
frame_rate: movie.frame_rate,
duration: movie.duration,
bitrate: movie.bitrate,
- }
+ }.compact
end
def reset_parent_cache
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 300269e24..498673ff1 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -41,9 +41,13 @@ class Notification < ApplicationRecord
validates :account_id, uniqueness: { scope: [:activity_type, :activity_id] }
validates :activity_type, inclusion: { in: TYPE_CLASS_MAP.values }
- scope :browserable, ->(exclude_types = []) {
+ scope :browserable, ->(exclude_types = [], account_id = nil) {
types = TYPE_CLASS_MAP.values - activity_types_from_types(exclude_types + [:follow_request])
- where(activity_type: types)
+ if account_id.nil?
+ where(activity_type: types)
+ else
+ where(activity_type: types, from_account_id: account_id)
+ end
}
cache_associated :from_account, status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account, poll: [status: STATUS_INCLUDES]
diff --git a/app/models/report.rb b/app/models/report.rb
index 86c303798..5192ceef7 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -17,6 +17,8 @@
#
class Report < ApplicationRecord
+ include Paginable
+
belongs_to :account
belongs_to :target_account, class_name: 'Account'
belongs_to :action_taken_by_account, class_name: 'Account', optional: true
@@ -26,6 +28,7 @@ class Report < ApplicationRecord
scope :unresolved, -> { where(action_taken: false) }
scope :resolved, -> { where(action_taken: true) }
+ scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].each_with_object({}) { |k, h| h[k] = { user: [:invite_request, :invite] } }) }
validates :comment, length: { maximum: 1000 }
diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb
index 56ab28df7..a392d60c3 100644
--- a/app/models/report_filter.rb
+++ b/app/models/report_filter.rb
@@ -9,9 +9,11 @@ class ReportFilter
def results
scope = Report.unresolved
+
params.each do |key, value|
scope = scope.merge scope_for(key, value)
end
+
scope
end
diff --git a/app/models/status.rb b/app/models/status.rb
index 8d31fd382..fb9bbc9a9 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -84,8 +84,8 @@ class Status < ApplicationRecord
scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') }
scope :with_public_visibility, -> { where(visibility: :public) }
scope :tagged_with, ->(tag) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag }) }
- scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: false }) }
- scope :including_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: true }) }
+ scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced_at: nil }) }
+ scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) }
scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
scope :tagged_with_all, ->(tags) {
@@ -204,6 +204,8 @@ class Status < ApplicationRecord
public_visibility? || unlisted_visibility?
end
+ alias sign? distributable?
+
def with_media?
media_attachments.any?
end
@@ -497,7 +499,7 @@ class Status < ApplicationRecord
return if direct_visibility?
account&.increment_count!(:statuses_count)
- reblog&.increment_count!(:reblogs_count) if reblog? && (public_visibility? || unlisted_visibility?)
+ reblog&.increment_count!(:reblogs_count) if reblog?
thread&.increment_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?)
end
@@ -505,7 +507,7 @@ class Status < ApplicationRecord
return if direct_visibility? || marked_for_mass_destruction?
account&.decrement_count!(:statuses_count)
- reblog&.decrement_count!(:reblogs_count) if reblog? && (public_visibility? || unlisted_visibility?)
+ reblog&.decrement_count!(:reblogs_count) if reblog?
thread&.decrement_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?)
end
diff --git a/app/models/tombstone.rb b/app/models/tombstone.rb
index 997bb65fd..bf666c43a 100644
--- a/app/models/tombstone.rb
+++ b/app/models/tombstone.rb
@@ -4,11 +4,12 @@
#
# Table name: tombstones
#
-# id :bigint(8) not null, primary key
-# account_id :bigint(8)
-# uri :string not null
-# created_at :datetime not null
-# updated_at :datetime not null
+# id :bigint(8) not null, primary key
+# account_id :bigint(8)
+# uri :string not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# by_moderator :boolean
#
class Tombstone < ApplicationRecord
diff --git a/app/models/user.rb b/app/models/user.rb
index bce28aa5f..50873dd01 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -87,8 +87,9 @@ class User < ApplicationRecord
scope :approved, -> { where(approved: true) }
scope :confirmed, -> { where.not(confirmed_at: nil) }
scope :enabled, -> { where(disabled: false) }
+ scope :disabled, -> { where(disabled: true) }
scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) }
- scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended: false }) }
+ scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) }
@@ -104,7 +105,8 @@ class User < ApplicationRecord
delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
:reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :hide_network,
- :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, to: :settings, prefix: :setting, allow_nil: false
+ :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
+ :advanced_layout, to: :settings, prefix: :setting, allow_nil: false
attr_reader :invite_code
attr_writer :external
@@ -114,6 +116,10 @@ class User < ApplicationRecord
end
def invited?
+ invite_id.present?
+ end
+
+ def valid_invitation?
invite_id.present? && invite.valid_for_use?
end
@@ -274,7 +280,7 @@ class User < ApplicationRecord
private
def set_approved
- self.approved = open_registrations? || invited? || external?
+ self.approved = open_registrations? || valid_invitation? || external?
end
def open_registrations?
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 0c9fc625f..8daf36e0a 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -31,6 +31,7 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:display_media] = object.current_account.user.setting_display_media
store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers
store[:reduce_motion] = object.current_account.user.setting_reduce_motion
+ store[:advanced_layout] = object.current_account.user.setting_advanced_layout
store[:is_staff] = object.current_account.user.staff?
end
@@ -59,7 +60,7 @@ class InitialStateSerializer < ActiveModel::Serializer
end
def media_attachments
- { accept_content_types: MediaAttachment::IMAGE_FILE_EXTENSIONS + MediaAttachment::VIDEO_FILE_EXTENSIONS + MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES }
+ { accept_content_types: MediaAttachment.supported_file_extensions + MediaAttachment.supported_mime_types }
end
private
diff --git a/app/serializers/rest/admin/account_serializer.rb b/app/serializers/rest/admin/account_serializer.rb
new file mode 100644
index 000000000..f579d3302
--- /dev/null
+++ b/app/serializers/rest/admin/account_serializer.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class REST::Admin::AccountSerializer < ActiveModel::Serializer
+ attributes :id, :username, :domain, :created_at,
+ :email, :ip, :role, :confirmed, :suspended,
+ :silenced, :disabled, :approved, :locale,
+ :invite_request
+
+ attribute :created_by_application_id, if: :created_by_application?
+ attribute :invited_by_account_id, if: :invited?
+
+ has_one :account, serializer: REST::AccountSerializer
+
+ def id
+ object.id.to_s
+ end
+
+ def email
+ object.user_email
+ end
+
+ def ip
+ object.user_current_sign_in_ip.to_s.presence
+ end
+
+ def role
+ object.user_role
+ end
+
+ def suspended
+ object.suspended?
+ end
+
+ def silenced
+ object.silenced?
+ end
+
+ def confirmed
+ object.user_confirmed?
+ end
+
+ def disabled
+ object.user_disabled?
+ end
+
+ def approved
+ object.user_approved?
+ end
+
+ def account
+ object
+ end
+
+ def locale
+ object.user_locale
+ end
+
+ def created_by_application_id
+ object.user&.created_by_application_id&.to_s&.presence
+ end
+
+ def invite_request
+ object.user&.invite_request&.text
+ end
+
+ def invited_by_account_id
+ object.user&.invite&.user&.account_id&.to_s&.presence
+ end
+
+ def invited?
+ object.user&.invited?
+ end
+
+ def created_by_application?
+ object.user&.created_by_application_id&.present?
+ end
+end
diff --git a/app/serializers/rest/admin/report_serializer.rb b/app/serializers/rest/admin/report_serializer.rb
new file mode 100644
index 000000000..7a77132c0
--- /dev/null
+++ b/app/serializers/rest/admin/report_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::Admin::ReportSerializer < ActiveModel::Serializer
+ attributes :id, :action_taken, :comment, :created_at, :updated_at
+
+ has_one :account, serializer: REST::Admin::AccountSerializer
+ has_one :target_account, serializer: REST::Admin::AccountSerializer
+ has_one :assigned_account, serializer: REST::Admin::AccountSerializer
+ has_one :action_taken_by_account, serializer: REST::Admin::AccountSerializer
+
+ has_many :statuses, serializer: REST::StatusSerializer
+
+ def id
+ object.id.to_s
+ end
+end
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index a82eff195..1bd71683c 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -3,9 +3,9 @@
class REST::InstanceSerializer < ActiveModel::Serializer
include RoutingHelper
- attributes :uri, :title, :description, :email,
+ attributes :uri, :title, :short_description, :description, :email,
:version, :urls, :stats, :thumbnail,
- :languages, :registrations
+ :languages, :registrations, :approval_required
has_one :contact_account, serializer: REST::AccountSerializer
@@ -19,6 +19,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
Setting.site_title
end
+ def short_description
+ Setting.site_short_description
+ end
+
def description
Setting.site_description
end
@@ -55,6 +59,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
end
+ def approval_required
+ Setting.registrations_mode == 'approved'
+ end
+
private
def instance_presenter
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 106777b6e..c9b76cb16 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -3,7 +3,7 @@
class REST::StatusSerializer < ActiveModel::Serializer
attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
:sensitive, :spoiler_text, :visibility, :language,
- :uri, :content, :url, :replies_count, :reblogs_count,
+ :uri, :url, :replies_count, :reblogs_count,
:favourites_count
attribute :favourited, if: :current_user?
@@ -11,6 +11,9 @@ class REST::StatusSerializer < ActiveModel::Serializer
attribute :muted, if: :current_user?
attribute :pinned, if: :pinnable?
+ attribute :content, unless: :source_requested?
+ attribute :text, if: :source_requested?
+
belongs_to :reblog, serializer: REST::StatusSerializer
belongs_to :application, if: :show_application?
belongs_to :account, serializer: REST::AccountSerializer
@@ -105,6 +108,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
%w(public unlisted).include?(object.visibility)
end
+ def source_requested?
+ instance_options[:source_requested]
+ end
+
def ordered_mentions
object.active_mentions.to_a.sort_by(&:id)
end
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 6d0609ca0..05c017bdf 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -50,12 +50,12 @@ class ActivityPub::ProcessAccountService < BaseService
def create_account
@account = Account.new
- @account.protocol = :activitypub
- @account.username = @username
- @account.domain = @domain
- @account.suspended = true if auto_suspend?
- @account.silenced = true if auto_silence?
- @account.private_key = nil
+ @account.protocol = :activitypub
+ @account.username = @username
+ @account.domain = @domain
+ @account.private_key = nil
+ @account.suspended_at = domain_block.created_at if auto_suspend?
+ @account.silenced_at = domain_block.created_at if auto_silence?
end
def update_account
@@ -205,7 +205,7 @@ class ActivityPub::ProcessAccountService < BaseService
def domain_block
return @domain_block if defined?(@domain_block)
- @domain_block = DomainBlock.find_by(domain: @domain)
+ @domain_block = DomainBlock.rule_for(@domain)
end
def key_changed?
diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb
index 180f13403..a87c2e792 100644
--- a/app/services/after_block_domain_from_account_service.rb
+++ b/app/services/after_block_domain_from_account_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class AfterBlockDomainFromAccountService < BaseService
+ include Payloadable
+
# This service does not create an AccountDomainBlock record,
# it's meant to be called after such a record has been created
# synchronously, to "clean up"
@@ -31,12 +33,6 @@ class AfterBlockDomainFromAccountService < BaseService
return unless follow.account.activitypub?
- json = ActiveModelSerializers::SerializableResource.new(
- follow,
- serializer: ActivityPub::RejectFollowSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
-
- ActivityPub::DeliveryWorker.perform_async(json, @account.id, follow.account.inbox_url)
+ ActivityPub::DeliveryWorker.perform_async(Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), @account.id, follow.account.inbox_url)
end
end
diff --git a/app/services/authorize_follow_service.rb b/app/services/authorize_follow_service.rb
index f2e3ebe7d..29b8700c7 100644
--- a/app/services/authorize_follow_service.rb
+++ b/app/services/authorize_follow_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class AuthorizeFollowService < BaseService
+ include Payloadable
+
def call(source_account, target_account, **options)
if options[:skip_follow_request]
follow_request = FollowRequest.new(account: source_account, target_account: target_account, uri: options[:follow_request_uri])
@@ -24,11 +26,7 @@ class AuthorizeFollowService < BaseService
end
def build_json(follow_request)
- ActiveModelSerializers::SerializableResource.new(
- follow_request,
- serializer: ActivityPub::AcceptFollowSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(follow_request, ActivityPub::AcceptFollowSerializer))
end
def build_xml(follow_request)
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index a1fe93665..c6eef04d4 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -29,7 +29,7 @@ class BlockDomainService < BaseService
end
def silence_accounts!
- blocked_domain_accounts.in_batches.update_all(silenced: true)
+ blocked_domain_accounts.without_silenced.in_batches.update_all(silenced_at: @domain_block.created_at)
end
def clear_media!
@@ -43,9 +43,9 @@ class BlockDomainService < BaseService
end
def suspend_accounts!
- blocked_domain_accounts.where(suspended: false).reorder(nil).find_each do |account|
+ blocked_domain_accounts.without_suspended.reorder(nil).find_each do |account|
UnsubscribeService.new.call(account) if account.subscribed?
- SuspendAccountService.new.call(account)
+ SuspendAccountService.new.call(account, suspended_at: @domain_block.created_at)
end
end
@@ -76,7 +76,7 @@ class BlockDomainService < BaseService
end
def blocked_domain_accounts
- Account.where(domain: blocked_domain)
+ Account.by_domain_and_subdomains(blocked_domain)
end
def media_from_blocked_domain
@@ -84,6 +84,6 @@ class BlockDomainService < BaseService
end
def emojis_from_blocked_domains
- CustomEmoji.where(domain: blocked_domain)
+ CustomEmoji.by_domain_and_subdomains(blocked_domain)
end
end
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index 10ed470e0..9050a4858 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class BlockService < BaseService
+ include Payloadable
+
def call(account, target_account)
return if account.id == target_account.id
@@ -26,11 +28,7 @@ class BlockService < BaseService
end
def build_json(block)
- ActiveModelSerializers::SerializableResource.new(
- block,
- serializer: ActivityPub::BlockSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(block, ActivityPub::BlockSerializer))
end
def build_xml(block)
diff --git a/app/services/concerns/payloadable.rb b/app/services/concerns/payloadable.rb
new file mode 100644
index 000000000..13d9c3548
--- /dev/null
+++ b/app/services/concerns/payloadable.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Payloadable
+ def serialize_payload(record, serializer, options = {})
+ signer = options.delete(:signer)
+ sign_with = options.delete(:sign_with)
+ payload = ActiveModelSerializers::SerializableResource.new(record, options.merge(serializer: serializer, adapter: ActivityPub::Adapter)).as_json
+
+ if (record.respond_to?(:sign?) && record.sign?) && signer && signing_enabled?
+ ActivityPub::LinkedDataSignature.new(payload).sign!(signer, sign_with: sign_with)
+ else
+ payload
+ end
+ end
+
+ def signing_enabled?
+ true
+ end
+end
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index b565bcc32..128a24ad6 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -2,6 +2,7 @@
class FavouriteService < BaseService
include Authorization
+ include Payloadable
# Favourite a status and notify remote user
# @param [Account] account
@@ -43,11 +44,7 @@ class FavouriteService < BaseService
end
def build_json(favourite)
- Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
- favourite,
- serializer: ActivityPub::LikeSerializer,
- adapter: ActivityPub::Adapter
- ).as_json).sign!(favourite.account))
+ Oj.dump(serialize_payload(favourite, ActivityPub::LikeSerializer))
end
def build_xml(favourite)
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 92d8c864a..0305e2d62 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -2,6 +2,7 @@
class FollowService < BaseService
include Redisable
+ include Payloadable
# Follow a remote user, notify remote user about the follow
# @param [Account] source_account From which to follow
@@ -78,10 +79,6 @@ class FollowService < BaseService
end
def build_json(follow_request)
- ActiveModelSerializers::SerializableResource.new(
- follow_request,
- serializer: ActivityPub::FollowSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(follow_request, ActivityPub::FollowSerializer))
end
end
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index e7366c7e8..7830aee11 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -49,7 +49,7 @@ class PostStatusService < BaseService
def preprocess_attributes!
@text = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
@visibility = @options[:visibility] || @account.user&.setting_default_privacy
- @visibility = :unlisted if @visibility == :public && @account.silenced
+ @visibility = :unlisted if @visibility == :public && @account.silenced?
@scheduled_at = @options[:scheduled_at]&.to_datetime
@scheduled_at = nil if scheduled_in_the_past?
rescue ArgumentError
@@ -100,7 +100,7 @@ class PostStatusService < BaseService
@media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
- raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:video?)
+ raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?)
end
def language_from_option(str)
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 2595c5fd3..bc607dff3 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -2,6 +2,7 @@
class ProcessMentionsService < BaseService
include StreamEntryRenderer
+ include Payloadable
# Scan status for mentions and fetch remote mentioned users, create
# local mention pointers, send Salmon notifications to mentioned
@@ -25,7 +26,7 @@ class ProcessMentionsService < BaseService
end
end
- next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended
+ next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended?
mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status)
@@ -61,12 +62,7 @@ class ProcessMentionsService < BaseService
def activitypub_json
return @activitypub_json if defined?(@activitypub_json)
- payload = ActiveModelSerializers::SerializableResource.new(
- @status,
- serializer: ActivityPub::ActivitySerializer,
- adapter: ActivityPub::Adapter
- ).as_json
- @activitypub_json = Oj.dump(@status.distributable? ? ActivityPub::LinkedDataSignature.new(payload).sign!(@status.account) : payload)
+ @activitypub_json = Oj.dump(serialize_payload(@status, ActivityPub::ActivitySerializer, signer: @status.account))
end
def resolve_account_service
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index ff48d9c75..9cf4bc128 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -3,6 +3,7 @@
class ReblogService < BaseService
include Authorization
include StreamEntryRenderer
+ include Payloadable
# Reblog a status and notify its remote author
# @param [Account] account Account to reblog from
@@ -18,7 +19,9 @@ class ReblogService < BaseService
return reblog unless reblog.nil?
- reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: options[:visibility] || account.user&.setting_default_privacy)
+ visibility = options[:visibility] || account.user&.setting_default_privacy
+ visibility = reblogged_status.visibility if reblogged_status.hidden?
+ reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility)
DistributionWorker.perform_async(reblog.id)
Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
@@ -51,10 +54,6 @@ class ReblogService < BaseService
end
def build_json(reblog)
- Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
- reblog,
- serializer: ActivityPub::ActivitySerializer,
- adapter: ActivityPub::Adapter
- ).as_json).sign!(reblog.account))
+ Oj.dump(serialize_payload(reblog, ActivityPub::ActivitySerializer, signer: reblog.account))
end
end
diff --git a/app/services/reject_follow_service.rb b/app/services/reject_follow_service.rb
index a91266aa4..f87d0ba91 100644
--- a/app/services/reject_follow_service.rb
+++ b/app/services/reject_follow_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class RejectFollowService < BaseService
+ include Payloadable
+
def call(source_account, target_account)
follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account)
follow_request.reject!
@@ -19,11 +21,7 @@ class RejectFollowService < BaseService
end
def build_json(follow_request)
- ActiveModelSerializers::SerializableResource.new(
- follow_request,
- serializer: ActivityPub::RejectFollowSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(follow_request, ActivityPub::RejectFollowSerializer))
end
def build_xml(follow_request)
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index 747f209f3..81adc5aae 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -3,6 +3,7 @@
class RemoveStatusService < BaseService
include StreamEntryRenderer
include Redisable
+ include Payloadable
def call(status, **options)
@payload = Oj.dump(event: :delete, payload: status.id.to_s)
@@ -115,15 +116,7 @@ class RemoveStatusService < BaseService
end
def signed_activity_json
- @signed_activity_json ||= Oj.dump(ActivityPub::LinkedDataSignature.new(activity_json).sign!(@account))
- end
-
- def activity_json
- @activity_json ||= ActiveModelSerializers::SerializableResource.new(
- @status,
- serializer: @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer,
- adapter: ActivityPub::Adapter
- ).as_json
+ @signed_activity_json ||= Oj.dump(serialize_payload(@status, @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer, signer: @account))
end
def remove_reblogs
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index 73bd6694f..1e955c1e7 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class ReportService < BaseService
+ include Payloadable
+
def call(source_account, target_account, options = {})
@source_account = source_account
@target_account = target_account
@@ -44,12 +46,7 @@ class ReportService < BaseService
end
def payload
- Oj.dump(ActiveModelSerializers::SerializableResource.new(
- @report,
- serializer: ActivityPub::FlagSerializer,
- adapter: ActivityPub::Adapter,
- account: some_local_account
- ).as_json)
+ Oj.dump(serialize_payload(@report, ActivityPub::FlagSerializer, account: some_local_account))
end
def some_local_account
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index 4ff351c5f..57c9ccfe1 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -119,9 +119,9 @@ class ResolveAccountService < BaseService
Rails.logger.debug "Creating new remote account for #{@username}@#{@domain}"
@account = Account.new(username: @username, domain: @domain)
- @account.suspended = true if auto_suspend?
- @account.silenced = true if auto_silence?
- @account.private_key = nil
+ @account.suspended_at = domain_block.created_at if auto_suspend?
+ @account.silenced_at = domain_block.created_at if auto_silence?
+ @account.private_key = nil
end
def update_account
@@ -146,7 +146,7 @@ class ResolveAccountService < BaseService
def domain_block
return @domain_block if defined?(@domain_block)
- @domain_block = DomainBlock.find_by(domain: @domain)
+ @domain_block = DomainBlock.rule_for(@domain)
end
def atom_url
diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb
index 2893b5410..83fd64396 100644
--- a/app/services/subscribe_service.rb
+++ b/app/services/subscribe_service.rb
@@ -43,7 +43,7 @@ class SubscribeService < BaseService
end
def some_local_account
- @some_local_account ||= Account.local.where(suspended: false).first
+ @some_local_account ||= Account.local.without_suspended.first
end
# Any response in the 3xx or 4xx range, except for 429 (rate limit)
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 6c2ecad30..a5ce3dbd9 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class SuspendAccountService < BaseService
+ include Payloadable
+
ASSOCIATIONS_ON_SUSPEND = %w(
account_pins
active_relationships
@@ -88,8 +90,8 @@ class SuspendAccountService < BaseService
return if @options[:destroy]
- @account.silenced = false
- @account.suspended = true
+ @account.silenced_at = nil
+ @account.suspended_at = @options[:suspended_at] || Time.now.utc
@account.locked = false
@account.display_name = ''
@account.note = ''
@@ -118,23 +120,11 @@ class SuspendAccountService < BaseService
end
def delete_actor_json
- return @delete_actor_json if defined?(@delete_actor_json)
-
- payload = ActiveModelSerializers::SerializableResource.new(
- @account,
- serializer: ActivityPub::DeleteActorSerializer,
- adapter: ActivityPub::Adapter
- ).as_json
-
- @delete_actor_json = Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account))
+ @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer, signer: @account))
end
def build_reject_json(follow)
- ActiveModelSerializers::SerializableResource.new(
- follow,
- serializer: ActivityPub::RejectFollowSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer))
end
def delivery_inboxes
diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb
index 946b6d465..fc262a50a 100644
--- a/app/services/unblock_domain_service.rb
+++ b/app/services/unblock_domain_service.rb
@@ -3,9 +3,9 @@
class UnblockDomainService < BaseService
attr_accessor :domain_block
- def call(domain_block, retroactive)
+ def call(domain_block)
@domain_block = domain_block
- process_retroactive_updates if retroactive
+ process_retroactive_updates
domain_block.destroy
end
@@ -14,14 +14,20 @@ class UnblockDomainService < BaseService
end
def blocked_accounts
- Account.where(domain: domain_block.domain)
+ scope = Account.by_domain_and_subdomains(domain_block.domain)
+
+ if domain_block.silence?
+ scope.where(silenced_at: @domain_block.created_at)
+ else
+ scope.where(suspended_at: @domain_block.created_at)
+ end
end
def update_options
- { domain_block_impact => false }
+ { domain_block_impact => nil }
end
def domain_block_impact
- domain_block.silence? ? :silenced : :suspended
+ domain_block.silence? ? :silenced_at : :suspended_at
end
end
diff --git a/app/services/unblock_service.rb b/app/services/unblock_service.rb
index 72fc5ab15..95a858e9f 100644
--- a/app/services/unblock_service.rb
+++ b/app/services/unblock_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class UnblockService < BaseService
+ include Payloadable
+
def call(account, target_account)
return unless account.blocking?(target_account)
@@ -20,11 +22,7 @@ class UnblockService < BaseService
end
def build_json(unblock)
- ActiveModelSerializers::SerializableResource.new(
- unblock,
- serializer: ActivityPub::UndoBlockSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(unblock, ActivityPub::UndoBlockSerializer))
end
def build_xml(block)
diff --git a/app/services/unfavourite_service.rb b/app/services/unfavourite_service.rb
index 2fda11bd6..dcc890b7d 100644
--- a/app/services/unfavourite_service.rb
+++ b/app/services/unfavourite_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class UnfavouriteService < BaseService
+ include Payloadable
+
def call(account, status)
favourite = Favourite.find_by!(account: account, status: status)
favourite.destroy!
@@ -21,11 +23,7 @@ class UnfavouriteService < BaseService
end
def build_json(favourite)
- Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
- favourite,
- serializer: ActivityPub::UndoLikeSerializer,
- adapter: ActivityPub::Adapter
- ).as_json).sign!(favourite.account))
+ Oj.dump(serialize_payload(favourite, ActivityPub::UndoLikeSerializer))
end
def build_xml(favourite)
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index 95da2a667..17dc29735 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class UnfollowService < BaseService
+ include Payloadable
+
# Unfollow and notify the remote user
# @param [Account] source_account Where to unfollow from
# @param [Account] target_account Which to unfollow
@@ -50,19 +52,11 @@ class UnfollowService < BaseService
end
def build_json(follow)
- ActiveModelSerializers::SerializableResource.new(
- follow,
- serializer: ActivityPub::UndoFollowSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(follow, ActivityPub::UndoFollowSerializer))
end
def build_reject_json(follow)
- ActiveModelSerializers::SerializableResource.new(
- follow,
- serializer: ActivityPub::RejectFollowSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer))
end
def build_xml(follow)
diff --git a/app/services/update_remote_profile_service.rb b/app/services/update_remote_profile_service.rb
index 68d36addf..403395a0d 100644
--- a/app/services/update_remote_profile_service.rb
+++ b/app/services/update_remote_profile_service.rb
@@ -26,7 +26,7 @@ class UpdateRemoteProfileService < BaseService
account.note = remote_profile.note || ''
account.locked = remote_profile.locked?
- if !account.suspended? && !DomainBlock.find_by(domain: account.domain)&.reject_media?
+ if !account.suspended? && !DomainBlock.reject_media?(account.domain)
if remote_profile.avatar.present?
account.avatar_remote_url = remote_profile.avatar
else
@@ -46,7 +46,7 @@ class UpdateRemoteProfileService < BaseService
end
def save_emojis
- do_not_download = DomainBlock.find_by(domain: account.domain)&.reject_media?
+ do_not_download = DomainBlock.reject_media?(account.domain)
return if do_not_download
diff --git a/app/services/vote_service.rb b/app/services/vote_service.rb
index 81af9ef3a..0eeb8fd56 100644
--- a/app/services/vote_service.rb
+++ b/app/services/vote_service.rb
@@ -2,6 +2,7 @@
class VoteService < BaseService
include Authorization
+ include Payloadable
def call(account, poll, choices)
authorize_with account, poll, :vote?
@@ -50,10 +51,6 @@ class VoteService < BaseService
end
def build_json(vote)
- ActiveModelSerializers::SerializableResource.new(
- vote,
- serializer: ActivityPub::VoteSerializer,
- adapter: ActivityPub::Adapter
- ).to_json
+ Oj.dump(serialize_payload(vote, ActivityPub::VoteSerializer))
end
end
diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/blacklisted_email_validator.rb
index a288c20ef..0d01a1c47 100644
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@@ -2,7 +2,7 @@
class BlacklistedEmailValidator < ActiveModel::Validator
def validate(user)
- return if user.invited?
+ return if user.valid_invitation?
@email = user.email
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 45e5f0717..f24f4e195 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -8,7 +8,7 @@
.landing
.landing__brand
= link_to root_url, class: 'brand' do
- = image_pack_tag 'logo_full.svg', alt: 'Mastodon'
+ = svg_logo_full
%span.brand__tagline=t 'about.tagline'
.landing__grid
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index e4223119c..950e61847 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -38,7 +38,7 @@
- elsif @statuses.empty?
= nothing_here 'nothing-here--under-tabs'
- else
- .activity-stream
+ .activity-stream.activity-stream--under-tabs
- if params[:page].to_i.zero?
= render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true }
diff --git a/app/views/admin/action_logs/_action_log.html.haml b/app/views/admin/action_logs/_action_log.html.haml
index f059814bd..a545e189e 100644
--- a/app/views/admin/action_logs/_action_log.html.haml
+++ b/app/views/admin/action_logs/_action_log.html.haml
@@ -6,7 +6,7 @@
.log-entry__title
= t("admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}", name: content_tag(:span, action_log.account.username, class: 'username'), target: content_tag(:span, log_target(action_log), class: 'target')).html_safe
.log-entry__timestamp
- %time= l action_log.created_at
+ %time.formatted{ datetime: action_log.created_at.iso8601 }
.spacer
.log-entry__icon
= fa_icon icon_for_log(action_log)
diff --git a/app/views/admin/domain_blocks/show.html.haml b/app/views/admin/domain_blocks/show.html.haml
index ea1929d44..dca4dbac7 100644
--- a/app/views/admin/domain_blocks/show.html.haml
+++ b/app/views/admin/domain_blocks/show.html.haml
@@ -3,18 +3,11 @@
= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :delete do |f|
- - if (@domain_block.noop?)
- = f.input :retroactive,
- as: :hidden,
- input_html: { :value => "0" }
- - else
- = f.input :retroactive,
- as: :boolean,
- wrapper: :with_label,
- label: t(".retroactive.#{@domain_block.severity}"),
- hint: t(:affected_accounts,
- scope: [:admin, :domain_blocks, :show],
- count: @domain_block.accounts_count)
+ - unless (@domain_block.noop?)
+ %p= t(".retroactive.#{@domain_block.severity}")
+ %p.hint= t(:affected_accounts,
+ scope: [:admin, :domain_blocks, :show],
+ count: @domain_block.affected_accounts_count)
.actions
= f.button :button, t('.undo'), type: :submit
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index 9574c3147..61e578409 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -33,21 +33,22 @@
%h4
= instance.domain
%small
- = t('admin.instances.known_accounts', count: instance.cached_accounts_count)
-
- if instance.domain_block
+ - first_item = true
- if !instance.domain_block.noop?
- •
= t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
+ - first_item = false
- if instance.domain_block.reject_media?
- •
+ - unless first_item
+ •
= t('admin.domain_blocks.rejecting_media')
+ - first_item = false
- if instance.domain_block.reject_reports?
- •
+ - unless first_item
+ •
= t('admin.domain_blocks.rejecting_reports')
-
- .avatar-stack
- - instance.cached_sample_accounts.each do |account|
- = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar'
-
+ - else
+ = t('admin.accounts.no_limits_imposed')
+ - if instance.countable?
+ .trends__item__current{ title: t('admin.instances.known_accounts', count: instance.accounts_count) }= number_to_human instance.accounts_count, strip_insignificant_zeros: true
= paginate paginated_instances
diff --git a/app/views/admin/pending_accounts/_account.html.haml b/app/views/admin/pending_accounts/_account.html.haml
index 1ed5dafdd..7a9796a67 100644
--- a/app/views/admin/pending_accounts/_account.html.haml
+++ b/app/views/admin/pending_accounts/_account.html.haml
@@ -8,6 +8,8 @@
= "(@#{account.username})"
%br/
= account.user_current_sign_in_ip
+ •
+ = t 'admin.accounts.time_in_queue', time: time_ago_in_words(account.user&.created_at)
- if account.user&.invite_request&.text&.present?
.pending-account__body
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index 1c2c00f10..a67e6a2c8 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -9,7 +9,7 @@
.fields-row
.fields-row__column.fields-row__column-6.fields-group
- = f.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
+ = f.input :theme, collection: Themes.instance.names, label: t('simple_form.labels.defaults.setting_theme'), label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
.fields-row__column.fields-row__column-6.fields-group
= f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, label: t('admin.settings.registrations_mode.title'), include_blank: false, label_method: lambda { |mode| I18n.t("admin.settings.registrations_mode.modes.#{mode}") }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 3d63dc0f3..747d80bf0 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -33,3 +33,7 @@
%body{ class: body_classes }
= content_for?(:content) ? yield(:content) : yield
+
+ %div{ style: 'display: none'}
+ = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
+ = render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index aa1990972..585e24655 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -6,7 +6,7 @@
.logo-container
%h1
= link_to root_path do
- = image_pack_tag 'logo_full.svg', alt: 'Mastodon'
+ = svg_logo_full
.form-container
= render 'flashes'
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 4ffe3d79a..343bcb265 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -46,7 +46,7 @@
%tbody
%td.column-cell
%p= t 'about.hosted_on', domain: site_hostname
- %p= link_to t('application_mailer.notification_preferences'), settings_notifications_url
+ %p= link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
%td.column-cell.text-right
= link_to root_url do
= image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Mastodon', height: 24
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index d30b2a3ea..2929ac599 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -8,7 +8,7 @@
%nav.header
.nav-left
= link_to root_url, class: 'brand' do
- = image_pack_tag 'logo_full.svg', alt: 'Mastodon'
+ = svg_logo_full
= link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
= link_to t('about.about_this'), about_more_path, class: 'nav-link optional'
@@ -38,9 +38,7 @@
%li= link_to t('about.api'), 'https://docs.joinmastodon.org/api/guidelines/'
.column-2
%h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
-
- = link_to root_url, class: 'brand' do
- = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
+ = link_to svg_logo, root_url, class: 'brand'
.column-3
%h4= site_hostname
%ul
diff --git a/app/views/oauth/authorizations/show.html.haml b/app/views/oauth/authorizations/show.html.haml
index ad5236007..c3c9960d8 100644
--- a/app/views/oauth/authorizations/show.html.haml
+++ b/app/views/oauth/authorizations/show.html.haml
@@ -1,4 +1,7 @@
.form-container
- .flash-message
+ .flash-message.simple_form
%p= t('doorkeeper.authorizations.show.title')
- %input{ type: 'text', class: 'oauth-code', readonly: true, value: params[:code], onClick: 'select()' }
+ .input-copy
+ .input-copy__wrapper
+ %input{ type: 'text', class: 'oauth-code', spellcheck: 'false', readonly: true, value: params[:code] }
+ %button{ type: :button }= t('generic.copy')
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
new file mode 100644
index 000000000..10f009264
--- /dev/null
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -0,0 +1,41 @@
+- content_for :page_title do
+ = t('settings.appearance')
+
+= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put } do |f|
+ .fields-row
+ .fields-group.fields-row__column.fields-row__column-6
+ = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
+ .fields-group.fields-row__column.fields-row__column-6
+ = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false
+
+ %h4= t 'appearance.advanced_web_interface'
+
+ %p.hint= t 'appearance.advanced_web_interface_hint'
+
+ .fields-group
+ = f.input :setting_advanced_layout, as: :boolean, wrapper: :with_label, hint: false
+
+ %h4= t 'appearance.animations_and_accessibility'
+
+ .fields-group
+ = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true
+ = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
+ = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
+
+ %h4= t 'appearance.confirmation_dialogs'
+
+ .fields-group
+ = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
+ = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
+ = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
+
+ %h4= t 'appearance.sensitive_content'
+
+ .fields-group
+ = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label
+
+ .fields-group
+ = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label
+
+ .actions
+ = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
similarity index 92%
rename from app/views/settings/notifications/show.html.haml
rename to app/views/settings/preferences/notifications/show.html.haml
index 6ec57b502..acc646fc3 100644
--- a/app/views/settings/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -1,7 +1,7 @@
- content_for :page_title do
= t('settings.notifications')
-= simple_form_for current_user, url: settings_notifications_path, html: { method: :put } do |f|
+= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put } do |f|
= render 'shared/error_messages', object: current_user
.fields-group
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
new file mode 100644
index 000000000..db7d806bc
--- /dev/null
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -0,0 +1,37 @@
+- content_for :page_title do
+ = t('settings.preferences')
+
+= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f|
+ = render 'shared/error_messages', object: current_user
+
+ .fields-group
+ = f.input :setting_noindex, as: :boolean, wrapper: :with_label
+
+ .fields-group
+ = f.input :setting_hide_network, as: :boolean, wrapper: :with_label
+
+ .fields-group
+ = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label, recommended: true
+
+ %h4= t 'preferences.posting_defaults'
+
+ .fields-row
+ .fields-group.fields-row__column.fields-row__column-6
+ = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') }, required: false, hint: false
+
+ .fields-group.fields-row__column.fields-row__column-6
+ = f.input :setting_default_language, collection: [nil] + filterable_languages.sort, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.language_detection') : human_locale(locale) }, required: false, include_blank: false, hint: false
+
+ .fields-group
+ = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label
+
+ .fields-group
+ = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true
+
+ %h4= t 'preferences.public_timelines'
+
+ .fields-group
+ = f.input :chosen_languages, collection: filterable_languages.sort, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+
+ .actions
+ = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
deleted file mode 100644
index d81ee61ad..000000000
--- a/app/views/settings/preferences/show.html.haml
+++ /dev/null
@@ -1,64 +0,0 @@
-- content_for :page_title do
- = t('settings.preferences')
-
-%ul.quick-nav
- %li= link_to t('preferences.languages'), '#settings_languages'
- %li= link_to t('preferences.publishing'), '#settings_publishing'
- %li= link_to t('preferences.other'), '#settings_other'
- %li= link_to t('preferences.web'), '#settings_web'
- %li= link_to t('settings.notifications'), settings_notifications_path
-
-= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
- = render 'shared/error_messages', object: current_user
-
- .fields-row#settings_languages
- .fields-group.fields-row__column.fields-row__column-6
- = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale
- .fields-group.fields-row__column.fields-row__column-6
- = f.input :setting_default_language, collection: [nil] + filterable_languages.sort, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.language_detection') : human_locale(locale) }, required: false, include_blank: false
-
- .fields-group
- = f.input :chosen_languages, collection: filterable_languages.sort, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
-
- %hr#settings_publishing/
-
- .fields-group
- = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_floating_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
-
- = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label
-
- %hr#settings_other/
-
- .fields-group
- = f.input :setting_noindex, as: :boolean, wrapper: :with_label
-
- .fields-group
- = f.input :setting_hide_network, as: :boolean, wrapper: :with_label
-
- .fields-group
- = f.input :setting_show_application, as: :boolean, wrapper: :with_label
-
- %hr#settings_web/
-
- .fields-row
- .fields-group.fields-row__column.fields-row__column-6
- = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false
- .fields-group.fields-row__column.fields-row__column-6
- = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false
-
- .fields-group
- = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
- = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
- = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
-
- .fields-group
- = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label
-
- .fields-group
- = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
- = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label
- = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
- = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
-
- .actions
- = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index eb232dc57..f8a8fddd3 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -7,7 +7,7 @@
.fields-row
.fields-row__column.fields-group.fields-row__column-6
= f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30 }, hint: false
- = f.input :note, wrapper: :with_label, input_html: { maxlength: 160 }, hint: false
+ = f.input :note, wrapper: :with_label, input_html: { maxlength: 500 }, hint: false
.fields-row
.fields-row__column.fields-row__column-6
@@ -28,7 +28,7 @@
- if Setting.profile_directory
.fields-group
- = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable_html', min_followers: Account::MIN_FOLLOWERS_DISCOVERY, path: explore_path)
+ = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable_html', min_followers: Account::MIN_FOLLOWERS_DISCOVERY, path: explore_path), recommended: true
%hr.spacer/
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index 23f2920d8..069d0053f 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -19,14 +19,15 @@
- if status.spoiler_text?
%p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
%span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}
- %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
- .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
+ %button.status__content__spoiler-link= t('statuses.show_more')
+ .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
+ = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
+ - if status.preloadable_poll
+ = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
+ = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay }
- - if status.preloadable_poll
- = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
- = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay }
- - elsif !status.media_attachments.empty?
- - if status.media_attachments.first.video?
+ - if !status.media_attachments.empty?
+ - if status.media_attachments.first.audio_or_video?
- video = status.media_attachments.first
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 670, height: 380, detailed: true, inline: true, alt: video.description do
= render partial: 'stream_entries/attachment_list', locals: { attachments: status.media_attachments }
diff --git a/app/views/stream_entries/_og_image.html.haml b/app/views/stream_entries/_og_image.html.haml
index e1b977da3..67f9274b6 100644
--- a/app/views/stream_entries/_og_image.html.haml
+++ b/app/views/stream_entries/_og_image.html.haml
@@ -7,6 +7,8 @@
- unless media.file.meta.nil?
= opengraph 'og:image:width', media.file.meta.dig('original', 'width')
= opengraph 'og:image:height', media.file.meta.dig('original', 'height')
+ - if media.description.present?
+ = opengraph 'og:image:alt', media.description
- elsif media.video? || media.gifv?
- player_card = true
= opengraph 'og:image', full_asset_url(media.file.url(:small))
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index 0df7497e1..0b924f72f 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -23,14 +23,15 @@
- if status.spoiler_text?
%p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
%span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}
- %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
- .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
+ %button.status__content__spoiler-link= t('statuses.show_more')
+ .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
+ = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
+ - if status.preloadable_poll
+ = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
+ = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay }
- - if status.preloadable_poll
- = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
- = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay }
- - elsif !status.media_attachments.empty?
- - if status.media_attachments.first.video?
+ - if !status.media_attachments.empty?
+ - if status.media_attachments.first.audio_or_video?
- video = status.media_attachments.first
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description do
= render partial: 'stream_entries/attachment_list', locals: { attachments: status.media_attachments }
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index f9c385ea3..5e4c391f0 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -51,7 +51,7 @@ class ActivityPub::DeliveryWorker
end
def response_error_unsalvageable?(response)
- (400...500).cover?(response.code) && response.code != 429
+ (400...500).cover?(response.code) && ![401, 408, 429].include?(response.code)
end
def failure_tracker
diff --git a/app/workers/activitypub/distribute_poll_update_worker.rb b/app/workers/activitypub/distribute_poll_update_worker.rb
index 5eaca6fda..1e87fa4bf 100644
--- a/app/workers/activitypub/distribute_poll_update_worker.rb
+++ b/app/workers/activitypub/distribute_poll_update_worker.rb
@@ -2,6 +2,7 @@
class ActivityPub::DistributePollUpdateWorker
include Sidekiq::Worker
+ include Payloadable
sidekiq_options queue: 'push', unique: :until_executed, retry: 0
@@ -41,20 +42,8 @@ class ActivityPub::DistributePollUpdateWorker
@inboxes
end
- def signed_payload
- Oj.dump(ActivityPub::LinkedDataSignature.new(unsigned_payload).sign!(@account))
- end
-
- def unsigned_payload
- ActiveModelSerializers::SerializableResource.new(
- @status,
- serializer: ActivityPub::UpdatePollSerializer,
- adapter: ActivityPub::Adapter
- ).as_json
- end
-
def payload
- @payload ||= @status.distributable? ? signed_payload : Oj.dump(unsigned_payload)
+ @payload ||= Oj.dump(serialize_payload(@status, ActivityPub::UpdatePollSerializer, signer: @account))
end
def relay!
diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb
index d83f01700..11b6a6111 100644
--- a/app/workers/activitypub/distribution_worker.rb
+++ b/app/workers/activitypub/distribution_worker.rb
@@ -2,6 +2,7 @@
class ActivityPub::DistributionWorker
include Sidekiq::Worker
+ include Payloadable
sidekiq_options queue: 'push'
@@ -41,20 +42,8 @@ class ActivityPub::DistributionWorker
end
end
- def signed_payload
- Oj.dump(ActivityPub::LinkedDataSignature.new(unsigned_payload).sign!(@account))
- end
-
- def unsigned_payload
- ActiveModelSerializers::SerializableResource.new(
- @status,
- serializer: ActivityPub::ActivitySerializer,
- adapter: ActivityPub::Adapter
- ).as_json
- end
-
def payload
- @payload ||= @status.distributable? ? signed_payload : Oj.dump(unsigned_payload)
+ @payload ||= Oj.dump(serialize_payload(@status, ActivityPub::ActivitySerializer, signer: @account))
end
def relay!
diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb
index d8fea6c4e..1ff8a657e 100644
--- a/app/workers/activitypub/reply_distribution_worker.rb
+++ b/app/workers/activitypub/reply_distribution_worker.rb
@@ -5,6 +5,7 @@
class ActivityPub::ReplyDistributionWorker
include Sidekiq::Worker
+ include Payloadable
sidekiq_options queue: 'push'
@@ -27,19 +28,7 @@ class ActivityPub::ReplyDistributionWorker
@inboxes ||= @account.followers.inboxes
end
- def signed_payload
- Oj.dump(ActivityPub::LinkedDataSignature.new(unsigned_payload).sign!(@status.account))
- end
-
- def unsigned_payload
- ActiveModelSerializers::SerializableResource.new(
- @status,
- serializer: ActivityPub::ActivitySerializer,
- adapter: ActivityPub::Adapter
- ).as_json
- end
-
def payload
- @payload ||= @status.distributable? ? signed_payload : Oj.dump(unsigned_payload)
+ @payload ||= Oj.dump(serialize_payload(@status, ActivityPub::ActivitySerializer, signer: @status.account))
end
end
diff --git a/app/workers/activitypub/update_distribution_worker.rb b/app/workers/activitypub/update_distribution_worker.rb
index b9e5ff064..3a207f071 100644
--- a/app/workers/activitypub/update_distribution_worker.rb
+++ b/app/workers/activitypub/update_distribution_worker.rb
@@ -2,6 +2,7 @@
class ActivityPub::UpdateDistributionWorker
include Sidekiq::Worker
+ include Payloadable
sidekiq_options queue: 'push'
@@ -27,14 +28,6 @@ class ActivityPub::UpdateDistributionWorker
end
def signed_payload
- @signed_payload ||= Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account, sign_with: @options[:sign_with]))
- end
-
- def payload
- @payload ||= ActiveModelSerializers::SerializableResource.new(
- @account,
- serializer: ActivityPub::UpdateSerializer,
- adapter: ActivityPub::Adapter
- ).as_json
+ @signed_payload ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account, sign_with: @options[:sign_with]))
end
end
diff --git a/babel.config.js b/babel.config.js
index 55efafc40..a506ad8ce 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -17,7 +17,7 @@ module.exports = (api) => {
['@babel/proposal-object-rest-spread', { useBuiltIns: true }],
['@babel/proposal-decorators', { legacy: true }],
'@babel/proposal-class-properties',
- ['react-intl', { messagesDir: './build/messages/' }],
+ ['react-intl', { messagesDir: './build/messages' }],
'preval',
],
};
diff --git a/boxfile.yml b/boxfile.yml
index 9368a7d9d..08526a57c 100644
--- a/boxfile.yml
+++ b/boxfile.yml
@@ -64,8 +64,9 @@ deploy.config:
- |-
if [[ "${ES_ENABLED}" != "false" ]]
then
- bundle exec rake chewy:deploy
+ bin/tootctl search deploy
fi
+ - bin/tootctl cache clear
web.web:
@@ -120,77 +121,6 @@ worker.sidekiq:
- public/system
-worker.cron_only:
- start: sleep 365d
-
- writable_dirs:
- - tmp
-
- log_watch:
- rake: 'log/production.log'
-
- network_dirs:
- data.storage:
- - public/system
-
- cron:
- # 20:00 (8 pm), server time: send out the daily digest emails to everyone
- # who opted to receive one
- - id: send_digest_emails
- schedule: '00 20 * * *'
- command: 'bundle exec rake mastodon:emails:digest'
-
- # 00:10 (ten past midnight), server time: remove local copies of remote
- # users' media once they are older than a certain age (use NUM_DAYS evar to
- # change this from the default of 7 days)
- - id: clear_remote_media
- schedule: '10 00 * * *'
- command: 'bundle exec rake mastodon:media:remove_remote'
-
- # 00:20 (twenty past midnight), server time: remove subscriptions to remote
- # users that nobody follows locally (anymore)
- - id: clear_unfollowed_subs
- schedule: '20 00 * * *'
- command: 'bundle exec rake mastodon:push:clear'
-
- # 00:30 (half past midnight), server time: update local copies of remote
- # users' avatars to match whatever they currently have set on their profile
- - id: update_remote_avatars
- schedule: '30 00 * * *'
- command: 'bundle exec rake mastodon:media:redownload_avatars'
-
- ############################################################################
- # This task is one you might want to enable, or might not. It keeps disk
- # usage low, but makes "shadow bans" (scenarios where the user is silenced,
- # but not intended to be made aware that the silencing has occurred) much
- # more difficult to put in place, as users would then notice their media is
- # vanishing on a regular basis. Enable it if you aren't worried about users
- # knowing they've been silenced (on the instance level), and want to save
- # disk space. Leave it disabled otherwise.
- ############################################################################
- # # 00:00 (midnight), server time: remove media posted by silenced users
- # - id: clear_silenced_media
- # schedule: '00 00 * * *'
- # command: 'bundle exec rake mastodon:media:remove_silenced'
-
- ############################################################################
- # The following two tasks can be uncommented to automatically open and close
- # registrations on a schedule. The format of 'schedule' is a standard cron
- # time expression: minute hour day month day-of-week; search for "cron
- # time expressions" for more info on how to set these up. The examples here
- # open registration only from 8 am to 4 pm, server time.
- ############################################################################
- # # 08:00 (8 am), server time: open registrations so new users can join
- # - id: open_registrations
- # schedule: '00 08 * * *'
- # command: 'bundle exec rake mastodon:settings:open_registrations'
- #
- # # 16:00 (4 pm), server time: close registrations so new users *can't* join
- # - id: close_registrations
- # schedule: '00 16 * * *'
- # command: 'bundle exec rake mastodon:settings:close_registrations'
-
-
data.db:
image: nanobox/postgresql:9.6
diff --git a/config/application.rb b/config/application.rb
index 74006f5fa..4534ede49 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -10,6 +10,7 @@ require_relative '../app/lib/exceptions'
require_relative '../lib/paperclip/lazy_thumbnail'
require_relative '../lib/paperclip/gif_transcoder'
require_relative '../lib/paperclip/video_transcoder'
+require_relative '../lib/paperclip/type_corrector'
require_relative '../lib/mastodon/snowflake'
require_relative '../lib/mastodon/version'
require_relative '../lib/devise/ldap_authenticatable'
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 1bcac154b..bc5a05f4a 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -51,7 +51,7 @@ ignore_unused:
- 'activerecord.errors.*'
- '{devise,pagination,doorkeeper}.*'
- '{date,datetime,time,number}.*'
- - 'simple_form.{yes,no}'
+ - 'simple_form.{yes,no,recommended}'
- 'simple_form.{placeholders,hints,labels}.*'
- 'simple_form.{error_notification,required}.:'
- 'errors.messages.*'
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 367eead6a..914b3c001 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -80,7 +80,13 @@ Doorkeeper.configure do
:'read:search',
:'read:statuses',
:follow,
- :push
+ :push,
+ :'admin:read',
+ :'admin:read:accounts',
+ :'admin:read:reports',
+ :'admin:write',
+ :'admin:write:accounts',
+ :'admin:write:reports'
# Change the way client credentials are retrieved from the request object.
# By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index ae3eede66..24ba16ae3 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -13,6 +13,10 @@ class Rack::Attack
)
end
+ def remote_ip
+ @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
+ end
+
def authenticated_user_id
authenticated_token&.resource_owner_id
end
@@ -28,6 +32,10 @@ class Rack::Attack
def web_request?
!api_request?
end
+
+ def paging_request?
+ params['page'].present? || params['min_id'].present? || params['max_id'].present? || params['since_id'].present?
+ end
end
PROTECTED_PATHS = %w(
@@ -42,15 +50,15 @@ class Rack::Attack
# (blocklist & throttles are skipped)
Rack::Attack.safelist('allow from localhost') do |req|
# Requests are allowed if the return value is truthy
- req.ip == '127.0.0.1' || req.ip == '::1'
+ req.remote_ip == '127.0.0.1' || req.remote_ip == '::1'
end
throttle('throttle_authenticated_api', limit: 300, period: 5.minutes) do |req|
req.authenticated_user_id if req.api_request?
end
- throttle('throttle_unauthenticated_api', limit: 7_500, period: 5.minutes) do |req|
- req.ip if req.api_request?
+ throttle('throttle_unauthenticated_api', limit: 300, period: 5.minutes) do |req|
+ req.remote_ip if req.api_request? && req.unauthenticated?
end
throttle('throttle_api_media', limit: 30, period: 30.minutes) do |req|
@@ -58,11 +66,20 @@ class Rack::Attack
end
throttle('throttle_media_proxy', limit: 30, period: 30.minutes) do |req|
- req.ip if req.path.start_with?('/media_proxy')
+ req.remote_ip if req.path.start_with?('/media_proxy')
end
throttle('throttle_api_sign_up', limit: 5, period: 30.minutes) do |req|
- req.ip if req.post? && req.path == '/api/v1/accounts'
+ req.remote_ip if req.post? && req.path == '/api/v1/accounts'
+ end
+
+ # Throttle paging, as it is mainly used for public pages and AP collections
+ throttle('throttle_authenticated_paging', limit: 300, period: 15.minutes) do |req|
+ req.authenticated_user_id if req.paging_request?
+ end
+
+ throttle('throttle_unauthenticated_paging', limit: 300, period: 15.minutes) do |req|
+ req.remote_ip if req.paging_request? && req.unauthenticated?
end
API_DELETE_REBLOG_REGEX = /\A\/api\/v1\/statuses\/[\d]+\/unreblog/.freeze
@@ -73,7 +90,7 @@ class Rack::Attack
end
throttle('protected_paths', limit: 25, period: 5.minutes) do |req|
- req.ip if req.post? && req.path =~ PROTECTED_PATHS_REGEX
+ req.remote_ip if req.post? && req.path =~ PROTECTED_PATHS_REGEX
end
self.throttled_response = lambda do |env|
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 386ede654..964526819 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -8,7 +8,16 @@ module AppendComponent
end
end
+module RecommendedComponent
+ def recommended(wrapper_options = nil)
+ return unless options[:recommended]
+ options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) }
+ nil
+ end
+end
+
SimpleForm.include_component(AppendComponent)
+SimpleForm.include_component(RecommendedComponent)
SimpleForm.setup do |config|
# Wrappers are used by the form builder to generate a
@@ -65,6 +74,7 @@ SimpleForm.setup do |config|
b.use :html5
b.wrapper tag: :div, class: :label_input do |ba|
+ ba.optional :recommended
ba.use :label
ba.wrapper tag: :div, class: :label_input__wrapper do |bb|
diff --git a/config/locales/activerecord.ar.yml b/config/locales/activerecord.ar.yml
index 68c7fe939..2b39ee156 100644
--- a/config/locales/activerecord.ar.yml
+++ b/config/locales/activerecord.ar.yml
@@ -1,6 +1,10 @@
---
ar:
activerecord:
+ attributes:
+ poll:
+ expires_at: آخر أجل
+ options: الخيارات
errors:
models:
account:
diff --git a/config/locales/activerecord.bg.yml b/config/locales/activerecord.bg.yml
new file mode 100644
index 000000000..d0e375da9
--- /dev/null
+++ b/config/locales/activerecord.bg.yml
@@ -0,0 +1 @@
+bg:
diff --git a/config/locales/activerecord.bn.yml b/config/locales/activerecord.bn.yml
new file mode 100644
index 000000000..152c69829
--- /dev/null
+++ b/config/locales/activerecord.bn.yml
@@ -0,0 +1 @@
+bn:
diff --git a/config/locales/activerecord.ca.yml b/config/locales/activerecord.ca.yml
index 19e39b5e7..2795a6b33 100644
--- a/config/locales/activerecord.ca.yml
+++ b/config/locales/activerecord.ca.yml
@@ -2,8 +2,9 @@
ca:
activerecord:
attributes:
- status:
- owned_poll: Enquesta
+ poll:
+ expires_at: Data límit
+ options: Opcions
errors:
models:
account:
diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml
index 265530124..19547df98 100644
--- a/config/locales/activerecord.cy.yml
+++ b/config/locales/activerecord.cy.yml
@@ -1,6 +1,10 @@
---
cy:
activerecord:
+ attributes:
+ poll:
+ expires_at: Terfyn
+ options: Dewisiadau
errors:
models:
account:
diff --git a/config/locales/activerecord.da.yml b/config/locales/activerecord.da.yml
index 8e9db715b..5e7266ef1 100644
--- a/config/locales/activerecord.da.yml
+++ b/config/locales/activerecord.da.yml
@@ -1,9 +1,6 @@
---
da:
activerecord:
- attributes:
- status:
- owned_poll: Afstemning
errors:
models:
account:
diff --git a/config/locales/activerecord.de.yml b/config/locales/activerecord.de.yml
index ce465545b..46a48d234 100644
--- a/config/locales/activerecord.de.yml
+++ b/config/locales/activerecord.de.yml
@@ -4,9 +4,7 @@ de:
attributes:
poll:
expires_at: Frist
- options: Wahlen
- status:
- owned_poll: Umfrage
+ options: Wahlmöglichkeiten
errors:
models:
account:
@@ -16,4 +14,4 @@ de:
status:
attributes:
reblog:
- taken: des Status existiert schon
+ taken: des Beitrags existiert schon
diff --git a/config/locales/activerecord.el.yml b/config/locales/activerecord.el.yml
index abeca78ac..36e5f508d 100644
--- a/config/locales/activerecord.el.yml
+++ b/config/locales/activerecord.el.yml
@@ -5,8 +5,6 @@ el:
poll:
expires_at: Προθεσμία
options: Επιλογές
- status:
- owned_poll: Ψηφοφορία
errors:
models:
account:
diff --git a/config/locales/activerecord.eo.yml b/config/locales/activerecord.eo.yml
new file mode 100644
index 000000000..f8a3cf18b
--- /dev/null
+++ b/config/locales/activerecord.eo.yml
@@ -0,0 +1,17 @@
+---
+eo:
+ activerecord:
+ attributes:
+ poll:
+ expires_at: Limdato
+ options: Elektoj
+ errors:
+ models:
+ account:
+ attributes:
+ username:
+ invalid: nur leteroj, ciferoj kaj substrekoj
+ status:
+ attributes:
+ reblog:
+ taken: de statuso jam ekzistas
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index d18b16834..f40e6c361 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -1,12 +1,16 @@
---
es:
activerecord:
+ attributes:
+ poll:
+ expires_at: Vencimiento
+ options: Opciones
errors:
models:
account:
attributes:
username:
- invalid: solo letras, números y guiones bajos
+ invalid: sólo letras, números y guiones bajos
status:
attributes:
reblog:
diff --git a/config/locales/activerecord.eu.yml b/config/locales/activerecord.eu.yml
index 64c8bc04e..235738f22 100644
--- a/config/locales/activerecord.eu.yml
+++ b/config/locales/activerecord.eu.yml
@@ -1,6 +1,10 @@
---
eu:
activerecord:
+ attributes:
+ poll:
+ expires_at: Epemuga
+ options: Aukerak
errors:
models:
account:
diff --git a/config/locales/activerecord.fa.yml b/config/locales/activerecord.fa.yml
index 0cc6c12d7..d3b01a158 100644
--- a/config/locales/activerecord.fa.yml
+++ b/config/locales/activerecord.fa.yml
@@ -2,8 +2,9 @@
fa:
activerecord:
attributes:
- status:
- owned_poll: رأیگیری
+ poll:
+ expires_at: مهلت
+ options: گزینهها
errors:
models:
account:
diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml
new file mode 100644
index 000000000..2b2ffd121
--- /dev/null
+++ b/config/locales/activerecord.fi.yml
@@ -0,0 +1,13 @@
+---
+fi:
+ activerecord:
+ attributes:
+ poll:
+ expires_at: Määräaika
+ options: Vaihtoehdot
+ errors:
+ models:
+ account:
+ attributes:
+ username:
+ invalid: Vain kirjaimia, numeroita ja alleviivoja
diff --git a/config/locales/activerecord.gl.yml b/config/locales/activerecord.gl.yml
index 3792f3476..0bc27502c 100644
--- a/config/locales/activerecord.gl.yml
+++ b/config/locales/activerecord.gl.yml
@@ -5,8 +5,6 @@ gl:
poll:
expires_at: Caducidade
options: Opcións
- status:
- owned_poll: Sondaxe
errors:
models:
account:
diff --git a/config/locales/activerecord.hr.yml b/config/locales/activerecord.hr.yml
new file mode 100644
index 000000000..f67f33c7e
--- /dev/null
+++ b/config/locales/activerecord.hr.yml
@@ -0,0 +1 @@
+hr:
diff --git a/config/locales/activerecord.hu.yml b/config/locales/activerecord.hu.yml
new file mode 100644
index 000000000..bbc18bc33
--- /dev/null
+++ b/config/locales/activerecord.hu.yml
@@ -0,0 +1,13 @@
+---
+hu:
+ activerecord:
+ attributes:
+ poll:
+ expires_at: Határidő
+ options: Lehetőségek
+ errors:
+ models:
+ account:
+ attributes:
+ username:
+ invalid: csak betűk, számok vagy alávonás
diff --git a/config/locales/activerecord.hy.yml b/config/locales/activerecord.hy.yml
new file mode 100644
index 000000000..c40654016
--- /dev/null
+++ b/config/locales/activerecord.hy.yml
@@ -0,0 +1 @@
+hy:
diff --git a/config/locales/activerecord.io.yml b/config/locales/activerecord.io.yml
new file mode 100644
index 000000000..c63dc0e8d
--- /dev/null
+++ b/config/locales/activerecord.io.yml
@@ -0,0 +1 @@
+io:
diff --git a/config/locales/activerecord.it.yml b/config/locales/activerecord.it.yml
index 4cec9fb63..70afdaef1 100644
--- a/config/locales/activerecord.it.yml
+++ b/config/locales/activerecord.it.yml
@@ -1,12 +1,16 @@
---
it:
activerecord:
+ attributes:
+ poll:
+ expires_at: Scadenza
+ options: Scelte
errors:
models:
account:
attributes:
username:
- invalid: solo lettere, numeri e trattino basso
+ invalid: solo lettere, numeri e trattini bassi
status:
attributes:
reblog:
diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml
index ce147819a..8b0eefb12 100644
--- a/config/locales/activerecord.ja.yml
+++ b/config/locales/activerecord.ja.yml
@@ -5,8 +5,6 @@ ja:
poll:
expires_at: 期限
options: 項目
- user:
- email: メールアドレス
errors:
models:
account:
diff --git a/config/locales/activerecord.ko.yml b/config/locales/activerecord.ko.yml
new file mode 100644
index 000000000..3c081269a
--- /dev/null
+++ b/config/locales/activerecord.ko.yml
@@ -0,0 +1,17 @@
+---
+ko:
+ activerecord:
+ attributes:
+ poll:
+ expires_at: 마감 기한
+ options: 선택
+ errors:
+ models:
+ account:
+ attributes:
+ username:
+ invalid: 영문자, 숫자, _만 사용 가능
+ status:
+ attributes:
+ reblog:
+ taken: 이미 게시물이 존재합니다
diff --git a/config/locales/activerecord.lt.yml b/config/locales/activerecord.lt.yml
new file mode 100644
index 000000000..6c5cb837a
--- /dev/null
+++ b/config/locales/activerecord.lt.yml
@@ -0,0 +1 @@
+lt:
diff --git a/config/locales/activerecord.lv.yml b/config/locales/activerecord.lv.yml
new file mode 100644
index 000000000..1be0eabc0
--- /dev/null
+++ b/config/locales/activerecord.lv.yml
@@ -0,0 +1 @@
+lv:
diff --git a/config/locales/activerecord.ms.yml b/config/locales/activerecord.ms.yml
new file mode 100644
index 000000000..2925688a0
--- /dev/null
+++ b/config/locales/activerecord.ms.yml
@@ -0,0 +1 @@
+ms:
diff --git a/config/locales/activerecord.nl.yml b/config/locales/activerecord.nl.yml
index 31348b18f..a9bcb33fa 100644
--- a/config/locales/activerecord.nl.yml
+++ b/config/locales/activerecord.nl.yml
@@ -5,8 +5,6 @@ nl:
poll:
expires_at: Deadline
options: Keuzes
- status:
- owned_poll: Poll
errors:
models:
account:
diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml
index bd8e40a6a..f10420ec7 100644
--- a/config/locales/activerecord.pl.yml
+++ b/config/locales/activerecord.pl.yml
@@ -2,8 +2,9 @@
pl:
activerecord:
attributes:
- user:
- email: adres e-mail
+ poll:
+ expires_at: Ostateczny termin
+ options: Opcje
errors:
models:
account:
diff --git a/config/locales/activerecord.ro.yml b/config/locales/activerecord.ro.yml
new file mode 100644
index 000000000..79dbaa871
--- /dev/null
+++ b/config/locales/activerecord.ro.yml
@@ -0,0 +1 @@
+ro:
diff --git a/config/locales/activerecord.sk.yml b/config/locales/activerecord.sk.yml
index 26f6c9737..eb8d75d48 100644
--- a/config/locales/activerecord.sk.yml
+++ b/config/locales/activerecord.sk.yml
@@ -5,8 +5,6 @@ sk:
poll:
expires_at: Trvá do
options: Voľby
- status:
- owned_poll: Anketa
errors:
models:
account:
diff --git a/config/locales/activerecord.sl.yml b/config/locales/activerecord.sl.yml
index d98e3b676..1df109579 100644
--- a/config/locales/activerecord.sl.yml
+++ b/config/locales/activerecord.sl.yml
@@ -1,6 +1,10 @@
---
sl:
activerecord:
+ attributes:
+ poll:
+ expires_at: Rok
+ options: Izbire
errors:
models:
account:
diff --git a/config/locales/activerecord.ta.yml b/config/locales/activerecord.ta.yml
new file mode 100644
index 000000000..4320953ce
--- /dev/null
+++ b/config/locales/activerecord.ta.yml
@@ -0,0 +1 @@
+ta:
diff --git a/config/locales/activerecord.te.yml b/config/locales/activerecord.te.yml
new file mode 100644
index 000000000..34c54f18f
--- /dev/null
+++ b/config/locales/activerecord.te.yml
@@ -0,0 +1 @@
+te:
diff --git a/config/locales/activerecord.th.yml b/config/locales/activerecord.th.yml
index 7890ed80c..6719422a2 100644
--- a/config/locales/activerecord.th.yml
+++ b/config/locales/activerecord.th.yml
@@ -1,6 +1,10 @@
---
th:
activerecord:
+ attributes:
+ poll:
+ expires_at: กำหนดเวลาสิ้นสุด
+ options: ทางเลือก
errors:
models:
account:
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml
index 8628d6677..8d2ddfd14 100644
--- a/config/locales/activerecord.zh-CN.yml
+++ b/config/locales/activerecord.zh-CN.yml
@@ -1,6 +1,10 @@
---
zh-CN:
activerecord:
+ attributes:
+ poll:
+ expires_at: 截止时间
+ options: 选项
errors:
models:
account:
diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml
new file mode 100644
index 000000000..cb82c0526
--- /dev/null
+++ b/config/locales/activerecord.zh-TW.yml
@@ -0,0 +1 @@
+zh-TW:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index fe49ac7f6..eb6a5ef06 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2,22 +2,27 @@
ar:
about:
about_hashtag_html: هذه تبويقات متاحة للجمهور تحتوي على الكلمات الدلالية #%{hashtag}. يمكنك التفاعل معها إن كان لديك حساب في أي مكان على الفديفرس.
- about_mastodon_html: ماستدون شبكة إجتماعية مبنية على أسُس بروتوكولات برمجيات الويب الحرة و مفتوحة المصدر. و هو لامركزي تمامًا كالبريد الإلكتروني.
+ about_mastodon_html: ماستدون شبكة اجتماعية مبنية على أسُس بروتوكولات برمجيات الويب الحرة و مفتوحة المصدر. و هو لامركزي تمامًا كالبريد الإلكتروني.
about_this: عن مثيل الخادوم هذا
- administered_by: 'يُديره :'
+ active_count_after: نشط
+ administered_by: 'يُديره:'
api: واجهة برمجة التطبيقات
apps: تطبيقات الأجهزة المحمولة
contact: للتواصل معنا
contact_missing: لم يتم تعيينه
contact_unavailable: غير متوفر
+ discover_users: اكتشف مستخدِمين
documentation: الدليل
extended_description_html: |
مكان جيد للقواعد
لم يتم بعد إدخال الوصف الطويل.
generic_description: "%{domain} هو سيرفر من بين سيرفرات الشبكة"
+ get_apps: جرّب تطبيقا على الموبايل
hosted_on: ماستدون مُستضاف على %{domain}
learn_more: تعلم المزيد
privacy_policy: سياسة الخصوصية
+ see_whats_happening: اطّلع على ما يجري
+ server_stats: 'إحصائيات الخادم:'
source_code: الشفرة المصدرية
status_count_after:
few: منشورات
@@ -27,6 +32,7 @@ ar:
two: منشورات
zero: منشورات
status_count_before: نشروا
+ tagline: اتبع أصدقائك وصديقاتك واكتشف آخرين وأخريات
terms: شروط الخدمة
user_count_after:
few: مستخدمين
@@ -38,8 +44,8 @@ ar:
user_count_before: يستضيف
what_is_mastodon: ما هو ماستدون ؟
accounts:
- choices_html: 'توصيات %{name} :'
- follow: إتبع
+ choices_html: 'توصيات %{name}:'
+ follow: اتبع
followers:
few: متابِعون
many: متابِعون
@@ -52,9 +58,9 @@ ar:
last_active: آخر نشاط
link_verified_on: تم التحقق مِن مالك هذا الرابط بتاريخ %{date}
media: الوسائط
- moved_html: "%{name} إنتقلَ إلى %{new_profile_link} :"
+ moved_html: "%{name} إنتقلَ إلى %{new_profile_link}:"
network_hidden: إنّ المعطيات غير متوفرة
- nothing_here: لا يوجد أي شيء هنا !
+ nothing_here: لا يوجد أي شيء هنا!
people_followed_by: الأشخاص الذين يتبعهم %{name}
people_who_follow: الأشخاص الذين يتبعون %{name}
pin_errors:
@@ -68,27 +74,30 @@ ar:
zero: تبويقات
posts_tab_heading: تبويقات
posts_with_replies: التبويقات و الردود
- reserved_username: إسم المستخدم محجوز
+ reserved_username: اسم المستخدم محجوز
roles:
admin: المدير
bot: روبوت
moderator: مُشرِف
+ unavailable: الحساب غير متوفر
unfollow: إلغاء المتابعة
admin:
account_actions:
- action: تنفيذ الاجراء
+ action: تنفيذ الإجراء
title: اتخاذ إجراء إشراف على %{acct}
account_moderation_notes:
- create: إترك ملاحظة
- created_msg: تم إنشاء ملاحظة الإشراف بنجاح !
+ create: اترك ملاحظة
+ created_msg: تم إنشاء ملاحظة الإشراف بنجاح!
delete: حذف
- destroyed_msg: تم تدمير ملاحظة الإشراف بنجاح !
+ destroyed_msg: تم تدمير ملاحظة الإشراف بنجاح!
accounts:
+ approve: صادِق عليه
+ approve_all: الموافقة على الكل
are_you_sure: متأكد ؟
avatar: الصورة الرمزية
by_domain: النطاق
change_email:
- changed_msg: تم تعديل عنوان البريد الإلكتروني الخاص بالحساب بنجاح !
+ changed_msg: تم تعديل عنوان البريد الإلكتروني الخاص بالحساب بنجاح!
current_email: عنوان البريد الإلكتروني الحالي
label: تعديل عنوان البريد الإلكتروني
new_email: عنوان البريد الإلكتروني الجديد
@@ -102,7 +111,7 @@ ar:
disable: تعطيل
disable_two_factor_authentication: تعطيل المصادقة بخطوتين
disabled: معطَّل
- display_name: عرض الإسم
+ display_name: عرض الاسم
domain: النطاق
edit: تعديل
email: البريد الإلكتروني
@@ -129,15 +138,18 @@ ar:
moderation:
active: نشِط
all: الكل
+ pending: قيد المراجعة
silenced: تم كتمه
suspended: مُجَمَّد
title: الإشراف
moderation_notes: ملاحظات الإشراف
most_recent_activity: آخر نشاط حديث
most_recent_ip: أحدث عنوان إيبي
+ no_account_selected: لم يطرأ أي تغيير على أي حساب بما أنه لم يتم اختيار أي واحد
no_limits_imposed: مِن دون حدود مشروطة
not_subscribed: غير مشترك
outbox_url: رابط صندوق الصادر
+ pending: في انتظار المراجعة
perform_full_suspension: تعليق الحساب
profile_url: رابط الملف الشخصي
promote: ترقية
@@ -145,15 +157,17 @@ ar:
public: عمومي
push_subscription_expires: انتهاء الاشتراك ”PuSH“
redownload: تحديث الصفحة الشخصية
+ reject: ارفض
+ reject_all: ارفض الكل
remove_avatar: حذف الصورة الرمزية
remove_header: حذف الرأسية
resend_confirmation:
already_confirmed: هذا المستخدم مؤكد بالفعل
- send: أعد إرسال رسالة البريد الالكتروني الخاصة بالتأكيد
+ send: أعد إرسال رسالة البريد الإلكتروني الخاصة بالتأكيد
success: تم إرسال رسالة التأكيد بنجاح!
reset: إعادة التعيين
reset_password: إعادة ضبط كلمة السر
- resubscribe: إعادة الإشتراك
+ resubscribe: إعادة الاشتراك
role: الصلاحيات
roles:
admin: مدير
@@ -165,18 +179,19 @@ ar:
shared_inbox_url: رابط الصندوق المُشترَك للبريد الوارد
show:
created_reports: البلاغات التي أنشأها هذا الحساب
- targeted_reports: الشكاوي التي أُنشِأت مِن طرف الآخَرين
+ targeted_reports: الشكاوى التي أُنشِأت مِن طرف الآخَرين
silence: كتم
silenced: تم كتمه
statuses: المنشورات
subscribe: اشترك
suspended: تم تعليقه
+ time_in_queue: في قائمة الانتظار %{time}
title: الحسابات
unconfirmed_email: البريد الإلكتروني غير مؤكد
undo_silenced: رفع الصمت
undo_suspension: إلغاء تعليق الحساب
unsubscribe: إلغاء الاشتراك
- username: إسم المستخدم
+ username: اسم المستخدم
warn: تحذير
web: الويب
action_logs:
@@ -193,7 +208,7 @@ ar:
destroy_domain_block: "%{name} قام بإلغاء الحجب عن النطاق %{target}"
destroy_email_domain_block: قام %{name} بإضافة نطاق البريد الإلكتروني %{target} إلى اللائحة البيضاء
destroy_status: لقد قام %{name} بحذف منشور %{target}
- disable_2fa_user: "%{name} لقد قام بتعطيل ميزة المصادقة بخطوتين للمستخدم %{target}"
+ disable_2fa_user: "%{name} لقد قام بتعطيل ميزة المصادقة بخطوتين للمستخدم %{target}"
disable_custom_emoji: "%{name} قام بتعطيل الإيموجي %{target}"
disable_user: "%{name} لقد قام بتعطيل تسجيل الدخول للمستخدِم %{target}"
enable_custom_emoji: "%{name} قام بتنشيط الإيموجي %{target}"
@@ -218,9 +233,9 @@ ar:
copied_msg: تم إنشاء نسخة محلية للإيموجي بنجاح
copy: نسخ
copy_failed_msg: فشلت عملية إنشاء نسخة محلية لهذا الإيموجي
- created_msg: تم إنشاء الإيموجي بنجاح !
+ created_msg: تم إنشاء الإيموجي بنجاح!
delete: حذف
- destroyed_msg: تمت عملية تدمير الإيموجي بنجاح !
+ destroyed_msg: تمت عملية تدمير الإيموجي بنجاح!
disable: تعطيل
disabled_msg: تمت عملية تعطيل ذلك الإيموجي بنجاح
emoji: إيموجي
@@ -235,8 +250,8 @@ ar:
shortcode_hint: على الأقل حرفين، و فقط رموز أبجدية عددية و أسطر سفلية
title: الإيموجي الخاصة
unlisted: غير مدرج
- update_failed_msg: تعذرت عملية تحذيث ذاك الإيموجي
- updated_msg: تم تحديث الإيموجي بنجاح !
+ update_failed_msg: تعذرت عملية تحديث ذاك الإيموجي
+ updated_msg: تم تحديث الإيموجي بنجاح!
upload: رفع
dashboard:
backlog: الأعمال المتراكمة
@@ -246,9 +261,10 @@ ar:
feature_profile_directory: دليل الحسابات
feature_registrations: التسجيلات
feature_relay: المُرحّل الفديرالي
+ feature_timeline_preview: معاينة الخيط الزمني
features: الميّزات
hidden_service: الفيديرالية مع الخدمات الخفية
- open_reports: فتح الشكاوي
+ open_reports: فتح الشكاوى
recent_users: أحدث المستخدِمين
search: البحث النصي الكامل
single_user_mode: وضع المستخدِم الأوحد
@@ -286,8 +302,8 @@ ar:
many: "%{count} حسابات معنية في قاعدة البيانات"
one: حساب واحد معني في قاعدة البيانات
other: "%{count} حسابات معنية في قاعدة البيانات"
- two: حسابات معنية في قاعدة البيانات
- zero: حسابات معنية في قاعدة البيانات
+ two: "%{count} حسابات معنية في قاعدة البيانات"
+ zero: "%{count} حسابات معنية في قاعدة البيانات"
retroactive:
silence: إلغاء الكتم عن كافة الحسابات المتواجدة على هذا النطاق
suspend: إلغاء التعليق المفروض على كافة حسابات هذا النطاق
@@ -319,6 +335,7 @@ ar:
zero: "%{count} حسابات معروفة"
moderation:
all: كافتها
+ limited: محدود
title: الإشراف
title: الفديرالية
total_blocked_by_us: المحجوبة مِن طرفنا
@@ -334,13 +351,15 @@ ar:
expired: المنتهي صلاحيتها
title: التصفية
title: الدعوات
+ pending_accounts:
+ title: الحسابات المعلقة (%{count})
relays:
add_new: إضافة مُرحّل جديد
delete: حذف
disable: تعطيل
disabled: مُعطَّل
enable: تشغيل
- enable_hint: عندما تقوم بتنشيط هذه الميزة، سوف يشترك خادومك في جميع التبويقات القادمة مِن هذا المُرحِّل و سيشرع كذلك بإرسال كافة التبويقات العمومية إليه.
+ enable_hint: عندما تقوم بتنشيط هذه الميزة، سوف يشترك خادومكم في جميع التبويقات القادمة مِن هذا المُرحِّل و سيشرع كذلك بإرسال كافة التبويقات العمومية إليه.
enabled: مُشغَّل
inbox_url: رابط المُرحّل
pending: في انتظار تسريح المُرحِّل
@@ -362,14 +381,14 @@ ar:
comment:
none: لا شيء
created_at: ذكرت
- mark_as_resolved: إعتبار الشكوى كمحلولة
- mark_as_unresolved: علام كغير محلولة
+ mark_as_resolved: اعتبار الشكوى كمحلولة
+ mark_as_unresolved: علم كغير محلولة
notes:
create: اضف ملاحظة
create_and_resolve: الحل مع ملاحظة
create_and_unresolve: إعادة فتح مع ملاحظة
delete: حذف
- placeholder: قم بوصف الإجراءات التي تم اتخاذها أو أي تحديثات أخرى ذات علاقة …
+ placeholder: قم بوصف الإجراءات التي تم اتخاذها أو أي تحديثات أخرى ذات علاقة...
reopen: إعادة فتح الشكوى
report: 'الشكوى #%{id}'
reported_account: حساب مُبلّغ عنه
@@ -377,20 +396,20 @@ ar:
resolved: معالجة
resolved_msg: تم حل تقرير بنجاح!
status: الحالة
- title: الشكاوي
+ title: الشكاوى
unassign: إلغاء تعيين
unresolved: غير معالجة
updated_at: محدث
settings:
activity_api_enabled:
- desc_html: عدد المنشورات المحلية و المستخدمين النشطين و التسجيلات الأسبوعية الجديدة
+ desc_html: عدد المنشورات المحلية و المستخدمين الناشطين و التسجيلات الأسبوعية الجديدة
title: نشر مُجمل الإحصائيات عن نشاط المستخدمين
bootstrap_timeline_accounts:
desc_html: افصل بين أسماء المستخدمين المتعددة بواسطة الفاصلة. استعمل الحسابات المحلية والمفتوحة فقط. الافتراضي عندما تكون فارغة كل المسؤولين المحليين.
- title: الإشتراكات الإفتراضية للمستخدمين الجدد
+ title: الاشتراكات الافتراضية للمستخدمين الجدد
contact_information:
email: البريد الإلكتروني المهني
- username: الإتصال بالمستخدِم
+ username: الاتصال بالمستخدِم
custom_css:
desc_html: يقوم بتغيير المظهر بواسطة سي أس أس يُحمَّل على كافة الصفحات
title: سي أس أس مخصص
@@ -398,7 +417,7 @@ ar:
desc_html: معروض على الصفحة الأولى. لا يقل عن 600 × 100 بكسل. عند عدم التعيين ، تعود الصورة إلى النسخة المصغرة على سبيل المثال
title: الصورة الرأسية
peers_api_enabled:
- desc_html: أسماء النطاقات التي إلتقى بها مثيل الخادوم على البيئة الموحَّدة فيديفرس
+ desc_html: أسماء النطاقات التي التقى بها مثيل الخادوم على البيئة الموحَّدة فديفرس
title: نشر عدد مثيلات الخوادم التي تم مصادفتها
preview_sensitive_media:
desc_html: روابط المُعَاينة على مواقع الويب الأخرى ستقوم بعرض صُوَر مصغّرة حتى و إن كانت الوسائط حساسة
@@ -416,9 +435,13 @@ ar:
min_invite_role:
disabled: لا أحد
title: المستخدِمون المصرح لهم لإرسال الدعوات
+ registrations_mode:
+ modes:
+ none: لا أحد يمكنه إنشاء حساب
+ open: يمكن للجميع إنشاء حساب
+ title: طريقة إنشاء الحسابات
show_known_fediverse_at_about_page:
- desc_html: عند التثبت ، سوف تظهر toots من جميع fediverse المعروفة على عرض مسبق. وإلا فإنه سيعرض فقط toots المحلية.
- title: إظهار الفيديفرس الموحَّد في خيط المُعايَنة
+ title: إظهار الفديفرس الموحَّد في خيط المُعايَنة
show_staff_badge:
desc_html: عرض شارة الموظفين على صفحة المستخدم
title: إظهار شارة الموظفين
@@ -429,17 +452,17 @@ ar:
desc_html: مكان جيد لمدونة قواعد السلوك والقواعد والإرشادات وغيرها من الأمور التي تحدد حالتك. يمكنك استخدام علامات HTML
title: الوصف المُفصّل للموقع
site_short_description:
- desc_html: يتم عرضه في لوحة جانبية و في البيانات الوصفية. قم بوصف ماستدون و ما يميز هذا السيرفر عن الآخرين في فقرة موجزة. إن تركت الحقل فارغا فسوف يتم عرض الوصف الإفتراضي لمثيل الخادوم.
+ desc_html: يتم عرضه في لوحة جانبية و في البيانات الوصفية. قم بوصف ماستدون و ما يميز هذا السيرفر عن الآخرين في فقرة موجزة. إن تركت الحقل فارغا فسوف يتم عرض الوصف الافتراضي لمثيل الخادوم.
title: مقدمة وصفية قصيرة عن مثيل الخادوم
site_terms:
desc_html: يمكنك كتابة سياسة الخصوصية الخاصة بك ، شروط الخدمة أو غيرها من القوانين. يمكنك استخدام علامات HTML
title: شروط الخدمة المخصصة
- site_title: إسم مثيل الخادم
+ site_title: اسم مثيل الخادم
thumbnail:
desc_html: يستخدم للعروض السابقة عبر Open Graph و API. 1200x630px موصى به
title: الصورة الرمزية المصغرة لمثيل الخادوم
timeline_preview:
- desc_html: عرض الخيط العمومي على صفحة الإستقبال
+ desc_html: عرض الخيط العمومي على صفحة الاستقبال
title: مُعاينة الخيط العام
title: إعدادات الموقع
statuses:
@@ -460,7 +483,6 @@ ar:
confirmed: مؤكَّد
expires_in: تنتهي مدة صلاحيتها في
last_delivery: آخر إيداع
- title: WebSub
topic: الموضوع
tags:
accounts: الحسابات
@@ -478,15 +500,20 @@ ar:
edit_preset: تعديل نموذج التحذير
title: إدارة نماذج التحذير
admin_mailer:
+ new_pending_account:
+ subject: حساب جديد في انتظار مراجعة على %{instance} (%{username})
new_report:
body: قام %{reporter} بالإبلاغ عن %{target}
body_remote: أبلغ شخص ما من %{domain} عن %{target}
subject: تقرير جديد ل%{instance} (#%{id})
+ appearance:
+ advanced_web_interface: واجهة الويب المتقدمة
+ confirmation_dialogs: نوافذ التأكيد
+ sensitive_content: محتوى حساس
application_mailer:
notification_preferences: تعديل خيارات البريد الإلكتروني
salutation: "%{name}،"
- settings: 'تغيير تفضيلات البريد الإلكتروني : %{link}'
- view: 'View:'
+ settings: 'تغيير تفضيلات البريد الإلكتروني: %{link}'
view_profile: عرض الملف الشخصي
view_status: عرض المنشور
applications:
@@ -495,10 +522,12 @@ ar:
invalid_url: إن الرابط المقدم غير صالح
regenerate_token: إعادة توليد رمز النفاذ
token_regenerated: تم إعادة إنشاء الرمز الوصول بنجاح
- warning: كن حذرا مع هذه البيانات. لا تقم أبدا بمشاركتها مع الآخَرين !
+ warning: كن حذرا مع هذه البيانات. لا تقم أبدا بمشاركتها مع الآخَرين!
your_token: رمز نفاذك
auth:
+ apply_for_account: اطلب دعوة
change_password: الكلمة السرية
+ checkbox_agreement_html: أوافق على قواعد الخادم و شروط الخدمة
confirm_email: تأكيد عنوان البريد الإلكتروني
delete_account: حذف حساب
delete_account_html: إن كنت ترغب في حذف حسابك يُمكنك المواصلة هنا. سوف يُطلَبُ منك التأكيد قبل الحذف.
@@ -507,23 +536,25 @@ ar:
invalid_reset_password_token: رمز إعادة تعيين كلمة المرور غير صالح أو منتهي الصلاحية. يرجى طلب واحد جديد.
login: تسجيل الدخول
logout: خروج
- migrate_account: الإنتقال إلى حساب آخر
+ migrate_account: الانتقال إلى حساب آخر
migrate_account_html: إن كنت ترغب في تحويل هذا الحساب نحو حساب آخَر، يُمكِنُك إعداده هنا.
or_log_in_with: أو قم بتسجيل الدخول بواسطة
providers:
cas: CAS
saml: SAML
register: إنشاء حساب
+ registration_closed: لا يقبل %{instance} استقبال أعضاء جدد
resend_confirmation: إعادة إرسال تعليمات التأكيد
reset_password: إعادة تعيين كلمة المرور
security: الأمان
set_new_password: إدخال كلمة مرور جديدة
+ trouble_logging_in: هل صادفتكم مشكلة في الولوج؟
authorize_follow:
already_following: أنت تتابع بالفعل هذا الحساب
error: يا للأسف، وقع هناك خطأ إثر عملية البحث عن الحساب عن بعد
- follow: إتبع
- follow_request: 'لقد قمت بإرسال طلب متابعة إلى :'
- following: 'مرحى ! أنت الآن تتبع :'
+ follow: اتبع
+ follow_request: 'لقد قمت بإرسال طلب متابعة إلى:'
+ following: 'مرحى! أنت الآن تتبع:'
post_follow:
close: أو يمكنك إغلاق هذه النافذة.
return: عرض الملف الشخصي للمستخدم
@@ -544,7 +575,7 @@ ar:
x_months: "%{count} شه"
x_seconds: "%{count}ث"
deletes:
- bad_password_msg: محاولة جيدة يا هاكرز ! كلمة السر خاطئة
+ bad_password_msg: محاولة جيدة يا هاكرز! كلمة السر خاطئة
confirm_password: قم بإدخال كلمتك السرية الحالية للتحقق من هويتك
proceed: حذف حساب
success_msg: تم حذف حسابك بنجاح
@@ -566,19 +597,21 @@ ar:
'404': إنّ الصفحة التي تبحث عنها لا وجود لها أصلا.
'410': إنّ الصفحة التي تبحث عنها لم تعد موجودة.
'422':
- content: فشل التحقق الآمن. ربما منعتَ كعكات الكوكيز ؟
+ content: فشل التحقق الآمن. ربما منعتَ كعكات الكوكيز؟
title: فشِل التحقق الآمن
'429': طلبات كثيرة جدا
'500':
content: نحن متأسفون، لقد حدث خطأ ما مِن جانبنا.
title: هذه الصفحة خاطئة
noscript_html: يرجى تفعيل الجافا سكريبت لاستخدام تطبيق الويب لماستدون، أو عِوض ذلك قوموا بتجريب إحدى التطبيقات الأصلية الدّاعمة لماستدون على منصّتكم.
+ existing_username_validator:
+ not_found_multiple: تعذر العثور على %{usernames}
exports:
archive_takeout:
date: التاريخ
download: تنزيل نسخة لحسابك
hint_html: بإمكانك طلب نسخة كاملة لـ كافة تبويقاتك و الوسائط التي قمت بنشرها. البيانات المُصدَّرة ستكون محفوظة على شكل نسق ActivityPub و باستطاعتك قراءتها بأي برنامج يدعم هذا النسق. يُمكنك طلب نسخة كل 7 أيام.
- in_progress: عملية جمع نسخة لبيانات حسابك جارية …
+ in_progress: عملية جمع نسخة لبيانات حسابك جارية...
request: طلب نسخة لحسابك
size: الحجم
blocks: قمت بحظر
@@ -608,11 +641,13 @@ ar:
title: إضافة عامل تصفية جديد
footer:
developers: المطورون
- more: المزيد …
+ more: المزيد…
resources: الموارد
generic:
- changes_saved_msg: تم حفظ التعديلات بنجاح !
+ all: الكل
+ changes_saved_msg: تم حفظ التعديلات بنجاح!
copy: نسخ
+ order_by: ترتيب بحسب
save_changes: حفظ التغييرات
validation_errors:
few: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
@@ -621,6 +656,17 @@ ar:
other: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
two: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
zero: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
+ identity_proofs:
+ active: نشط
+ authorize: نعم ، قم بترخيصه
+ authorize_connection_prompt: هل تريد ترخيص هذا الاتصال المشفّر؟
+ i_am_html: أنا %{username} على %{service}.
+ identity: الهوية
+ inactive: ليس نشطا
+ publicize_checkbox: 'وقم بتبويق هذا:'
+ publicize_toot: 'متحقق منه! أنا %{username} على %{service}: %{url}'
+ status: حالة التحقق
+ view_proof: عرض الدليل
imports:
modes:
merge: دمج
@@ -638,7 +684,7 @@ ar:
in_memoriam_html: في ذكرى.
invites:
delete: تعطيل
- expired: إنتهت صلاحيتها
+ expired: انتهت صلاحيتها
expires_in:
'1800': 30 دقيقة
'21600': 6 ساعات
@@ -648,14 +694,14 @@ ar:
'86400': يوم واحد
expires_in_prompt: أبدا
generate: توليد
- invited_by: 'تمت دعوتك من طرف :'
+ invited_by: 'تمت دعوتك من طرف:'
max_uses:
few: "%{count} استخدامات"
many: "%{count} استخدامات"
one: استخدام واحد
other: "%{count} استخدامات"
- two: استخدامات
- zero: استخدامات
+ two: "%{count} استخدامات"
+ zero: "%{count} استخدامات"
max_uses_prompt: بلا حدود
prompt: توليد و مشاركة روابط للسماح للآخَرين بالنفاذ إلى مثيل الخادوم هذا
table:
@@ -671,16 +717,16 @@ ar:
too_many: لا يمكن إرفاق أكثر من 4 ملفات
migrations:
acct: username@domain للحساب الجديد
- currently_redirecting: 'تم تحويل رابط ملفك الشخصي إلى :'
+ currently_redirecting: 'تم تحويل رابط ملفك الشخصي إلى:'
proceed: حفظ
- updated_msg: تم تحديث إعدادات ترحيل حسابك بنجاح !
+ updated_msg: تم تحديث إعدادات ترحيل حسابك بنجاح!
moderation:
title: الإشراف
notification_mailer:
digest:
action: معاينة كافة الإشعارات
- body: هذا هو مُلَخَّص الرسائل التي فاتتك وذلك منذ آخر زيارة لك في %{since}
- mention: "%{name} أشار إليك في :"
+ body: هذا هو مُلَخَّص الرسائل التي فاتتك وذلك منذ آخر زيارة لك في %{since}
+ mention: "%{name} أشار إليك في:"
new_followers_summary:
few: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
many: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
@@ -693,29 +739,29 @@ ar:
many: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
one: "إشعار واحد 1 منذ آخر زيارة لك لـ \U0001F418"
other: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
- two: "إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
- zero: "إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
- title: أثناء فترة غيابك …
+ two: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
+ zero: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
+ title: أثناء فترة غيابك...
favourite:
- body: 'أُعجب %{name} بمنشورك :'
+ body: 'أُعجب %{name} بمنشورك:'
subject: أُعجِب %{name} بمنشورك
title: مفضّلة جديدة
follow:
- body: "%{name} من متتبعيك الآن !"
+ body: "%{name} من متتبعيك الآن!"
subject: "%{name} من متتبعيك الآن"
title: متابِع جديد
follow_request:
action: إدارة طلبات المتابَعة
body: طلب %{name} متابعتك
- subject: 'متابع مُعلّق : %{name}'
+ subject: 'متابع مُعلّق: %{name}'
title: طلب متابَعة جديد
mention:
action: الرد
- body: 'أشار إليك %{name} في :'
+ body: 'أشار إليك %{name} في:'
subject: لقد قام %{name} بذِكرك
title: إشارة جديدة
reblog:
- body: 'قام %{name} بترقية منشورك :'
+ body: 'قام %{name} بترقية منشورك:'
subject: قام %{name} بترقية منشورك
title: ترقية جديدة
number:
@@ -723,29 +769,45 @@ ar:
decimal_units:
format: "%n%u"
units:
- billion: B
- million: M
+ billion: بل
+ million: ملي
quadrillion: كواد
thousand: ألف
- trillion: T
- unit: ''
+ trillion: ترل
pagination:
newer: الأحدَث
next: التالي
older: الأقدَم
prev: السابق
truncate: و
+ polls:
+ errors:
+ already_voted: لقد قمت بالتصويت على استطلاع الرأي هذا مِن قبل
+ duplicate_options: يحتوي على عناصر مكررة
+ duration_too_short: مبكّر جدا
+ expired: لقد انتهى استطلاع الرأي
preferences:
- languages: اللغات
other: إعدادات أخرى
- publishing: النشر
- web: الويب
+ posting_defaults: التفضيلات الافتراضية لنشر التبويقات
+ public_timelines: الخيوط الزمنية العامة
+ relationships:
+ activity: نشاط الحساب
+ dormant: في سبات
+ last_active: آخر نشاط
+ most_recent: الأحدث
+ moved: هاجر
+ primary: رئيسي
+ relationship: العلاقة
+ remove_selected_domains: احذف كافة المتابِعين القادمين مِن النطاقات المختارة
+ remove_selected_followers: احذف المتابِعين الذين قمت باختيارهم
+ remove_selected_follows: الغي متابعة المستخدمين الذين اخترتهم
+ status: حالة الحساب
remote_follow:
acct: قم بإدخال عنوان حسابك username@domain الذي من خلاله تود النشاط
missing_resource: تعذر العثور على رابط التحويل المطلوب الخاص بحسابك
no_account_html: أليس عندك حساب بعدُ ؟ يُمْكنك التسجيل مِن هنا
proceed: أكمل المتابعة
- prompt: 'إنك بصدد متابعة :'
+ prompt: 'إنك بصدد متابعة:'
remote_interaction:
favourite:
proceed: المواصلة إلى المفضلة
@@ -773,7 +835,7 @@ ar:
generic: متصفح مجهول
ie: إنترنت إكسبلورر
micro_messenger: مايكرو ميسنجر
- nokia: متصفح Nokia S40 Ovi
+ nokia: متصفح Nokia S40 Ovi
opera: أوبرا
otter: أوتر
phantom_js: فانتوم جي آس
@@ -783,7 +845,7 @@ ar:
weibo: وايبو
current_session: الجلسة الحالية
description: "%{browser} على %{platform}"
- explanation: ها هي قائمة مُتصفِّحات الويب التي تستخدِم حاليًا حساب ماستدون الخاص بك.
+ explanation: ها هي قائمة مُتصفِّحات الويب التي تستخدِم حاليًا حساب ماستدون الخاص بك.
ip: عنوان الإيبي
platforms:
adobe_air: أدوبي إيير
@@ -802,36 +864,44 @@ ar:
revoke_success: تم إبطال الجلسة بنجاح
title: الجلسات
settings:
+ account: الحساب
+ account_settings: إعدادات الحساب
+ appearance: المظهر
authorized_apps: التطبيقات المرخص لها
back: عودة إلى ماستدون
delete: حذف الحسابات
development: التطوير
edit_profile: تعديل الملف الشخصي
export: تصدير البيانات
- import: إستيراد
+ featured_tags: الوسوم الشائعة
+ identity_proofs: دلائل الهوية
+ import: استيراد
+ import_and_export: استيراد وتصدير
migrate: تهجير الحساب
notifications: الإخطارات
preferences: التفضيلات
+ profile: الملف الشخصي
+ relationships: المتابِعون والمتابَعون
two_factor_authentication: المُصادقة بخُطوَتَيْن
statuses:
attached:
- description: 'مُرفَق : %{attached}'
+ description: 'مُرفَق: %{attached}'
image:
few: "%{count} صور"
many: "%{count} صور"
one: صورة %{count}
other: "%{count} صور"
- two: صور
- zero: صور
+ two: "%{count} صورة"
+ zero: "%{count} صورة"
video:
few: "%{count} فيديوهات"
many: "%{count} فيديوهات"
one: فيديو %{count}
other: "%{count} فيديوهات"
- two: فيديوهات
- zero: فيديوهات
+ two: "%{count} فيديوهات"
+ zero: "%{count} فيديوهات"
boosted_from_html: تم إعادة ترقيته مِن %{acct_link}
- content_warning: 'تحذير عن المحتوى : %{warning}'
+ content_warning: 'تحذير عن المحتوى: %{warning}'
disallowed_hashtags:
few: 'يحتوي على وسوم غير مسموح بها: %{tags}'
many: 'يحتوي على وسوم غير مسموح بها: %{tags}'
@@ -840,18 +910,20 @@ ar:
two: 'يحتوي على وسوم غير مسموح بها: %{tags}'
zero: 'يحتوي على وسوم غير مسموح بها: %{tags}'
language_detection: اكتشاف اللغة تلقائيا
- open_in_web: إفتح في الويب
+ open_in_web: افتح في الويب
over_character_limit: تم تجاوز حد الـ %{max} حرف المسموح بها
pin_errors:
limit: لقد بلغت الحد الأقصى للتبويقات المدبسة
ownership: لا يمكن تدبيس تبويق نشره شخص آخر
private: لا يمكن تدبيس تبويق لم يُنشر للعامة
reblog: لا يمكن تثبيت ترقية
+ poll:
+ vote: صوّت
show_more: أظهر المزيد
sign_in_to_participate: قم بتسجيل الدخول للمشاركة في هذه المحادثة
- title: '%{name} : "%{quote}"'
+ title: '%{name}: "%{quote}"'
visibilities:
- private: إعرض فقط لمتتبعيك
+ private: اعرض فقط لمتتبعيك
private_long: إعرضه لمتتبعيك فقط
public: للعامة
public_long: يمكن للجميع رؤيته
@@ -864,13 +936,9 @@ ar:
terms:
title: شروط الخدمة وسياسة الخصوصية على %{instance}
themes:
- contrast: تباين عالٍ
- default: ماستدون
+ contrast: ماستدون (تباين عالٍ)
+ default: ماستدون (داكن)
mastodon-light: ماستدون (فاتح)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: قم بإدخال الرمز المُوَلّد عبر تطبيق المصادقة للتأكيد
description_html: في حال تفعيل المصادقة بخطوتين ، فتسجيل الدخول يتطلب منك أن يكون بحوزتك هاتفك النقال قصد توليد الرمز الذي سيتم إدخاله.
@@ -878,17 +946,17 @@ ar:
enable: تفعيل
enabled: نظام المصادقة بخطوتين مُفعَّل
enabled_success: تم تفعيل المصادقة بخطوتين بنجاح
- generate_recovery_codes: توليد رموز الإسترجاع
+ generate_recovery_codes: توليد رموز الاسترجاع
instructions_html: "قم بمسح رمز الكيو آر عبر Google Authenticator أو أي تطبيق TOTP على جهازك. من الآن فصاعدا سوف يقوم ذاك التطبيق بتوليد رموز يجب عليك إدخالها عند تسجيل الدخول."
- lost_recovery_codes: تُمكّنك رموز الإسترجاع الإحتاطية مِن استرجاع النفاذ إلى حسابك في حالة فقدان جهازك المحمول. إن ضاعت منك هذه الرموز فبإمكانك إعادة توليدها مِن هنا و إبطال الرموز القديمة.
- manual_instructions: 'في حالة تعذّر مسح رمز الكيو آر أو طُلب منك إدخال يدوي، يُمْكِنك إدخال هذا النص السري على التطبيق :'
- recovery_codes: النسخ الإحتياطي لرموز الإسترجاع
- recovery_codes_regenerated: تم إعادة توليد رموز الإسترجاع الإحتياطية بنجاح
+ lost_recovery_codes: تُمكّنك رموز الاسترجاع الاحتياطية مِن استرجاع النفاذ إلى حسابك في حالة فقدان جهازك المحمول. إن ضاعت منك هذه الرموز فبإمكانك إعادة توليدها مِن هنا و إبطال الرموز القديمة.
+ manual_instructions: 'في حالة تعذّر مسح رمز الكيو آر أو طُلب منك إدخال يدوي، يُمْكِنك إدخال هذا النص السري على التطبيق:'
+ recovery_codes: النسخ الاحتياطي لرموز الاسترجاع
+ recovery_codes_regenerated: تم إعادة توليد رموز الاسترجاع الاحتياطية بنجاح
setup: تنشيط
- wrong_code: الرمز الذي أدخلته غير صالح ! تحقق من صحة الوقت على الخادم و الجهاز ؟
+ wrong_code: الرمز الذي أدخلته غير صالح! تحقق من صحة الوقت على الخادم و الجهاز؟
user_mailer:
backup_ready:
- explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون. إنها متوفرة الآن للتنزيل !
+ explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون. إنها متوفرة الآن للتنزيل!
subject: نسخة بيانات حسابك جاهزة للتنزيل
title: المغادرة بأرشيف الحساب
warning:
@@ -903,27 +971,27 @@ ar:
suspend: الحساب مُعلَّق
welcome:
edit_profile_action: تهيئة الملف الشخصي
- edit_profile_step: يُمكنك·كي تخصيص ملفك الشخصي عن طريق تحميل صورة رمزية ورأسية و بتعديل إسمك·كي العلني وأكثر. و إن أردت·تي معاينة المتابِعين و المتابعات الجُدد قبيل السماح لهم·ن بمتابَعتك فيمكنك·كي تأمين حسابك·كي.
- explanation: ها هي بعض النصائح قبل بداية الإستخدام
+ edit_profile_step: يُمكنك·كي تخصيص ملفك الشخصي عن طريق تحميل صورة رمزية ورأسية و بتعديل اسمك·كي العلني وأكثر. و إن أردت·تي معاينة المتابِعين و المتابعات الجُدد قبيل السماح لهم·ن بمتابَعتك فيمكنك·كي تأمين حسابك·كي.
+ explanation: ها هي بعض النصائح قبل بداية الاستخدام
final_action: اشرَع في النشر
final_step: |-
- يمكنك الشروع في النشر في الحين ! حتى و إن لم كنت لا تمتلك متابِعين بعدُ، يمكن للآخرين الإطلاع على منشوراتك الموجهة للجمهور على الخيط المحلي أو إن قمت باستخدام وسوم.
- إبدأ بتقديم نفسك باستعمال وسم #introductions.
+ يمكنك الشروع في النشر في الحين! حتى و إن لم كنت لا تمتلك متابِعين بعدُ، يمكن للآخرين الإطلاع على منشوراتك الموجهة للجمهور على الخيط العام المحلي أو إن قمت باستخدام وسوم.
+ ابدأ بتقديم نفسك باستعمال وسم #introductions.
full_handle: عنوانك الكامل
full_handle_hint: هذا هو ما يجب تقديمه لأصدقائك قصد أن يكون بإمكانهم متابَعتك أو مُراسَلتك حتى و إن كانت حساباتهم على خوادم أخرى.
review_preferences_action: تعديل التفضيلات
subject: أهلًا بك على ماستدون
tip_federated_timeline: الخيط الزمني الفديرالي هو بمثابة شبه نظرة شاملة على شبكة ماستدون. غير أنه لا يشمل إلا على الأشخاص المتابَعين مِن طرف جيرانك و جاراتك، لذا فهذا الخيط لا يعكس كافة الشبكة برُمّتها.
- tip_following: أنت تتبع تلقائيا مديري و مديرات الخادم. للعثور على أشخاص مميزين أو قد تهمك حساباتهم بإمكانك الإطلاع على الخيوط المحلية و كذا الفدرالية.
- tip_local_timeline: الخيط الزمني المحلي هو بمثابة نظرة سريعة على الأشخاص المتواجدين على %{instance} يمكن اعتبارهم كجيرانك وجاراتك الأقرب إليك!
+ tip_following: أنت تتبع تلقائيا مديري و مديرات الخادم. للعثور على أشخاص مميزين أو قد تهمك حساباتهم بإمكانك الإطلاع على الخيوط العامة المحلية و كذا الفدرالية.
+ tip_local_timeline: الخيط العام المحلي هو بمثابة نظرة سريعة على الأشخاص المتواجدين على %{instance} يمكن اعتبارهم كجيرانك وجاراتك الأقرب إليك!
tips: نصائح
- title: أهلاً بك، %{name} !
+ title: أهلاً بك، %{name}!
users:
follow_limit_reached: لا يمكنك متابعة أكثر مِن %{limit} أشخاص
invalid_email: عنوان البريد الإلكتروني غير صالح
invalid_otp_token: رمز المصادقة بخطوتين غير صالح
- otp_lost_help_html: إن فقدتَهُما ، يمكنك الإتصال بـ %{email}
+ otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
- signed_in_as: 'تم تسجيل دخولك بصفة :'
+ signed_in_as: 'تم تسجيل دخولك بصفة:'
verification:
verification: التحقق
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 7a51be7cf..ec545ca57 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -4,7 +4,6 @@ ast:
about_mastodon_html: Mastodon ye una rede social basada en protocolos abiertos y software de códigu llibre. Ye descentralizada, como'l corréu electrónicu.
about_this: Tocante a
administered_by: 'Alministráu por:'
- api: API
contact: Contautu
contact_missing: Nun s'afitó
contact_unavailable: N/D
@@ -15,7 +14,6 @@ ast:
hosted_on: Mastodon ta agospiáu en %{domain}
learn_more: Deprendi más
source_code: Códigu fonte
- status_count_after: estaos
status_count_before: Que crearon
terms: Términos del serviciu
user_count_after:
@@ -33,10 +31,6 @@ ast:
nothing_here: "¡Equí nun hai nada!"
people_followed_by: Persones a les que sigue %{name}
people_who_follow: Persones que siguen a %{name}
- posts:
- one: Toot
- other: Toots
- posts_tab_heading: Toots
posts_with_replies: Toots y rempuestes
reserved_username: El nome d'usuariu ta acutáu
roles:
@@ -44,12 +38,10 @@ ast:
admin:
accounts:
are_you_sure: "¿De xuru?"
- avatar: Avatar
by_domain: Dominiu
domain: Dominiu
email: Corréu
followers: Siguidores
- ip: IP
location:
local: Llocal
title: Allugamientu
@@ -64,7 +56,6 @@ ast:
statuses: Estaos
title: Cuentes
username: Nome d'usuariu
- web: Web
action_logs:
actions:
create_domain_block: "%{name} bloquió'l dominiu %{target}"
@@ -81,7 +72,6 @@ ast:
features: Carauterístiques
hidden_service: Federación con servicios anubríos
recent_users: Usuarios recientes
- software: Software
total_users: usuarios en total
week_interactions: interaiciones d'esta selmana
week_users_new: usuarios d'esta selmana
@@ -111,14 +101,10 @@ ast:
title: Axustes del sitiu
statuses:
failed_to_execute: Fallu al executar
- subscriptions:
- title: WebSub
title: Alministración
admin_mailer:
new_report:
body_remote: Daquién dende %{domain} informó de %{target}
- application_mailer:
- salutation: "%{name},"
applications:
invalid_url: La URL apurrida nun ye válida
warning: Ten curiáu con estos datos, ¡enxamás nun los compartas con naide!
@@ -130,9 +116,6 @@ ast:
login: Aniciar sesión
migrate_account: Mudase a otra cuenta
migrate_account_html: Si deseyes redirixir esta cuenta a otra, pues configuralo equí.
- providers:
- cas: CAS
- saml: SAML
register: Rexistrase
security: Seguranza
authorize_follow:
@@ -162,6 +145,7 @@ ast:
content: Falló la verificación de seguranza. ¿Tas bloquiando les cookies?
title: Falló la verificación de seguranza
'429': Ficiéronse milenta solicitúes
+ '500':
exports:
archive_takeout:
date: Data
@@ -169,7 +153,6 @@ ast:
request: Solicitar l'archivu
size: Tamañu
blocks: Xente que bloquiesti
- csv: CSV
follows: Xente que sigues
mutes: Xente que silenciesti
filters:
@@ -223,8 +206,6 @@ ast:
digest:
body: Equí hai un resume de los mensaxes que nun viesti dende la última visita'l %{since}
mention: "%{name} mentóte en:"
- subject:
- other: "%{count} avisos nuevos dende la última visita \U0001F418"
follow:
body: "¡Agora %{name} ta siguiéndote!"
title: Siguidor nuevu
@@ -239,16 +220,8 @@ ast:
body: "%{name} compartió'l to estáu:"
subject: "%{name} compartió'l to estáu"
title: Compartición nueva de toot
- number:
- human:
- decimal_units:
- format: "%n%u"
pagination:
next: Siguiente
- preferences:
- languages: Llingües
- publishing: Espublización
- web: Web
remote_follow:
acct: Introduz el nome_usuariu@dominiu dende'l que lo quies facer
no_account_html: "¿Nun tienes una cuenta? Pues rexistrate equí"
@@ -259,38 +232,11 @@ ast:
sessions:
browser: Restolador
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Restolador desconocíu
- ie: Internet Explorer
- micro_messenger: MicroMessenger
- opera: Opera
- otter: Otter
- phantom_js: PhantomJS
- qq: QQ Browser
- safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Sesión actual
description: "%{browser} en %{platform}"
- 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: plataforma desconocida
- windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
title: Sesiones
settings:
authorized_apps: Aplicaciones autorizaes
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 57aa6f87e..e11340542 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -5,18 +5,14 @@ bg:
about_this: За тази инстанция
contact: За контакти
source_code: Програмен код
- status_count_after: публикации
status_count_before: Написали
- user_count_after: потребители
user_count_before: Дом на
accounts:
follow: Последвай
- followers: Последователи
following: Следва
nothing_here: Тук няма никого!
people_followed_by: Хора, които %{name} следва
people_who_follow: Хора, които следват %{name}
- posts: Публикации
unfollow: Не следвай
application_mailer:
settings: 'Промяна на предпочитанията за e-mail: %{link}'
@@ -51,15 +47,20 @@ bg:
x_minutes: "%{count} мин"
x_months: "%{count} м"
x_seconds: "%{count} сек"
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
exports:
blocks: Вашите блокирания
- csv: CSV
follows: Вашите следвания
storage: Съхранение на мултимедия
generic:
changes_saved_msg: Успешно запазване на промените!
save_changes: Запази промените
- validation_errors: Нещо все още не е наред! Моля, прегледай грешките по-долу
imports:
preface: Можеш да импортираш някои данни, като например всички хора, които следваш или блокираш в акаунта си на тази инстанция, от файлове, създадени чрез експорт в друга инстанция.
success: Твоите данни бяха успешно качени и ще бъдат обработени впоследствие
@@ -67,6 +68,14 @@ bg:
blocking: Списък на блокираните
following: Списък на последователите
upload: Качване
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
media_attachments:
validations:
images_and_video: Не мога да прикача видеоклип към публикация, която вече съдържа изображения
@@ -96,17 +105,6 @@ bg:
reblog:
body: 'Твоята публикация беше споделена от %{name}:'
subject: "%{name} сподели публикацията ти"
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
next: Напред
prev: Назад
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index b4eb012f5..b3eb0bd62 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -68,6 +68,7 @@ bn:
admin: পরিচালক
bot: রোবট
moderator: পরিচালক
+ unavailable: প্রোফাইল অনুপলব্ধ
unfollow: অনুসরণ বাদ
admin:
account_actions:
@@ -80,6 +81,7 @@ bn:
destroyed_msg: প্রশাসনবস্তুত লেখাটি সঠিকভাবে মুছে ফেলা হয়েছে!
accounts:
approve: অনুমোদন দিন
+ approve_all: প্রত্যেক কে অনুমতি দিন
are_you_sure: আপনি কি নিশ্চিত ?
avatar: অবতার
by_domain: ওয়েবসাইট/কার্যক্ষেত্র
@@ -137,5 +139,20 @@ bn:
outbox_url: চিঠি পাঠানোর বাক্স লিংক
pending: পয্র্যবেক্ষণের অপেক্ষায় আছে
perform_full_suspension: বাতিল করা
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
verification:
verification: সত্যতা নির্ধারণ
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 6169767da..a5d96cc1c 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -8,7 +8,7 @@ ca:
active_footnote: Usuaris actius mensuals (UAM)
administered_by: 'Administrat per:'
api: API
- apps: Apps mòbil
+ apps: Apps mòbils
apps_platforms: Utilitza Mastodon des de iOS, Android i altres plataformes
browse_directory: Navega per el directori de perfils i filtra segons interessos
browse_public_posts: Navega per una transmissió en directe de publicacions públiques a Mastodon
@@ -30,8 +30,8 @@ ca:
server_stats: 'Estadístiques del servidor:'
source_code: Codi font
status_count_after:
- one: estat
- other: estats
+ one: toot
+ other: toots
status_count_before: Que han escrit
tagline: Segueix els teus amics i descobreix-ne de nous
terms: Termes del servei
@@ -174,6 +174,7 @@ ca:
statuses: Estats
subscribe: Subscriu
suspended: Suspès
+ time_in_queue: Esperant en la cua %{time}
title: Comptes
unconfirmed_email: Correu electrònic sense confirmar
undo_silenced: Deixa de silenciar
@@ -209,7 +210,7 @@ ca:
resolve_report: "%{name} ha resolt l'informe %{target}"
silence_account: "%{name} ha silenciat el compte de %{target}"
suspend_account: "%{name} ha suspès el compte de %{target}"
- unassigned_report: "%{name} ha des-assignat l'informe %{target}"
+ unassigned_report: "%{name} ha des-assignat l'informe %{target}"
unsilence_account: "%{name} ha silenciat el compte de %{target}"
unsuspend_account: "%{name} ha llevat la suspensió del compte de %{target}"
update_custom_emoji: "%{name} ha actualitzat l'emoji %{target}"
@@ -269,6 +270,7 @@ ca:
created_msg: El bloqueig de domini ara s'està processant
destroyed_msg: El bloqueig de domini s'ha desfet
domain: Domini
+ existing_domain_block_html: Ja has imposat uns limits més estrictes a %{name}, l'hauries de desbloquejar-lo primer.
new:
create: Crea un bloqueig
hint: El bloqueig de domini no impedirà la creació de nous comptes en la base de dades, però s'aplicaran de manera retroactiva mètodes de moderació específics sobre aquests comptes.
@@ -497,6 +499,12 @@ ca:
body: "%{reporter} ha informat de %{target}"
body_remote: Algú des de el domini %{domain} ha informat sobre %{target}
subject: Informe nou per a %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Interfície web avançada
+ advanced_web_interface_hint: 'Si vols fer ús de tota l''amplada de la teva pantalla, l''interfície web avançada et permet configurar diverses columnes per a veure molta més informació al mateix temps: Inici, notificacions, línia de temps federada i qualsevol número de llistes i etiquetes.'
+ animations_and_accessibility: Animacions i accessibilitat
+ confirmation_dialogs: Diàlegs de confirmació
+ sensitive_content: Contingut sensible
application_mailer:
notification_preferences: Canvia les preferències de correu
salutation: "%{name},"
@@ -525,7 +533,7 @@ ca:
login: Inicia sessió
logout: Tanca sessió
migrate_account: Mou a un compte diferent
- migrate_account_html: Si vols redirigir aquest compte a un altre diferent, el pots configurar aquí.
+ migrate_account_html: Si vols redirigir aquest compte a un altre diferent, el pots configurar aquí.
or_log_in_with: O inicia sessió amb
providers:
cas: CAS
@@ -555,7 +563,7 @@ ca:
about_x_years: "%{count} anys"
almost_x_years: "%{count}anys"
half_a_minute: Ara mateix
- less_than_x_minutes: "%{count}m"
+ less_than_x_minutes: fa %{count} minuts
less_than_x_seconds: Ara mateix
over_x_years: "%{count} anys"
x_days: "%{count} dies"
@@ -655,7 +663,7 @@ ca:
invalid_token: Els tokens de Keybase són hashs de signatures i han de tenir 66 caràcters hexadecimals
verification_failed: Keybase no reconeix aquest token com a signatura del usuari de Keybase %{kb_username}. Si us plau prova des de Keybase.
wrong_user: No es pot crear una prova per a %{proving} mentre es connectava com a %{current}. Inicia sessió com a %{proving} i prova de nou.
- explanation_html: Aquí pots connectar criptogràficament les teves altres identitats com ara el teu perfil de Keybase. Això permet que altres persones t'envïin missatges xifrats i continguts de confiança que els hi enviess.
+ explanation_html: Aquí pots connectar criptogràficament les teves altres identitats com ara el teu perfil de Keybase. Això permet que altres persones t'envïin missatges xifrats i confiar en el contingut que els hi envies.
i_am_html: Sóc %{username} a %{service}.
identity: Identitat
inactive: Inactiu
@@ -675,7 +683,7 @@ ca:
blocking: Llista de blocats
domain_blocking: Llistat de dominis bloquejats
following: Llista de seguits
- muting: Llista d'apagats
+ muting: Llista de silenciats
upload: Carregar
in_memoriam_html: En Memòria.
invites:
@@ -758,7 +766,6 @@ ca:
quadrillion: Q
thousand: m
trillion: T
- unit: " "
pagination:
newer: Més recent
next: Endavant
@@ -768,7 +775,7 @@ ca:
polls:
errors:
already_voted: Ja has votat en aquesta enquesta
- duplicate_options: Conté opcions duplicades
+ duplicate_options: conté opcions duplicades
duration_too_long: està massa lluny en el futur
duration_too_short: és massa aviat
expired: L'enquesta ja ha finalitzat
@@ -776,10 +783,9 @@ ca:
too_few_options: ha de tenir més d'una opció
too_many_options: no pot contenir més de %{max} opcions
preferences:
- languages: Llengues
other: Altre
- publishing: Publicació
- web: Web
+ posting_defaults: Valors predeterminats de publicació
+ public_timelines: Línies de temps públiques
relationships:
activity: Activitat del compte
dormant: Inactiu
@@ -922,14 +928,14 @@ ca:
sensitive_content: Contingut sensible
terms:
body_html: |
-
Privacy Policy
+
Política de Privacitat
Quina informació recollim?
-
Informació bàsica del compte: Si et registres en aquest servidor, se´t pot demanar que introdueixis un nom d'usuari, una adreça de correu electrònic i una contrasenya. També pots introduir informació de perfil addicional, com ara un nom de visualització i una biografia, i carregar una imatge de perfil i de capçalera. El nom d'usuari, el nom de visualització, la biografia, la imatge de perfil i la imatge de capçalera sempre apareixen públicament.
-
Publicacions, seguiment i altra informació pública: La llista de persones que segueixes s'enumeren públicament i el mateix passa amb els teus seguidors. Quan envies un missatge, la data i l'hora s'emmagatzemen, així com l'aplicació que va enviar el missatge. Els missatges poden contenir multimèdia, com ara imatges i vídeos. Els toots públics i no llistats estan disponibles públicament. En quan tinguis un toot en el teu perfil, aquest també és informació pública. Les teves entrades es lliuren als teus seguidors que en alguns casos significa que es lliuren a diferents servidors en els quals s'hi emmagatzemen còpies. Quan suprimeixes publicacions, també es lliuraran als teus seguidors. L'acció d'impulsar o marcar com a favorit una publicació sempre és pública.
-
Toots directes i per a només seguidors: Totes les publicacions s'emmagatzemen i processen al servidor. Els toots per a només seguidors només es lliuren als teus seguidors i als usuaris que s'esmenten en ells i els toots directes només es lliuren als usuaris esmentats. En alguns casos, significa que es lliuren a diferents servidors i s'hi emmagatzemen còpies. Fem un esforç de bona fe per limitar l'accés a aquestes publicacions només a les persones autoritzades, però és possible que altres servidors no ho facin. Per tant, és important revisar els servidors als quals pertanyen els teus seguidors. Pots canviar la opció de aprovar o rebutjar els nous seguidors manualment a la configuració. Tingues en compte que els operadors del servidor i qualsevol servidor receptor poden visualitzar aquests missatges i els destinataris poden fer una captura de pantalla, copiar-los o tornar-los a compartir. No comparteixis cap informació perillosa a Mastodon.
-
IPs i altres metadades: Quan inicies sessió registrem l'adreça IP en que l'has iniciat, així com el nom de l'aplicació o navegador. Totes les sessions registrades estan disponibles per a la teva revisió i revocació a la configuració. L'última adreça IP utilitzada s'emmagatzema durant un màxim de 12 mesos. També podrem conservar els registres que inclouen l'adreça IP de cada sol·licitud al nostre servidor.
+
Informació bàsica del compte: Si et registres en aquest servidor, se´t pot demanar que introdueixis un nom d'usuari, una adreça de correu electrònic i una contrasenya. També pots introduir informació de perfil addicional, com ara un nom de visualització i una biografia, i carregar una imatge de perfil i de capçalera. El nom d'usuari, el nom de visualització, la biografia, la imatge de perfil i la imatge de capçalera sempre apareixen públicament.
+
Publicacions, seguiment i altra informació pública: La llista de persones que segueixes s'enumeren públicament i el mateix passa amb els teus seguidors. Quan envies un missatge, la data i l'hora s'emmagatzemen, així com l'aplicació que va enviar el missatge. Els missatges poden contenir multimèdia, com ara imatges i vídeos. Els toots públics i no llistats estan disponibles públicament. En quan tinguis un toot en el teu perfil, aquest també és informació pública. Les teves entrades es lliuren als teus seguidors que en alguns casos significa que es lliuren a diferents servidors en els quals s'hi emmagatzemen còpies. Quan suprimeixes publicacions, també es lliuraran als teus seguidors. L'acció d'impulsar o marcar com a favorit una publicació sempre és pública.
+
Toots directes i per a només seguidors: Totes les publicacions s'emmagatzemen i processen al servidor. Els toots per a només seguidors només es lliuren als teus seguidors i als usuaris que s'esmenten en ells i els toots directes només es lliuren als usuaris esmentats. En alguns casos, significa que es lliuren a diferents servidors i s'hi emmagatzemen còpies. Fem un esforç de bona fe per limitar l'accés a aquestes publicacions només a les persones autoritzades, però és possible que altres servidors no ho facin. Per tant, és important revisar els servidors als quals pertanyen els teus seguidors. Pots canviar la opció de aprovar o rebutjar els nous seguidors manualment a la configuració. Tingues en compte que els operadors del servidor i qualsevol servidor receptor poden visualitzar aquests missatges i els destinataris poden fer una captura de pantalla, copiar-los o tornar-los a compartir. No comparteixis cap informació perillosa a Mastodon.
+
IPs i altres metadades: Quan inicies sessió registrem l'adreça IP en que l'has iniciat, així com el nom de l'aplicació o navegador. Totes les sessions registrades estan disponibles per a la teva revisió i revocació a la configuració. L'última adreça IP utilitzada s'emmagatzema durant un màxim de 12 mesos. També podrem conservar els registres que inclouen l'adreça IP de cada sol·licitud al nostre servidor.
@@ -939,9 +945,9 @@ ca:
Qualsevol de la informació que recopilem de tu es pot utilitzar de la manera següent:
-
Per proporcionar la funcionalitat bàsica de Mastodon. Només pots interactuar amb el contingut d'altres persones i publicar el teu propi contingut quan hàgis iniciat la sessió. Per exemple, pots seguir altres persones per veure les publicacions combinades a la teva pròpia línia de temps personalitzada.
-
Per ajudar a la moderació de la comunitat, per exemple comparar la teva adreça IP amb altres conegudes per determinar l'evasió de prohibicions o altres infraccions.
-
L'adreça electrònica que ens proporciones pot utilitzar-se per enviar-te informació, notificacions sobre altres persones que interactuen amb el teu contingut o t'envien missatges, i per respondre a les consultes i / o altres sol·licituds o preguntes.
+
Per proporcionar la funcionalitat bàsica de Mastodon. Només pots interactuar amb el contingut d'altres persones i publicar el teu propi contingut quan hàgis iniciat la sessió. Per exemple, pots seguir altres persones per veure les publicacions combinades a la teva pròpia línia de temps personalitzada.
+
Per ajudar a la moderació de la comunitat, per exemple comparar la teva adreça IP amb altres conegudes per determinar l'evasió de prohibicions o altres infraccions.
+
L'adreça electrònica que ens proporciones pot utilitzar-se per enviar-te informació, notificacions sobre altres persones que interactuen amb el teu contingut o t'envien missatges, i per respondre a les consultes i / o altres sol·licituds o preguntes.
@@ -957,8 +963,8 @@ ca:
Farem un esforç de bona fe per:
-
Conservar els registres del servidor que continguin l'adreça IP de totes les sol·licituds que rebi, tenint em compte que aquests registres es mantenen no més de 90 dies.
-
Conservar les adreces IP associades als usuaris registrats no més de 12 mesos.
+
Conservar els registres del servidor que continguin l'adreça IP de totes les sol·licituds que rebi, tenint em compte que aquests registres es mantenen no més de 90 dies.
+
Conservar les adreces IP associades als usuaris registrats no més de 12 mesos.
Pots sol·licitar i descarregar un arxiu del teu contingut incloses les publicacions, els fitxers adjunts multimèdia, la imatge de perfil i la imatge de capçalera.
@@ -999,7 +1005,7 @@ ca:
Si decidim canviar la nostra política de privadesa, publicarem aquests canvis en aquesta pàgina.
-
Aquest document és CC-BY-SA. Actualitzat per darrera vegada el 7 de Març del 2018.
+
Aquest document és CC-BY-SA. Actualitzat per darrera vegada el 7 de Març del 2018.
title: "%{instance} Condicions del servei i política de privadesa"
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 8c1a13e54..b3d14fdb5 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -81,7 +81,7 @@ co:
destroyed_msg: Nota di muderazione sguassata!
accounts:
approve: Appruvà
- approve_all: Appruvà tutti
+ approve_all: Appruvà tuttu
are_you_sure: Site sicuru·a?
avatar: Ritrattu di prufile
by_domain: Duminiu
@@ -154,7 +154,7 @@ co:
already_confirmed: St’utilizatore hè digià cunfirmatu
send: Rimandà un’e-mail di cunfirmazione
success: L’e-mail di cunfirmazione hè statu mandatu!
- reset: Reset
+ reset: Riinizializà
reset_password: Riinizializà a chjave d’accessu
resubscribe: Riabbunassi
role: Auturizazione
@@ -174,6 +174,7 @@ co:
statuses: Statuti
subscribe: Abbunassi
suspended: Suspesu
+ time_in_queue: 'Attesa in fila: %{time}'
title: Conti
unconfirmed_email: E-mail micca cunfirmatu
undo_silenced: Ùn silenzà più
@@ -258,7 +259,7 @@ co:
single_user_mode: Modu utilizatore unicu
software: Lugiziale
space: Usu di u spaziu
- title: Dashboard
+ title: Quatru di strumenti
total_users: utilizatori in tutale
trends: Tindenze
week_interactions: interazzione sta settimana
@@ -293,8 +294,8 @@ co:
one: Un contu tuccatu indè a database
other: "%{count} conti tuccati indè a database"
retroactive:
- silence: Ùn silenzà più i conti nant’à stu duminiu
- suspend: Ùn suspende più i conti nant’à stu duminiu
+ silence: Ùn silenzà più i conti affettati di stu duminiu
+ suspend: Ùn suspende più i conti affettati di stu duminiu
title: Ùn bluccà più u duminiu %{domain}
undo: Annullà
undo: Annullà u blucchime di duminiu
@@ -498,6 +499,12 @@ co:
body: "%{reporter} hà palisatu %{target}"
body_remote: Qualch’unu da %{domain} hà palisatu %{target}
subject: Novu signalamentu nant’à %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Interfaccia web avanzata
+ advanced_web_interface_hint: 'S''è voi vulete fà usu di a larghezza sana di u vostru screnu, l''interfaccia web avanzata vi permette di cunfigurà parechje culonne sfarente per vede tutta l''infurmazione chì vulete vede in listessu tempu: Accolta, nutificazione, linea pubblica, è tutti l''hashtag è liste chì vulete.'
+ animations_and_accessibility: Animazione è accessibilità
+ confirmation_dialogs: Pop-up di cunfirmazione
+ sensitive_content: Cuntinutu sensibile
application_mailer:
notification_preferences: Cambià e priferenze e-mail
salutation: "%{name},"
@@ -551,17 +558,17 @@ co:
title: Siguità %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
- about_x_months: "%{count}mo"
- about_x_years: "%{count}y"
- almost_x_years: "%{count}y"
+ about_x_hours: "%{count}o"
+ about_x_months: "%{count}Me"
+ about_x_years: "%{count}A"
+ almost_x_years: "%{count}A"
half_a_minute: Avà
less_than_x_minutes: "%{count}m"
less_than_x_seconds: Avà
- over_x_years: "%{count}y"
- x_days: "%{count}d"
+ over_x_years: "%{count}A"
+ x_days: "%{count}ghj"
x_minutes: "%{count}m"
- x_months: "%{count}mo"
+ x_months: "%{count}Me"
x_seconds: "%{count}s"
deletes:
bad_password_msg: È nò! Sta chjave ùn hè curretta
@@ -759,7 +766,6 @@ co:
quadrillion: P
thousand: K
trillion: T
- unit: ''
pagination:
newer: Più ricente
next: Dopu
@@ -777,10 +783,9 @@ co:
too_few_options: deve avè più d'un'uzzione
too_many_options: ùn pò micca avè più di %{max} uzzione
preferences:
- languages: Lingue
other: Altre
- publishing: Pubblicazione
- web: Web
+ posting_defaults: Paramettri predefiniti
+ public_timelines: Linee pubbliche
relationships:
activity: Attività di u contu
dormant: Inattivu
@@ -877,6 +882,7 @@ co:
migrate: Migrazione di u contu
notifications: Nutificazione
preferences: Priferenze
+ profile: Prufile
relationships: Abbunamenti è abbunati
two_factor_authentication: Identificazione à dui fattori
statuses:
@@ -926,10 +932,10 @@ co:
Quelles informations collectons-nous ?
-
Informations de base sur votre compte : Si vous vous inscrivez sur ce serveur, il vous sera demandé de rentrer un identifiant, une adresse électronique et un mot de passe. Vous pourrez également ajouter des informations additionnelles sur votre profil, telles qu’un nom public et une biographie, ainsi que téléverser une image de profil et une image d’en-tête. Vos identifiant, nom public, biographie, image de profil et image d’en-tête seront toujours affichés publiquement.
+
Informations de base sur votre compte : Si vous vous inscrivez sur ce serveur, il vous sera demandé de rentrer un identifiant, une adresse électronique et un mot de passe. Vous pourrez également ajouter des informations additionnelles sur votre profil, telles qu’un nom public et une biographie, ainsi que téléverser une image de profil et une image d’en-tête. Vos identifiant, nom public, biographie, image de profil et image d’en-tête seront toujours affichés publiquement.
Posts, liste d’abonnements et autres informations publiques : La liste de vos abonnements ainsi que la liste de vos abonné·e·s sont publiques. Quand vous postez un message, la date et l’heure d’envoi ainsi que le nom de l’application utilisée pour sa transmission sont enregistré·e·s. Des médias, tels que des images ou des vidéos, peuvent être joints aux messages. Les posts publics et non listés sont affichés publiquement. Quand vous mettez en avant un post sur votre profil, ce post est également affiché publiquement. Vos messages sont délivrés à vos abonné·e·s, ce qui, dans certains cas, signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Quand vous supprimer un post, il est probable que vos abonné·e·s en soient informé·e·s. Partager un message ou le marquer comme favori est toujours une action publique.
-
Posts directs et abonné·e·s uniquement : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne fois pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. Gardez s’il-vous-plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. Ne partager aucune information sensible à l’aide de Mastodon.
-
IP et autres métadonnées : Quand vous vous connectez, nous enregistrons votre adresse IP ainsi que le nom de votre navigateur web. Toutes les sessions enregistrées peuvent être consultées dans les paramètres, afin que vous puissiez les surveiller et éventuellement les révoquer. La dernière adresse IP utilisée est conservée pour une durée de 12 mois. Nous sommes également susceptibles de conserver les journaux du serveur, ce qui inclut l’adresse IP de chaque requête reçue.
+
Posts directs et abonné·e·s uniquement : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne fois pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. Gardez s’il-vous-plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. Ne partager aucune information sensible à l’aide de Mastodon.
+
IP et autres métadonnées : Quand vous vous connectez, nous enregistrons votre adresse IP ainsi que le nom de votre navigateur web. Toutes les sessions enregistrées peuvent être consultées dans les paramètres, afin que vous puissiez les surveiller et éventuellement les révoquer. La dernière adresse IP utilisée est conservée pour une durée de 12 mois. Nous sommes également susceptibles de conserver les journaux du serveur, ce qui inclut l’adresse IP de chaque requête reçue.
@@ -939,9 +945,9 @@ co:
Toutes les informations que nous collectons sur vous peuvent être utilisées d’une des manières suivantes :
-
Pour vous fournir les fonctionnalités de base de Mastodon. Vous ne pouvez interagir avec le contenu des autres et poster votre propre contenu que lorsque vous êtes connecté·e. Par exemple, vous pouvez vous abonner à plusieurs autres comptes pour voir l’ensemble de leurs posts dans votre fil d’accueil personnalisé.
-
Pour aider à la modération de la communauté, par exemple, comparer votre adresse IP à d’autres afin de déterminer si un bannissement a été contourné ou si une autre violation aux règles a été commise.
-
L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyez des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour tout autres requêtes ou questions.
+
Pour vous fournir les fonctionnalités de base de Mastodon. Vous ne pouvez interagir avec le contenu des autres et poster votre propre contenu que lorsque vous êtes connecté·e. Par exemple, vous pouvez vous abonner à plusieurs autres comptes pour voir l’ensemble de leurs posts dans votre fil d’accueil personnalisé.
+
Pour aider à la modération de la communauté, par exemple, comparer votre adresse IP à d’autres afin de déterminer si un bannissement a été contourné ou si une autre violation aux règles a été commise.
+
L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyez des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour tout autres requêtes ou questions.
@@ -957,8 +963,8 @@ co:
Nous ferons un effort de bonne foi :
-
Pour ne pas conserver plus de 90 jours les journaux systèmes contenant les adresses IP de toutes les requêtes reçues par ce serveur.
-
Pour ne pas conserver plus de 12 mois les adresses IP associées aux utilisateur·ice·s enregistré·e·s.
+
Pour ne pas conserver plus de 90 jours les journaux systèmes contenant les adresses IP de toutes les requêtes reçues par ce serveur.
+
Pour ne pas conserver plus de 12 mois les adresses IP associées aux utilisateur·ice·s enregistré·e·s.
Vous pouvez demander une archive de votre contenu, incluant vos posts, vos médias joints, votre image de profil et votre image d’en-tête.
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5d05a13d6..0735a8698 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -31,6 +31,7 @@ cs:
source_code: Zdrojový kód
status_count_after:
few: tooty
+ many: tootů
one: toot
other: tootů
status_count_before: Kteří napsali
@@ -38,6 +39,7 @@ cs:
terms: Podmínky používání
user_count_after:
few: uživatelé
+ many: uživatelů
one: uživatel
other: uživatelů
user_count_before: Domov
@@ -47,6 +49,7 @@ cs:
follow: Sledovat
followers:
few: Sledující
+ many: Sledujících
one: Sledující
other: Sledujících
following: Sledovaných
@@ -63,6 +66,7 @@ cs:
following: Musíte již sledovat osobu, kterou chcete podpořit
posts:
few: Tooty
+ many: Tootů
one: Toot
other: Tootů
posts_tab_heading: Tooty
@@ -118,7 +122,7 @@ cs:
header: Záhlaví
inbox_url: URL příchozí schránky
invited_by: Pozván/a uživatelem
- ip: IP
+ ip: IP adresa
joined: Připojil/a se
location:
all: Všechny
@@ -178,6 +182,7 @@ cs:
statuses: Tooty
subscribe: Odebírat
suspended: Pozastaven/a
+ time_in_queue: Čeká ve frontě %{time}
title: Účty
unconfirmed_email: Nepotvrzený e-mail
undo_silenced: Zrušit utišení
@@ -295,11 +300,12 @@ cs:
show:
affected_accounts:
few: "%{count} účty v databázi byly ovlivněny"
+ many: "%{count} účtů v databázi bylo ovlivněno"
one: Jeden účet v databázi byl ovlivněn
other: "%{count} účtů v databázi bylo ovlivněno"
retroactive:
- silence: Odtišit všechny existující účty z této domény
- suspend: Zrušit pozastavení všech existujících účtů z této domény
+ silence: Odtišit existující ovlivněné účty z této domény
+ suspend: Zrušit pozastavení existujících ovlivněných účtů z této domény
title: Zrušit blokaci domény %{domain}
undo: Odvolat
undo: Odvolat blokaci domény
@@ -321,6 +327,7 @@ cs:
delivery_available: Doručení je k dispozici
known_accounts:
few: "%{count} známé účty"
+ many: "%{count} známých účtů"
one: "%{count} známý účet"
other: "%{count} známých účtů"
moderation:
@@ -504,6 +511,12 @@ cs:
body: "%{reporter} nahlásil/a uživatele %{target}"
body_remote: Někdo z %{domain} nahlásil uživatele %{target}
subject: Nové nahlášení pro %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Pokročilé webové rozhraní
+ advanced_web_interface_hint: 'Chcete-li využít celé šířky vaší obrazovky, dovolí vám pokročilé webové rozhraní nastavit si mnoho různých sloupců, takže můžete vidět ve stejnou chvíli tolik informací, kolik chcete: domovskou časovou osu, oznámení, federovanou časovou osu a libovolný počet seznamů a hashtagů.'
+ animations_and_accessibility: Animace a přístupnost
+ confirmation_dialogs: Potvrzovací dialogy
+ sensitive_content: Citlivý obsah
application_mailer:
notification_preferences: Změnit volby e-mailu
salutation: "%{name},"
@@ -586,6 +599,7 @@ cs:
how_to_enable: Aktuálně nejste přihlášen/a do adresáře. Přihlásit se můžete níže. Použijte ve svém popisu profilu hashtagy, abyste mohl/a být uveden/a pod konkrétními hashtagy!
people:
few: "%{count} lidé"
+ many: "%{count} lidí"
one: "%{count} člověk"
other: "%{count} lidí"
errors:
@@ -650,6 +664,7 @@ cs:
save_changes: Uložit změny
validation_errors:
few: Něco ještě není úplně v pořádku! Prosím zkontrolujte %{count} chyby níže
+ many: Něco ještě není úplně v pořádku! Prosím zkontrolujte %{count} chyb níže
one: Něco ještě není úplně v pořádku! Prosím zkontrolujte chybu níže
other: Něco ještě není úplně v pořádku! Prosím zkontrolujte %{count} chyb níže
html_validator:
@@ -702,6 +717,7 @@ cs:
invited_by: 'Byl/a jste pozván/a uživatelem:'
max_uses:
few: "%{count} použití"
+ many: "%{count} použití"
one: 1 použití
other: "%{count} použití"
max_uses_prompt: Bez limitu
@@ -731,10 +747,12 @@ cs:
mention: "%{name} vás zmínil/a v:"
new_followers_summary:
few: Navíc jste získal/a %{count} nové sledující, zatímco jste byl/a pryč! Skvělé!
+ many: Navíc jste získal/a %{count} nových sledujících, zatímco jste byl/a pryč! Úžasné!
one: Navíc jste získal/a jednoho nového sledujícího, zatímco jste byl/a pryč! Hurá!
other: Navíc jste získal/a %{count} nových sledujících, zatímco jste byl/a pryč! Úžasné!
subject:
few: "%{count} nová oznámení od vaší poslední návštěvy \U0001F418"
+ many: "%{count} nových oznámení od vaší poslední návštěvy \U0001F418"
one: "1 nové oznámení od vaší poslední návštěvy \U0001F418"
other: "%{count} nových oznámení od vaší poslední návštěvy \U0001F418"
title: Ve vaší nepřítomnosti…
@@ -770,7 +788,6 @@ cs:
quadrillion: bld
thousand: tis
trillion: bil
- unit: ''
pagination:
newer: Novější
next: Další
@@ -788,10 +805,9 @@ cs:
too_few_options: musí mít více než jednu položku
too_many_options: nesmí obsahovat více než %{max} položky
preferences:
- languages: Jazyky
other: Ostatní
- publishing: Publikování
- web: Web
+ posting_defaults: Výchozí možnosti psaní
+ public_timelines: Veřejné časové osy
relationships:
activity: Aktivita účtu
dormant: Nečinné
@@ -854,7 +870,7 @@ cs:
current_session: Aktuální relace
description: "%{browser} na %{platform}"
explanation: Tohle jsou webové prohlížeče aktuálně přihlášené na váš účet Mastodon.
- ip: IP
+ ip: IP adresa
platforms:
adobe_air: Adobe Air
android: Androidu
@@ -896,16 +912,19 @@ cs:
description: 'Přiloženo: %{attached}'
image:
few: "%{count} obrázky"
+ many: "%{count} obrázků"
one: "%{count} obrázek"
other: "%{count} obrázků"
video:
few: "%{count} videa"
+ many: "%{count} videí"
one: "%{count} video"
other: "%{count} videí"
boosted_from_html: Boostnuto z %{acct_link}
content_warning: 'Varování o obsahu: %{warning}'
disallowed_hashtags:
few: 'obsahoval nepovolené hashtagy: %{tags}'
+ many: 'obsahoval nepovolené hashtagy: %{tags}'
one: 'obsahoval nepovolený hashtag: %{tags}'
other: 'obsahoval nepovolené hashtagy: %{tags}'
language_detection: Zjistit jazyk automaticky
@@ -919,6 +938,7 @@ cs:
poll:
total_votes:
few: "%{count} hlasy"
+ many: "%{count} hlasů"
one: "%{count} hlas"
other: "%{count} hlasů"
vote: Hlasovat
@@ -942,10 +962,10 @@ cs:
Jaké informace sbíráme?
-
Základní informace o účtu: Pokud se na tomto serveru zaregistrujete, můžeme vás požádat o zadání uživatelského jména, e-mailové adresy a hesla. Můžete také zadat dodatečné profilové informace, jako například zobrazované jméno a krátký životopis, a nahrát si profilovou fotografii a obrázek záhlaví. Uživatelské i zobrazované jméno, životopis, profilová fotografie a obrázek záhlaví jsou vždy uvedeny veřejně.
-
Příspěvky, sledující a další veřejné informace: Seznam lidí, které sledujete, je uveden veřejně, totéž platí i pro vaše sledující. Když sem nahrajete zprávu, bude uloženo datum a čas, společně s aplikací, ze které jste zprávu odeslali. Zprávy mohou obsahovat mediální přílohy, jako jsou obrázky a videa. Veřejné a neuvedené příspěvky jsou dostupné veřejně. Pokud na vašem profilu uvedete příspěvek, je to také veřejně dostupná informace. Vaše příspěvky jsou doručeny vašim sledujícím, což v některých případech znamená, že budou doručeny na různé servery, na kterých budou ukládány kopie. Pokud příspěvky smažete, bude tohle taktéž doručeno vašim sledujícím. Akce znovusdílení nebo oblíbení jiného příspěvku je vždy veřejná.
-
Příspěvky přímé a pouze pro sledující: Všechny příspěvky jsou uloženy a zpracovány na serveru. Příspěvky pouze pro sledující jsou doručeny vašim sledujícím a uživatelům v nich zmíněným a přímé příspěvky jsou doručeny pouze uživatelům v nich zmíněným. V některých případech tohle znamená, že budou doručeny na různé servery, na kterých budou ukládány kopie. Upřímně se snažíme omezit přístup k těmto příspěvkům pouze na autorizované uživatele, ovšem jiné servery tak nemusejí učinit. Proto je důležité posoudit servery, ke kterým vaši sledující patří. V nastavení si můžete zapnout volbu pro manuální schvalování či odmítnutí nových sledujících. Prosím mějte na paměti, že operátoři tohoto serveru a kteréhokoliv přijímacího serveru mohou tyto zprávy vidět a příjemci mohou vytvořit jejich snímek, zkopírovat je, nebo je jinak sdílet. Nesdílejte přes Mastodon jakékoliv nebezpečné informace.
-
IP adresy a další metadata: Když se přihlásíte, zaznamenáváme IP adresu, ze které se přihlašujete, jakožto i název vašeho webového prohlížeče. Všechny vaše webové relace jsou v nastavení přístupné k vašemu posouzení a odvolání. Nejpozdější IP adresa použita je uložena maximálně do 12 měsíců. Můžeme také uchovávat serverové záznamy, které obsahují IP adresy každého požadavku odeslaného na náš server.
+
Základní informace o účtu: Pokud se na tomto serveru zaregistrujete, můžeme vás požádat o zadání uživatelského jména, e-mailové adresy a hesla. Můžete také zadat dodatečné profilové informace, jako například zobrazované jméno a krátký životopis, a nahrát si profilovou fotografii a obrázek záhlaví. Uživatelské i zobrazované jméno, životopis, profilová fotografie a obrázek záhlaví jsou vždy uvedeny veřejně.
+
Příspěvky, sledující a další veřejné informace: Seznam lidí, které sledujete, je uveden veřejně, totéž platí i pro vaše sledující. Když sem nahrajete zprávu, bude uloženo datum a čas, společně s aplikací, ze které jste zprávu odeslali. Zprávy mohou obsahovat mediální přílohy, jako jsou obrázky a videa. Veřejné a neuvedené příspěvky jsou dostupné veřejně. Pokud na vašem profilu uvedete příspěvek, je to také veřejně dostupná informace. Vaše příspěvky jsou doručeny vašim sledujícím, což v některých případech znamená, že budou doručeny na různé servery, na kterých budou ukládány kopie. Pokud příspěvky smažete, bude tohle taktéž doručeno vašim sledujícím. Akce znovusdílení nebo oblíbení jiného příspěvku je vždy veřejná.
+
Příspěvky přímé a pouze pro sledující: Všechny příspěvky jsou uloženy a zpracovány na serveru. Příspěvky pouze pro sledující jsou doručeny vašim sledujícím a uživatelům v nich zmíněným a přímé příspěvky jsou doručeny pouze uživatelům v nich zmíněným. V některých případech tohle znamená, že budou doručeny na různé servery, na kterých budou ukládány kopie. Upřímně se snažíme omezit přístup k těmto příspěvkům pouze na autorizované uživatele, ovšem jiné servery tak nemusejí učinit. Proto je důležité posoudit servery, ke kterým vaši sledující patří. V nastavení si můžete zapnout volbu pro manuální schvalování či odmítnutí nových sledujících. Prosím mějte na paměti, že operátoři tohoto serveru a kteréhokoliv přijímacího serveru mohou tyto zprávy vidět a příjemci mohou vytvořit jejich snímek, zkopírovat je, nebo je jinak sdílet. Nesdílejte přes Mastodon jakékoliv nebezpečné informace.
+
IP adresy a další metadata: Když se přihlásíte, zaznamenáváme IP adresu, ze které se přihlašujete, jakožto i název vašeho webového prohlížeče. Všechny vaše webové relace jsou v nastavení přístupné k vašemu posouzení a odvolání. Nejpozdější IP adresa použita je uložena maximálně do 12 měsíců. Můžeme také uchovávat serverové záznamy, které obsahují IP adresy každého požadavku odeslaného na náš server.
@@ -955,9 +975,9 @@ cs:
Jakékoliv informace, které sbíráme, mohou být použity následujícími způsoby:
-
K poskytnutí základních funkcí Mastodonu. Interagovat s obsahem od jiných lidí a přispívat svým vlastním obsahem můžete pouze, pokud jste přihlášeni. Můžete například sledovat jiné lidi a zobrazit si jejich kombinované příspěvky ve vaší vlastní personalizované časové ose.
-
Pro pomoc moderování komunity, například porovnáním vaší IP adresy s dalšími známými adresami pro určení vyhýbání se zákazům či jiných přestupků.
-
E-mailová adresa, kterou nám poskytnete, může být použita pro zasílání informací, oznámení o interakcích jiných uživatelů s vaším obsahem nebo přijatých zprávách a k odpovědím na dotazy a/nebo další požadavky či otázky.
+
K poskytnutí základních funkcí Mastodonu. Interagovat s obsahem od jiných lidí a přispívat svým vlastním obsahem můžete pouze, pokud jste přihlášeni. Můžete například sledovat jiné lidi a zobrazit si jejich kombinované příspěvky ve vaší vlastní personalizované časové ose.
+
Pro pomoc moderování komunity, například porovnáním vaší IP adresy s dalšími známými adresami pro určení vyhýbání se zákazům či jiných přestupků.
+
E-mailová adresa, kterou nám poskytnete, může být použita pro zasílání informací, oznámení o interakcích jiných uživatelů s vaším obsahem nebo přijatých zprávách a k odpovědím na dotazy a/nebo další požadavky či otázky.
@@ -973,8 +993,8 @@ cs:
Budeme se upřímně snažit:
-
Uchovávat serverové záznamy obsahující IP adresy všech požadavků pro tento server, pokud se takové záznamy uchovávají, maximálně 90 dní.
-
Uchovávat IP adresy související s registrovanými uživateli maximálně 12 měsíců.
+
Uchovávat serverové záznamy obsahující IP adresy všech požadavků pro tento server, pokud se takové záznamy uchovávají, maximálně 90 dní.
+
Uchovávat IP adresy související s registrovanými uživateli maximálně 12 měsíců.
Kdykoliv si můžete vyžádat a stáhnout archiv vašeho obsahu, včetně vašich příspěvků, mediálních příloh, profilové fotografie a obrázku záhlaví.
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index f365f7173..080e89214 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -4,20 +4,30 @@ cy:
about_hashtag_html: Dyma dŵtiau cyhoeddus wedi eu tagio gyda #%{hashtag}. Gallwch ryngweithio gyda nhw os oes gennych gyfrif yn unrhyw le yn y ffeddysawd.
about_mastodon_html: Mae Mastodon yn rwydwaith cymdeithasol sy'n seiliedig ar brotocolau gwe a meddalwedd cod agored rhad ac am ddim. Yn debyg i e-bost mae'n ddatganoledig.
about_this: Ynghylch
+ active_count_after: yn weithredol
+ active_footnote: Defnyddwyr Gweithredol Misol (DGM)
administered_by: 'Gweinyddir gan:'
api: API
apps: Apiau symudol
+ apps_platforms: Defnyddio Mastodon o iOS, Android a phlatfformau eraill
+ browse_directory: Pori cyfeiriadur proffil a hidlo wrth diddordebau
+ browse_public_posts: Pori ffrwd byw o byst cyhoeddus ar Fastodon
contact: Cyswllt
contact_missing: Heb ei osod
contact_unavailable: Ddim yn berthnasol
+ discover_users: Darganfod defnyddwyr
documentation: Dogfennaeth
extended_description_html: |
Lle da ar gyfer rheolau
Nid yw'r disgrifiad estynedig wedi ei osod eto.
+ federation_hint_html: Gyda cyfrif ar %{instance}, gallwch dilyn pobl ar unrhyw gweinydd Mastodon, a thu hwnt.
generic_description: Mae %{domain} yn un gweinydd yn y rhwydwaith
+ get_apps: Rhowch gynnig ar ap dyfeis symudol
hosted_on: Mastodon wedi ei weinyddu ar %{domain}
learn_more: Dysu mwy
privacy_policy: Polisi preifatrwydd
+ see_whats_happening: Gweld beth sy'n digwydd
+ server_stats: 'Ystadegau gweinydd:'
source_code: Cod ffynhonnell
status_count_after:
few: statwsau
@@ -27,6 +37,7 @@ cy:
two: statwsau
zero: statwsau
status_count_before: Ysgriffennwyd gan
+ tagline: Dilyn ffrindiau a darganfod rhai newydd
terms: Telerau gwasanaeth
user_count_after:
few: defnyddwyr
@@ -73,17 +84,20 @@ cy:
admin: Gweinyddwr
bot: Bot
moderator: Safonwr
+ unavailable: Proffil ddim ar gael
unfollow: Dad-ddilyn
admin:
account_actions:
action: Cyflawni gweithred
- title: Perfformio cymedroli ar %{acct}
+ title: Perfformio gweithrediad goruwchwylio ar %{acct}
account_moderation_notes:
create: Gadael nodyn
- created_msg: Crewyd nodyn cymedroli yn llwyddiannus!
+ created_msg: Crewyd nodyn goruwchwylio yn llwyddiannus!
delete: Dileu
- destroyed_msg: Dinistrwyd nodyn cymedroli yn llwyddiannus!
+ destroyed_msg: Dinistrwyd nodyn goruwchwylio yn llwyddiannus!
accounts:
+ approve: Cymeradwyo
+ approve_all: Cymeradwyo pob un
are_you_sure: Ydych chi'n siŵr?
avatar: Afatar
by_domain: Parth
@@ -129,22 +143,27 @@ cy:
moderation:
active: Yn weithredol
all: Popeth
+ pending: Yn aros
silenced: Wedi ei dawelu
suspended: Wedi ei atal
- title: Cymedroli
- moderation_notes: Nodiadau cymedroli
+ title: Goruwchwyliad
+ moderation_notes: Nodiadau goruwchwylio
most_recent_activity: Gweithgarwch diweddaraf
most_recent_ip: IP diweddaraf
+ no_account_selected: Ni newidwyd dim cyfrif achos ni ddewiswyd dim un
no_limits_imposed: Dim terfynau wedi'i gosod
not_subscribed: Heb danysgrifio
outbox_url: Allflwch URL
+ pending: Yn aros am adolygiad
perform_full_suspension: Atal
profile_url: URL proffil
promote: Hyrwyddo
protocol: Protocol
public: Cyhoeddus
- push_subscription_expires: Tanysgrifiad PuSH yn dod i ben
+ push_subscription_expires: Tanysgrifiad gwthiadwy yn dod i ben
redownload: Adnewyddu proffil
+ reject: Gwrthod
+ reject_all: Gwrthod pob un
remove_avatar: Dileu afatar
remove_header: Dileu pennawd
resend_confirmation:
@@ -157,7 +176,7 @@ cy:
role: Caniatâd
roles:
admin: Gweinyddwr
- moderator: Safonwr
+ moderator: Aroglygydd
staff: Staff
user: Defnyddiwr
salmon_url: URL Eog
@@ -171,6 +190,7 @@ cy:
statuses: Statysau
subscribe: Tanysgrifio
suspended: Ataliwyd
+ time_in_queue: Yn aros yn y rhestr am %{time}
title: Cyfrifon
unconfirmed_email: E-bost heb ei gadarnhau
undo_silenced: Dadwneud tawelu
@@ -246,6 +266,7 @@ cy:
feature_profile_directory: Cyfeiriadur proffil
feature_registrations: Cofrestriadau
feature_relay: Relái ffederasiwn
+ feature_timeline_preview: Rhagolwg o'r ffrwd
features: Nodweddion
hidden_service: Ffederasiwn a gwasanaethau cudd
open_reports: adroddiadau agored
@@ -265,9 +286,10 @@ cy:
created_msg: Mae'r bloc parth nawr yn cael ei brosesu
destroyed_msg: Mae'r bloc parth wedi ei ddadwneud
domain: Parth
+ existing_domain_block_html: Rydych yn barod wedi gosod cyfyngau fwy llym ar %{name}, mae rhaid i chi ei ddadblocio yn gyntaf.
new:
create: Creu bloc
- hint: Ni fydd y bloc parth yn atal cread cofnodion cyfrif yn y bas data, ond mi fydd yn gosod dulliau cymedroli penodol ôl-weithredol ac awtomatig ar y cyfrifau hynny.
+ hint: Ni fydd y bloc parth yn atal cread cofnodion cyfrif yn y bas data, ond mi fydd yn gosod dulliau goruwchwylio penodol ôl-weithredol ac awtomatig ar y cyfrifau hynny.
severity:
desc_html: Mae Tawelu yn gwneud twtiau y cyfrif yn anweledig i unrhyw un nad yw'n dilyn y cyfrif. Mae Atal yn cael gwared ar holl gynnwys, cyfryngau a data proffil y cyfrif. Defnyddiwch Dim os ydych chi ond am wrthod dogfennau cyfryngau.
noop: Dim
@@ -323,7 +345,7 @@ cy:
moderation:
all: Pob
limited: Gyfyngedig
- title: Cymedroli
+ title: Goruwchwyliad
title: Ffederasiwn
total_blocked_by_us: Wedi'i bloc gan ni
total_followed_by_them: Yn dilyn ganynt
@@ -338,6 +360,8 @@ cy:
expired: Wedi dod i ben
title: Hidlo
title: Gwahoddiadau
+ pending_accounts:
+ title: Cyfrifau yn aros (%{count})
relays:
add_new: Ychwanegau relái newydd
delete: Dileu
@@ -363,7 +387,7 @@ cy:
action_taken_by: Gwnaethpwyd hyn gan
are_you_sure: Ydych chi'n sicr?
assign_to_self: Aseinio i mi
- assigned: Cymedrolwr wedi'i aseinio
+ assigned: Arolygwr wedi'i aseinio
comment:
none: Dim
created_at: Adroddwyd
@@ -424,6 +448,12 @@ cy:
min_invite_role:
disabled: Neb
title: Caniatau gwahoddiadau gan
+ registrations_mode:
+ modes:
+ approved: Mae angen cymeradwyaeth ar gyfer cofrestru
+ none: Ni all unrhyw un cofrestru
+ open: Gall unrhyw un cofrestru
+ title: Modd cofrestriadau
show_known_fediverse_at_about_page:
desc_html: Wedi'i ddewis, bydd yn dangos rhagolwg o dŵtiau o'r holl ffedysawd. Fel arall bydd ond yn dangos tŵtiau lleol.
title: Dangos ffedysawd hysbys ar ragolwg y ffrwd
@@ -486,10 +516,19 @@ cy:
edit_preset: Golygu rhagosodiad rhybudd
title: Rheoli rhagosodiadau rhybudd
admin_mailer:
+ new_pending_account:
+ body: Mae manylion y cyfrif newydd yn isod. Gallwch cymeradwyo neu wrthod y ceisiad hon.
+ subject: Cyfrif newydd i fynu ar gyfer adolygiad ar %{instance} (%{username})
new_report:
body: Mae %{reporter} wedi cwyno am %{target}
body_remote: Mae rhywun o %{domain} wedi cwyno am %{target}
- subject: Cwyn newydd am %{instance} {#%{id}}
+ subject: Cwyn newydd am %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Rhyngwyneb gwe uwch
+ advanced_web_interface_hint: 'Os hoffech gwneud defnydd o gyd o''ch lled sgrin, mae''r rhyngwyneb gwe uwch yn gadael i chi ffurfweddu sawl colofn wahanol i weld cymaint o wybodaeth â hoffech: Catref, hysbysiadau, ffrwd y ffedysawd, unrhyw nifer o rhestrau ac hashnodau.'
+ animations_and_accessibility: Animeiddiau ac hygyrchedd
+ confirmation_dialogs: Deialog cadarnhau
+ sensitive_content: Cynnwys sensitif
application_mailer:
notification_preferences: Newid gosodiadau e-bost
salutation: "%{name},"
@@ -506,7 +545,9 @@ cy:
warning: Byddwch yn ofalus a'r data hyn. Peidiwch a'i rannu byth!
your_token: Eich tocyn mynediad
auth:
+ apply_for_account: Gofyn am wahoddiad
change_password: Cyfrinair
+ checkbox_agreement_html: Rydw i'n cytuno i'r rheolau'r gweinydd a'r telerau gwasanaeth
confirm_email: Cadarnhau e-bost
delete_account: Dileu cyfrif
delete_account_html: Os hoffech chi ddileu eich cyfrif, mae modd parhau yma. Bydd gofyn i chi gadarnhau.
@@ -522,10 +563,12 @@ cy:
cas: CAS
saml: SAML
register: Cofrestru
+ registration_closed: Nid yw %{instance} yn derbyn aelodau newydd
resend_confirmation: Ailanfon cyfarwyddiadau cadarnhau
reset_password: Ailosod cyfrinair
security: Diogelwch
set_new_password: Gosod cyfrinair newydd
+ trouble_logging_in: Trafferdd mewngofnodi?
authorize_follow:
already_following: Yr ydych yn dilyn y cyfrif hwn yn barod
error: Yn anffodus, roedd gwall tra'n edrych am y cyfrif anghysbell
@@ -544,11 +587,11 @@ cy:
about_x_years: "%{count}blwyddyn"
almost_x_years: "%{count}blwyddyn"
half_a_minute: Newydd fod
- less_than_x_minutes: "%{count}m"
+ less_than_x_minutes: "%{count}munud"
less_than_x_seconds: Newydd fod
over_x_years: "%{count}blwyddyn"
x_days: "%{count}dydd"
- x_minutes: "%{count}m"
+ x_minutes: "%{count}munud"
x_months: "%{count}mis"
x_seconds: "%{count}eiliad"
deletes:
@@ -567,12 +610,12 @@ cy:
explore_mastodon: Archwilio %{title}
how_to_enable: Ar hyn o bryd nid ydych chi wedi dewis y cyfeiriadur. Gallwch ddewis i mewn isod. Defnyddiwch hashnodau yn eich bio-destun i'w restru dan hashnodau penodol!
people:
- few: "%{count} personau"
- many: "%{count} personau"
- one: "%{count} person"
- other: "%{count} personau"
- two: "%{count} personau"
- zero: "%{count} personau"
+ few: "%{count} o bobl"
+ many: "%{count} o bobl"
+ one: "%{count} berson"
+ other: "%{count} o bobl"
+ two: "%{count} o bobl"
+ zero: "%{count} person"
errors:
'403': Nid oes gennych ganiatad i weld y dudalen hon.
'404': Nid yw'r dudalen yr oeddech yn chwilio amdani'n bodoli.
@@ -585,6 +628,9 @@ cy:
content: Mae'n ddrwg gennym ni, ond fe aeth rhywbeth o'i le ar ein rhan ni.
title: Nid yw'r dudalen hon yn gywir
noscript_html: I ddefnyddio ap gwe Mastodon, galluogwch JavaScript os gwlwch yn dda. Fel arall, gallwch drio un o'r apiau cynhenid ar gyfer Mastodon ar eich platfform.
+ existing_username_validator:
+ not_found: ni ddarganfwyd defnyddiwr lleol gyda'r enw cyfrif hynny
+ not_found_multiple: ni ddarganfwyd %{usernames}
exports:
archive_takeout:
date: Dyddiad
@@ -625,8 +671,10 @@ cy:
more: Mwy…
resources: Adnoddau
generic:
+ all: Popeth
changes_saved_msg: Llwyddwyd i gadw y newidiadau!
copy: Copïo
+ order_by: Trefnu wrth
save_changes: Cadw newidiadau
validation_errors:
few: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
@@ -635,18 +683,41 @@ cy:
other: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
two: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
zero: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
+ html_validator:
+ invalid_markup: 'yn cynnwys marciad HTML annilys: %{error}'
+ identity_proofs:
+ active: Yn weithredol
+ authorize: Ie, awdurdodi
+ authorize_connection_prompt: Awdurdodi y cysylltiad cryptograffig hon?
+ errors:
+ failed: Methwyd y cysylltiad cryptograffig. Ceisiwch eto o %{provider}, os gwelwch yn dda.
+ keybase:
+ invalid_token: Mae tocynnau keybase yn hashiau o llofnodau ac mae rhaid iddynt bod yn 66 cymeriadau hecs
+ verification_failed: Nid yw Keybase yn adnabod y tocyn hyn fel llofnod defnyddiwr Keybase %{kb_username}. Cesiwch eto o Keybase, os gwelwch yn dda.
+ wrong_user: Ni all greu prawf ar gyfer %{proving} tra wedi mewngofnodi fel %{current}. Mewngofnodi fel %{proving} a cheisiwch eto.
+ explanation_html: Fama gallwch cysylltu i'ch hunanieithau arall yn cryptograffig, er enghraifft proffil Keybase. Mae hyn yn gadael pobl arall i anfon chi negeseuon amgryptiedig a ymddiried mewn cynnwys rydych yn eich anfon iddynt.
+ i_am_html: Rydw i'n %{username} ar %{service}.
+ identity: Hunaniaeth
+ inactive: Anweithgar
+ publicize_checkbox: 'A thŵtiwch hon:'
+ publicize_toot: 'Wedi profi! Rydw i''n %{username} ar %{service}: %{url}'
+ status: Statws gwirio
+ view_proof: Gweld prawf
imports:
modes:
merge: Cyfuno
merge_long: Cadw'r cofnodau presennol ac ychwanegu rhai newydd
+ overwrite: Trosysgrifio
+ overwrite_long: Disodli cofnodau bresennol gyda'r cofnodau newydd
preface: Mae modd mewnforio data yr ydych wedi allforio o achos arall, megis rhestr o bobl yr ydych yn ei ddilyn neu yn blocio.
success: Uwchlwythwyd eich data yn llwyddiannus ac fe fydd yn cael ei brosesu mewn da bryd
types:
blocking: Rhestr blocio
+ domain_blocking: Rhestr rhwystro parth
following: Rhestr dilyn
muting: Rhestr tawelu
upload: Uwchlwytho
- in_memoriam_html: In Memoriam.
+ in_memoriam_html: Mewn Cofiad.
invites:
delete: Dadactifadu
expired: Wedi darfod
@@ -686,7 +757,7 @@ cy:
proceed: Cadw
updated_msg: Diweddarwyd gosodiad mudo eich cyfrif yn llwyddiannus!
moderation:
- title: Cymedroli
+ title: Goruwchwyliad
notification_mailer:
digest:
action: Gweld holl hysbysiadau
@@ -734,32 +805,71 @@ cy:
decimal_units:
format: "%n%u"
units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
+ billion: Biliwn
+ million: Miliwn
+ quadrillion: Cwadriliwn
+ thousand: Mil
+ trillion: Triliwn
pagination:
newer: Diweddarach
next: Nesaf
older: Hŷn
prev: Blaenorol
truncate: "…"
+ polls:
+ errors:
+ already_voted: Rydych chi barod wedi pleidleisio ar y pleidlais hon
+ duplicate_options: yn cynnwys eitemau dyblyg
+ duration_too_long: yn rhy bell yn y dyfodol
+ duration_too_short: yn rhy fuan
+ expired: Mae'r pleidlais wedi gorffen yn barod
+ over_character_limit: ni all fod yn hirach na %{max} cymeriad yr un
+ too_few_options: rhaid cael fwy nag un eitem
+ too_many_options: ni all cynnwys fwy na %{max} o eitemau
preferences:
- languages: Ieithoedd
other: Arall
- publishing: Cyhoeddi
- web: Gwe
+ posting_defaults: Rhagosodiadau postio
+ public_timelines: Ffrydau gyhoeddus
+ relationships:
+ activity: Gweithgareddau cyfrif
+ dormant: Segur
+ last_active: Gweithred ddiwethaf
+ most_recent: Yn diweddaraf
+ moved: Wedi symud
+ mutual: Cydfuddiannol
+ primary: Cynradd
+ relationship: Perthynas
+ remove_selected_domains: Tynnu pob dilynydd o'r parthau dewisiedig
+ remove_selected_followers: Tynnu'r dilynydd dewisiedig
+ remove_selected_follows: Dad-ddilyn y defnyddwyr dewisiedig
+ status: Statws cyfrif
remote_follow:
acct: Mewnbynnwch eich enwdefnyddiwr@parth yr ydych eisiau gweithredu ohonno
missing_resource: Ni ellir canfod yr URL ailgyferio angenrheidiol i'ch cyfrif
no_account_html: Heb gyfrif? Mae modd i chi gofrestru yma
proceed: Ymlaen i ddilyn
prompt: 'Yr ydych am ddilyn:'
+ reason_html: |-
+ Pam yw'r cam hyn yn angenrheidiol?
+ Efallai nid yw %{instance} yn gweinydd ble wnaethoch gofrestru, felly mae'n rhaid i ni ailarweinio chi at eich gweinydd catref yn gyntaf.
+ remote_interaction:
+ favourite:
+ proceed: Ymlaen i hoffi
+ prompt: 'Hoffech hoffi''r tŵt hon:'
+ reblog:
+ proceed: Ymlaen i fŵstio
+ prompt: 'Hoffech fŵstio''r tŵt hon:'
+ reply:
+ proceed: Ymlaen i ateb
+ prompt: 'Hoffech ateb y tŵt hon:'
remote_unfollow:
error: Gwall
title: Teitl
unfollowed: Dad-ddilynwyd
+ scheduled_statuses:
+ over_daily_limit: Rydych wedi rhagori'r cyfwng o %{limit} o dŵtiau rhestredig ar y dydd hynny
+ over_total_limit: Rydych wedi rhagori'r cyfwng o %{limit} o dŵtiau rhestredig
+ too_soon: Mae rhaid i'r dydd rhestredig fod yn y dyfodol
sessions:
activity: Gweithgaredd ddiwethaf
browser: Porwr
@@ -789,29 +899,37 @@ cy:
adobe_air: Adobe Air
android: Android
blackberry: Blackberry
- chrome_os: ChromeOS
- firefox_os: Firefox OS
+ chrome_os: OS Chrome
+ firefox_os: OS Firefox
ios: iOS
linux: Linux
mac: Mac
other: platfform anhysbys
windows: Windows
windows_mobile: Windows Mobile
- windows_phone: Windows Phone
+ windows_phone: Ffôn Windows
revoke: Diddymu
revoke_success: Sesiwn wedi ei ddiddymu yn llwyddiannus
title: Sesiynau
settings:
+ account: Cyfrif
+ account_settings: Gosodiadau'r cyfrif
+ appearance: Arddangosiad
authorized_apps: Apiau awdurdodedig
back: Yn ôl i Mastodon
delete: Dileu cyfrif
development: Datblygu
edit_profile: Golygu proffil
export: Allforio data
+ featured_tags: Hashnodau Nodedig
+ identity_proofs: Profiadau Hunaniaeth
import: Mewnforio
+ import_and_export: Mewnfori ac allfori
migrate: Mudo cyfrif
notifications: Hysbysiadau
preferences: Dewisiadau
+ profile: Proffil
+ relationships: Dilynion a dilynwyr
two_factor_authentication: Awdurdodi dau-gam
statuses:
attached:
@@ -847,6 +965,15 @@ cy:
ownership: Ni ellir pinio tŵt rhywun arall
private: Ni ellir pinio tŵt nad yw'n gyhoeddus
reblog: Ni ellir pinio bŵstiau
+ poll:
+ total_votes:
+ few: "%{count} o bleidleisiau"
+ many: "%{count} o bleidleisiau"
+ one: "%{count} bleidlais"
+ other: "%{count} o bleidleisiau"
+ two: "%{count} o bleidleisiau"
+ zero: "%{count} pleidlais"
+ vote: Pleidleisio
show_more: Dangos mwy
sign_in_to_participate: Mengofnodwch i gymryd rhan yn y sgwrs
title: '%{name}: "%{quote}"'
@@ -867,10 +994,10 @@ cy:
Pa wybodaeth ydyn ni'n ei gasglu?
-
Gwybodaeth cyfrif sylfaenol: Os ydych yn cofrestru ar y gweinydd hwn, mae'n bosib y byddwch yn cael eich gofyn i fewnbynnu enw defnyddiwr, cyfeiriad e-bost a chyfrinair. Mae modd i chi hefyd fewnbynnu gwybodaeth ychwanegol megis enw arddangos a bywgraffiad ac uwchlwytho llun proffil a llun pennawd. Mae'r enw defnyddiwr, enw arddangos, bywgraffiad, llun proffil a'r llun pennawd wedi eu rhestru'n gyhoeddus bob tro.
-
Postio, dilyn a gwybodaeth gyhoeddus arall: Mae'r rhestr o bobl yr ydych yn dilyn wedi ei restru'n gyhoeddus, mae'r un peth yn wir am eich dilynwyr. Pan yr ydych yn mewnosod neges, mae'r dyddiad a'r amser yn cael ei gofnodi ynghyd a'r rhaglen y wnaethoch anfon y neges ohonni. Gall negeseuon gynnwys atodiadau cyfryngau, megis lluniau neu fideo. Mae negeseuon cyhoeddus a negeseuon heb eu rhestru ar gael yn gyhoeddus. Pan yr ydych yn nodweddu neges ar eich proffil, mae hynny hefyd yn wybodaeth sydd ar gael yn gyhoeddus. Mae eich negeseuon yn cael eu hanfon i'ch dilynwyr, mewn rhai achosion mae hyn yn golygu eu bod yn cael eu hanfon i amryw o weinyddwyr ac fe fydd copiau yn cael eu cadw yno. Pan yr ydych yn dileu negeseuon, mae hyn hefyd yn cael ei hanfon i'ch dilynwyr. Mae'r weithred o rannu neu hoffi neges arall yn gyhoeddus bob tro.
-
Negeseuon uniongyrchol a dilynwyr yn unig: Mae pob neges yn cael eu cadw a'u prosesu ar y gweinydd. Mae negeseuon dilynwyr yn unig yn cael eu hanfon i'ch dilynwyr a'r defnyddwyr sy'n cael eu crybwyll ynddynt tra bod negeseuon uniongyrchol yn cael eu hanfon at rheini sy'n cael crybwyll ynddynt yn unig. Mewn rhai achostion golyga hyn eu bod yn cael eu hanfon i weinyddwyr gwahanol a'u cadw yno. yr ydym yn gnweud ymgais ewyllys da i gyfyngu'r mynediad at y negeseuon yna i bobl ac awdurdod yn unig, ond mae'n bosib y bydd gweinyddwyr eraill yn methu a gwneud hyn. Mae'n bwysig felly i chi fod yn wyliadwrus o ba weinyddwyr y mae eich dilynwyr yn perthyn iddynt. Mae modd i chi osod y dewis i ganiatau a gwrthod dilynwyr newydd a llaw yn y gosodiadau. Cofiwch gall gweithredwyr y gweinydd ac unrhyw weinydd derbyn weld unrhyw negeseuon o'r fath, ac fe all y derbynwyr gymryd sgrinlin, copïo neu drwy ddulliau eraill rannu rhain. Peidiwch a rhannu unrhyw wybodaeth beryglus dros Mastodon.
-
IPs a mathau eraill o metadata: Pan yr ydych yn mewngofnodi, yr ydym yn cofnodi y cyfeiriad IP yr ydych yn mewngofnodi ohonno, ynghyd a enw eich rhaglen pori. Mae pob un sesiwn mewngofnodi ar gael i chi adolygu a gwrthod yn y gosodiadau. Mae'r cyfeiriad IP diweddaraf yn cael ei storio hyd at 12 mis. Mae'n bosib y byddwn hefyd yn cadw cofnodion gweinydd sy'n cynnwys y cyfeiriad IP am bob cais sy'n cael ei wneud i'n gweinydd.
+
Gwybodaeth cyfrif sylfaenol: Os ydych yn cofrestru ar y gweinydd hwn, mae'n bosib y byddwch yn cael eich gofyn i fewnbynnu enw defnyddiwr, cyfeiriad e-bost a chyfrinair. Mae modd i chi hefyd fewnbynnu gwybodaeth ychwanegol megis enw arddangos a bywgraffiad ac uwchlwytho llun proffil a llun pennawd. Mae'r enw defnyddiwr, enw arddangos, bywgraffiad, llun proffil a'r llun pennawd wedi eu rhestru'n gyhoeddus bob tro.
+
Postio, dilyn a gwybodaeth gyhoeddus arall: Mae'r rhestr o bobl yr ydych yn dilyn wedi ei restru'n gyhoeddus, mae'r un peth yn wir am eich dilynwyr. Pan yr ydych yn mewnosod neges, mae'r dyddiad a'r amser yn cael ei gofnodi ynghyd a'r rhaglen y wnaethoch anfon y neges ohonni. Gall negeseuon gynnwys atodiadau cyfryngau, megis lluniau neu fideo. Mae negeseuon cyhoeddus a negeseuon heb eu rhestru ar gael yn gyhoeddus. Pan yr ydych yn nodweddu neges ar eich proffil, mae hynny hefyd yn wybodaeth sydd ar gael yn gyhoeddus. Mae eich negeseuon yn cael eu hanfon i'ch dilynwyr, mewn rhai achosion mae hyn yn golygu eu bod yn cael eu hanfon i amryw o weinyddwyr ac fe fydd copiau yn cael eu cadw yno. Pan yr ydych yn dileu negeseuon, mae hyn hefyd yn cael ei hanfon i'ch dilynwyr. Mae'r weithred o rannu neu hoffi neges arall yn gyhoeddus bob tro.
+
Negeseuon uniongyrchol a dilynwyr yn unig: Mae pob neges yn cael eu cadw a'u prosesu ar y gweinydd. Mae negeseuon dilynwyr yn unig yn cael eu hanfon i'ch dilynwyr a'r defnyddwyr sy'n cael eu crybwyll ynddynt tra bod negeseuon uniongyrchol yn cael eu hanfon at rheini sy'n cael crybwyll ynddynt yn unig. Mewn rhai achostion golyga hyn eu bod yn cael eu hanfon i weinyddwyr gwahanol a'u cadw yno. yr ydym yn gnweud ymgais ewyllys da i gyfyngu'r mynediad at y negeseuon yna i bobl ac awdurdod yn unig, ond mae'n bosib y bydd gweinyddwyr eraill yn methu a gwneud hyn. Mae'n bwysig felly i chi fod yn wyliadwrus o ba weinyddwyr y mae eich dilynwyr yn perthyn iddynt. Mae modd i chi osod y dewis i ganiatau a gwrthod dilynwyr newydd a llaw yn y gosodiadau. Cofiwch gall gweithredwyr y gweinydd ac unrhyw weinydd derbyn weld unrhyw negeseuon o'r fath, ac fe all y derbynwyr gymryd sgrinlin, copïo neu drwy ddulliau eraill rannu rhain. Peidiwch a rhannu unrhyw wybodaeth beryglus dros Mastodon.
+
IPs a mathau eraill o metadata: Pan yr ydych yn mewngofnodi, yr ydym yn cofnodi y cyfeiriad IP yr ydych yn mewngofnodi ohonno, ynghyd a enw eich rhaglen pori. Mae pob un sesiwn mewngofnodi ar gael i chi adolygu a gwrthod yn y gosodiadau. Mae'r cyfeiriad IP diweddaraf yn cael ei storio hyd at 12 mis. Mae'n bosib y byddwn hefyd yn cadw cofnodion gweinydd sy'n cynnwys y cyfeiriad IP am bob cais sy'n cael ei wneud i'n gweinydd.
@@ -880,9 +1007,9 @@ cy:
Gall unrhyw wybodaeth yr ydym yn ei gasglu oddi wrthych gael ei ddefnyddio yn y ffyrdd canlynol:
-
I ddarparu prif weithgaredd Mastodon. Gallwch ond rhyngweithio a chynnwys pobl eraill pan yr ydych wedi'ch mewngofnodi. Er enghraifft, gallwch ddilyn pobl eraill i weld eu negeseuon wedi cyfuno ar ffrwd gartref bersonol.
-
I helpu gyda goruwchwylio'r gymuned, er enghraifft drwy gymharu eich cyfeiriad IP gyda rhai eraill hysbys er mwyn sefydlu ymgais i geisio hepgor gwaharddiad neu droseddau eraill.
-
Gall y cyfeiriad e-bost yr ydych yn ei ddarparu gael ei ddefnyddio i anfon gwybodaeth atoch, hsybysiadau am bobl eraill yn rhyngweithio a'ch cynnwys neu'n anfon negeseuon atoch a/neu geisiadau neu gwestiynnau eraill.
+
I ddarparu prif weithgaredd Mastodon. Gallwch ond rhyngweithio a chynnwys pobl eraill pan yr ydych wedi'ch mewngofnodi. Er enghraifft, gallwch ddilyn pobl eraill i weld eu negeseuon wedi cyfuno ar ffrwd gartref bersonol.
+
I helpu gyda goruwchwylio'r gymuned, er enghraifft drwy gymharu eich cyfeiriad IP gyda rhai eraill hysbys er mwyn sefydlu ymgais i geisio hepgor gwaharddiad neu droseddau eraill.
+
Gall y cyfeiriad e-bost yr ydych yn ei ddarparu gael ei ddefnyddio i anfon gwybodaeth atoch, hsybysiadau am bobl eraill yn rhyngweithio a'ch cynnwys neu'n anfon negeseuon atoch a/neu geisiadau neu gwestiynnau eraill.
@@ -898,8 +1025,8 @@ cy:
Gwnawn ymdrech ewyllys da i:
-
Gadw cofnod gweinydd yn cynnwys y cyfeiriad IP o bob cais i'r gweinydd hwn, i'r graddau y mae cofnodion o'r fath yn cael eu cadw, am ddim mwy na 90 diwrnod.
-
Gadw cyfeiriadau IP a chysylltiad i ddefnyddwyr cofrestredig am ddim mwy na 12 mis.
+
Gadw cofnod gweinydd yn cynnwys y cyfeiriad IP o bob cais i'r gweinydd hwn, i'r graddau y mae cofnodion o'r fath yn cael eu cadw, am ddim mwy na 90 diwrnod.
+
Gadw cyfeiriadau IP a chysylltiad i ddefnyddwyr cofrestredig am ddim mwy na 12 mis.
Mae modd i chi wneud cais am, a lawrlwytho archif o'ch cynnwys, gan gynnwys eich tŵtiau, atodiadau cyfryngau, llun proffil a llun pennawd.
title: "%{instance} Termau Gwasanaeth a Polisi Preifatrwydd"
themes:
- contrast: Cyferbyniad uchel
- default: Mastodon
+ contrast: Mastodon (Cyferbyniad uchel)
+ default: Mastodon (Tywyll)
mastodon-light: Mastodon (golau)
time:
formats:
@@ -976,6 +1103,8 @@ cy:
warning:
explanation:
disable: Er bod eich cyfrif wedi'i rewi, mae eich data cyfrif yn parhau i fod yn gyfan, ond ni allwch chi berfformio unrhyw gamau nes ei ddatgloi.
+ silence: Pan mae eich cyfrif yn gyfyngiedig, dim ond pobl sydd yn barod yn eich dilyn yn gweld eich tŵtiau ar y gweinydd hon, a efallai byddwch yn cael eich tynnu o restrau cyhoeddus. Er hyn, gall eraill eich dilyn chi wrth law.
+ suspend: Mae eich cyfrif wedi cael ei wahardd, a mae gyd o'ch tŵtiau a'ch ffeiliau cyfrwng uwchlwythadwy wedi cael eu tynnu or gweinydd yn barhaol, ac o weinyddau ble yr oedd eich dilynwyr.
review_server_policies: Adolygu polisïau'r gweinydd
subject:
disable: Mae'ch cyfrif %{acct} wedi'i rewi
@@ -1001,7 +1130,7 @@ cy:
tip_federated_timeline: Mae'r ffrwd ffederasiwn yn olwg firehose o'r rhwydwaith Mastodon. Ond mae ond yn cynnwys y bobl mae eich cymdogion wedi ymrestru iddynt, felly nid yw'n gyflawn.
tip_following: Rydych yn dilyn goruwchwyliwr eich gweinydd yn ddiofyn. I ganfod pobl mwy diddorol, edrychwch ar y ffrydiau lleol a'r rhai wedi ei ffedereiddio.
tip_local_timeline: Mae'r ffrwd leol yn olwg firehose o bobl ar %{instance}. Dyma eich cymdogion agosaf!
- tip_mobile_webapp: Os yw eich porwr gwe yn cynnig i ch ychwanegu Mastodon i'ch sgrîn gartref, mae modd i chi dderbyn hysbysiadau push. Mewn sawl modd mae'n gweithio fel ap cynhenid!
+ tip_mobile_webapp: Os yw eich porwr gwe yn cynnig i chi ychwanegu Mastodon i'ch sgrîn gartref, mae modd i chi dderbyn hysbysiadau gwthiadwy. Mewn sawl modd mae'n gweithio fel ap cynhenid!
tips: Awgrymiadau
title: Croeso, %{name}!
users:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 0787db621..da6ab1054 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -5,7 +5,6 @@ da:
about_mastodon_html: Mastodon er et socialt netværk der er baseret på åbne web protokoller og frit, open-source source software. Der er decentraliseret ligesom e-mail tjenester.
about_this: Om
administered_by: 'Administreret af:'
- api: API
apps: Apps til mobilen
apps_platforms: Brug Mastodon på iOS, Android og andre platformer
contact: Kontakt
@@ -20,9 +19,6 @@ da:
learn_more: Lær mere
privacy_policy: Privatlivspolitik
source_code: Kildekode
- status_count_after:
- one: status
- other: statusser
status_count_before: Som har skrevet
terms: Vilkår for service
user_count_after:
@@ -87,8 +83,6 @@ da:
display_name: Visningsnavn
domain: Domæne
edit: Rediger
- email: Email
- email_status: Email status
enable: Aktiver
enabled: Aktiveret
feed_url: Link til feed
@@ -153,7 +147,6 @@ da:
undo_suspension: Fortryd udelukkelse
unsubscribe: Abonner ikke længere
username: Brugernavn
- web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} tildelte anmeldelsen %{target} til sig selv"
@@ -224,7 +217,6 @@ da:
recent_users: Seneste brugere
search: Søg på fuld tekst
single_user_mode: Enkelt bruger mode
- software: Software
space: Brugt lagerplads
title: Betjeningspanel
total_users: samlede antal brugere
@@ -294,7 +286,6 @@ da:
pending: Venter på godkendelse fra relæet
save_and_enable: Gem og aktiver
setup: Opsæt en videresendelses forbindelse
- status: Status
title: Videresendelser
report_notes:
created_msg: Anmeldelse note blev oprettet!
@@ -324,7 +315,6 @@ da:
reported_by: Anmeldt af
resolved: Løst
resolved_msg: Anmeldelse er sat til at være løst!
- status: Status
title: Anmeldelser
unassign: Utildel
unresolved: Uløst
@@ -410,7 +400,6 @@ da:
tags:
accounts: Kontoer
hidden: Skjult
- title: Administration
admin_mailer:
new_report:
body: "%{reporter} har anmeldt %{target}"
@@ -418,7 +407,6 @@ da:
subject: Ny anmeldelse for %{instance} (#%{id})
application_mailer:
notification_preferences: Ændre email præferencer
- salutation: "%{name},"
settings: 'Ændre email præferencer: %{link}'
view: 'Se:'
view_profile: Se profil
@@ -444,9 +432,6 @@ da:
migrate_account: Flyt til en anden konto
migrate_account_html: Hvis du ønsker at omdirigere denne konto til en anden, kan du gøre det her.
or_log_in_with: Eller log in med
- providers:
- cas: CAS
- saml: SAML
register: Opret dig
resend_confirmation: Gensend bekræftelses instrukser
reset_password: Nulstil kodeord
@@ -470,13 +455,9 @@ da:
about_x_years: "%{count}år"
almost_x_years: "%{count}år"
half_a_minute: Lige nu
- less_than_x_minutes: "%{count}m"
less_than_x_seconds: Lige nu
over_x_years: "%{count}år"
- x_days: "%{count}d"
- x_minutes: "%{count}m"
x_months: "%{count}md"
- x_seconds: "%{count}s"
deletes:
bad_password_msg: Godt forsøg, hackere! Forkert kodeord
confirm_password: Indtast dit nuværende kodeord for at bekræfte din identitet
@@ -506,7 +487,6 @@ da:
request: Anmod om dit arkiv
size: Størrelse
blocks: Du blokerer
- csv: CSV
follows: Du følger
mutes: Du dæmper
storage: Medie lager
@@ -619,14 +599,9 @@ da:
number:
human:
decimal_units:
- format: "%n%u"
units:
billion: mia.
million: mio.
- quadrillion: Q
- thousand: K
- trillion: T
- unit: "\n"
pagination:
newer: Nyere
next: Næste
@@ -634,10 +609,7 @@ da:
prev: Forrige
truncate: "...…"
preferences:
- languages: Sprog
other: Andet
- publishing: Offentligører
- web: Web
remote_follow:
acct: Indtast dit brugernavn@domæne du vil handle fra
missing_resource: Kunne ikke finde det påkrævede omdirigerings link for din konto
@@ -650,7 +622,6 @@ da:
unfollowed: Følger ikke længere
sessions:
activity: Sidste aktivitet
- browser: Browser
browsers:
alipay: Ali-pay
blackberry: Blackberry OS
@@ -672,15 +643,11 @@ da:
current_session: Nuværrende session
description: "%{browser} på %{platform}"
explanation: Disse er de web browsere der på nuværende tidspunkt er logget ind på din Mastodon konto.
- ip: IP
platforms:
adobe_air: Adobe air
- android: Android
blackberry: Blackberry OS
chrome_os: Chromeos
firefox_os: Firefox Os
- ios: iOS
- linux: Linux
mac: Mac.
other: ukendt platform
windows: Microsoft windows
@@ -707,9 +674,6 @@ da:
image:
one: "%{count} billede"
other: "%{count} billeder"
- video:
- one: "%{count} video"
- other: "%{count} videoer"
boosted_from_html: Fremhævet fra %{acct_link}
content_warning: 'Advarsel om indhold: %{warning}'
disallowed_hashtags:
@@ -725,7 +689,6 @@ da:
reblog: Fremhævede trut kan ikke fastgøres
show_more: Vis mere
sign_in_to_participate: Log ind for at deltage i samtalen
- title: '%{name}: "%{quote}"'
visibilities:
private: Kun-følgere
private_long: Vis kun til følgere
@@ -744,10 +707,6 @@ da:
contrast: Mastodon (Høj kontrast)
default: Mastodont (Mørk)
mastodon-light: Mastodon (Lys)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: Indtast koden der er genereret af din app for at bekræfte
description_html: Hvis du aktiverer to-faktor godkendelse, vil du være nødt til at være i besiddelse af din telefon, der genererer tokens som du skal indtaste, når du logger ind.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7138b7269..cfdaacab0 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,51 +1,51 @@
---
de:
about:
- about_hashtag_html: Dies sind öffentliche Beiträge, die mit #%{hashtag} getaggt wurden. Wenn du irgendwo im Fediversum ein Konto besitzt, kannst du mit ihnen interagieren.
+ about_hashtag_html: Das sind öffentliche Beiträge, die mit #%{hashtag} getaggt wurden. Wenn du irgendwo im Fediversum ein Konto besitzt, kannst du mit ihnen interagieren.
about_mastodon_html: Mastodon ist ein soziales Netzwerk. Es basiert auf offenen Web-Protokollen und freier, quelloffener Software. Es ist dezentral (so wie E-Mail!).
about_this: Über diesen Server
active_count_after: aktiv
- active_footnote: Monatlich Aktive User (MAU)
- administered_by: 'Administriert von:'
+ active_footnote: Monatlich Aktive Nutzer_innen (MAU)
+ administered_by: 'Betrieben von:'
api: API
apps: Mobile Apps
apps_platforms: Benutze Mastodon auf iOS, Android und anderen Plattformen
- browse_directory: Durchsuche ein Profilverzeichnis und filtere nach Interessen
- browse_public_posts: Durchsuche eine Zeitleiste an öffentlichen Beiträgen auf Mastodon
+ browse_directory: Durchsuche das Profilverzeichnis und filtere nach Interessen
+ browse_public_posts: Stöbere durch öffentliche Beiträge auf Mastodon
contact: Kontakt
contact_missing: Nicht angegeben
- contact_unavailable: N/A
- discover_users: Benutzer entdecken
+ contact_unavailable: Nicht verfügbar
+ discover_users: Benutzer_innen entdecken
documentation: Dokumentation
extended_description_html: |
-
Ein guter Platz für Regeln
-
Die erweiterte Beschreibung wurde noch nicht aufgesetzt.
- federation_hint_html: Mit einem Account auf %{instance} wirst du in der Lage sein Nutzern auf irgendeinem Mastodon-Server und darüber hinaus zu folgen.
- generic_description: "%{domain} ist ein Server im Netzwerk"
+
Ein hervorragender Ort für Regeln
+
Die erweiterte Beschreibung wurde von dem Administrator noch nicht eingestellt.
+ federation_hint_html: Mit einem Konto auf %{instance} wirst du in der Lage sein Nutzer_innen auf beliebigen Mastodon-Servern und darüber hinaus zu folgen.
+ generic_description: "%{domain} ist ein Server im Fediversum"
get_apps: Versuche eine mobile App
- hosted_on: Mastodon, beherbergt auf %{domain}
+ hosted_on: Mastodon, gehostet auf %{domain}
learn_more: Mehr erfahren
privacy_policy: Datenschutzerklärung
see_whats_happening: Finde heraus, was gerade in der Welt los ist
server_stats: 'Serverstatistiken:'
source_code: Quellcode
status_count_after:
- one: Statusmeldung
- other: Statusmeldungen
+ one: Beitrag
+ other: Beiträge
status_count_before: mit
- tagline: Finde Freunde und entdecke neue
+ tagline: Finde deine Freunde und entdecke neue
terms: Nutzungsbedingungen
user_count_after:
- one: Benutzer:in
- other: Benutzer:innen
- user_count_before: Zuhause für
+ one: Profil
+ other: Profile
+ user_count_before: Hostet
what_is_mastodon: Was ist Mastodon?
accounts:
choices_html: "%{name} empfiehlt:"
follow: Folgen
followers:
- one: Folgender
- other: Folgende
+ one: Folger_innen
+ other: Folger_innen
following: Folgt
joined: Beigetreten am %{date}
last_active: zuletzt aktiv
@@ -65,7 +65,7 @@ de:
posts_with_replies: Beiträge mit Antworten
reserved_username: Dieser Profilname ist belegt
roles:
- admin: Admin
+ admin: Administrator
bot: Bot
moderator: Moderator
unavailable: Profil nicht verfügbar
@@ -80,8 +80,8 @@ de:
delete: Löschen
destroyed_msg: Moderationsnotiz erfolgreich gelöscht!
accounts:
- approve: Aktzeptieren
- approve_all: Alle aktzeptieren
+ approve: Akzeptieren
+ approve_all: Alle akzeptieren
are_you_sure: Bist du sicher?
avatar: Profilbild
by_domain: Domain
@@ -108,10 +108,10 @@ de:
enable: Freischalten
enabled: Freigegeben
feed_url: Feed-URL
- followers: Folgende
- followers_url: URL des Folgenden
+ followers: Folger_innen
+ followers_url: URL der Folger_innen
follows: Folgt
- header: Header
+ header: Titelbild
inbox_url: Posteingangs-URL
invited_by: Eingeladen von
ip: IP-Adresse
@@ -119,27 +119,27 @@ de:
location:
all: Alle
local: Lokal
- remote: Entfernt
- title: Ort
+ remote: Fern
+ title: Ursprung
login_status: Loginstatus
- media_attachments: Medienanhänge
+ media_attachments: Dateien
memorialize: In Gedenkmal verwandeln
moderation:
active: Aktiv
all: Alle
- pending: Ausstehend
+ pending: In Warteschlange
silenced: Stummgeschaltet
suspended: Gesperrt
title: Moderation
moderation_notes: Moderationsnotizen
most_recent_activity: Letzte Aktivität
most_recent_ip: Letzte IP-Adresse
- no_account_selected: Keine Konten wurden verändert, da keine ausgewählt wurden
- no_limits_imposed: Keine Limits eingesetzt
+ no_account_selected: Keine Konten wurden geändert, da keine ausgewählt wurden
+ no_limits_imposed: Keine Beschränkungen
not_subscribed: Nicht abonniert
outbox_url: Postausgangs-URL
- pending: Ausstehender Review
- perform_full_suspension: Sperren
+ pending: In Warteschlange
+ perform_full_suspension: Verbannen
profile_url: Profil-URL
promote: Befördern
protocol: Protokoll
@@ -149,10 +149,10 @@ de:
reject: Ablehnen
reject_all: Alle ablehnen
remove_avatar: Profilbild entfernen
- remove_header: Header entfernen
+ remove_header: Titelbild entfernen
resend_confirmation:
- already_confirmed: Diese:r Benutzer:in wurde bereits bestätigt
- send: Bestätigungsmail erneut senden
+ already_confirmed: Diese_r Benutzer_in wurde bereits bestätigt
+ send: Bestätigungs-E-Mail erneut senden
success: Bestätigungs-E-Mail erfolgreich gesendet!
reset: Zurücksetzen
reset_password: Passwort zurücksetzen
@@ -160,24 +160,25 @@ de:
role: Berechtigungen
roles:
admin: Administrator
- moderator: Moderator:in
+ moderator: Moderator_in
staff: Mitarbeiter
user: Nutzer
salmon_url: Salmon-URL
search: Suche
shared_inbox_url: Geteilte Posteingang-URL
show:
- created_reports: Erstellte Beschwerdemeldungen
- targeted_reports: Beschwerdemeldungen von anderen
+ created_reports: Erstellte Meldungen
+ targeted_reports: Von anderen gemeldet
silence: Stummschalten
silenced: Stummgeschaltet
statuses: Beiträge
subscribe: Abonnieren
- suspended: Gesperrt
+ suspended: Verbannt
+ time_in_queue: "%{time} in der Warteschlange"
title: Konten
unconfirmed_email: Unbestätigte E-Mail-Adresse
- undo_silenced: Stummschaltung zurücknehmen
- undo_suspension: Sperre zurücknehmen
+ undo_silenced: Stummschaltung aufheben
+ undo_suspension: Verbannung aufheben
unsubscribe: Abbestellen
username: Profilname
warn: Warnen
@@ -191,29 +192,29 @@ de:
create_custom_emoji: "%{name} hat neues Emoji %{target} hochgeladen"
create_domain_block: "%{name} hat die Domain %{target} blockiert"
create_email_domain_block: "%{name} hat die E-Mail-Domain %{target} geblacklistet"
- demote_user: "%{name} stufte Benutzer:in %{target} herunter"
+ demote_user: "%{name} stufte Benutzer_in %{target} herunter"
destroy_custom_emoji: "%{name} zerstörte Emoji %{target}"
destroy_domain_block: "%{name} hat die Domain %{target} entblockt"
destroy_email_domain_block: "%{name} hat die E-Mail-Domain %{target} gewhitelistet"
- destroy_status: "%{name} hat Status von %{target} entfernt"
- disable_2fa_user: "%{name} hat Zwei-Faktor-Anforderung für Benutzer:in %{target} deaktiviert"
+ destroy_status: "%{name} hat einen Beitrag von %{target} entfernt"
+ disable_2fa_user: "%{name} hat Zwei-Faktor-Anforderung für Benutzer_in %{target} deaktiviert"
disable_custom_emoji: "%{name} hat das %{target} Emoji deaktiviert"
- disable_user: "%{name} hat den Login für Benutzer:in %{target} deaktiviert"
+ disable_user: "%{name} hat Zugang von Benutzer_in %{target} deaktiviert"
enable_custom_emoji: "%{name} hat das %{target} Emoji aktiviert"
- enable_user: "%{name} hat die Anmeldung für di:en Benutzer:in %{target} aktiviert"
- memorialize_account: "%{name} hat %{target}s Konto in eine Gedenkseite umgewandelt"
+ enable_user: "%{name} hat Zugang von Benutzer_in %{target} aktiviert"
+ memorialize_account: "%{name} hat das Konto von %{target} in eine Gedenkseite umgewandelt"
promote_user: "%{name} hat %{target} befördert"
remove_avatar_user: "%{name} hat das Profilbild von %{target} entfernt"
reopen_report: "%{name} hat die Meldung %{target} wieder geöffnet"
- reset_password_user: "%{name} hat das Passwort für di:en Benutzer:in %{target} zurückgesetzt"
+ reset_password_user: "%{name} hat das Passwort von %{target} zurückgesetzt"
resolve_report: "%{name} hat die Meldung %{target} bearbeitet"
- silence_account: "%{name} hat %{target}s Konto stummgeschaltet"
- suspend_account: "%{name} hat %{target}s Konto gesperrt"
+ silence_account: "%{name} hat das Konto von %{target} stummgeschaltet"
+ suspend_account: "%{name} hat das Konto von %{target} verbannt"
unassigned_report: "%{name} hat die Zuweisung der Meldung %{target} entfernt"
- unsilence_account: "%{name} hat die Stummschaltung von %{target}s Konto aufgehoben"
- unsuspend_account: "%{name} hat die Sperrung von %{target}s Konto aufgehoben"
- update_custom_emoji: "%{name} hat das %{target} Emoji aktualisiert"
- update_status: "%{name} hat den Status von %{target} aktualisiert"
+ unsilence_account: "%{name} hat die Stummschaltung von %{target} aufgehoben"
+ unsuspend_account: "%{name} hat die Verbannung von %{target} aufgehoben"
+ update_custom_emoji: "%{name} hat das %{target} Emoji geändert"
+ update_status: "%{name} hat einen Beitrag von %{target} aktualisiert"
deleted_status: "(gelöschter Beitrag)"
title: Überprüfungsprotokoll
custom_emojis:
@@ -229,7 +230,7 @@ de:
emoji: Emoji
enable: Aktivieren
enabled_msg: Das Emoji wurde aktiviert
- image_hint: PNG bis 50 kB
+ image_hint: PNG bis zu 50 kB
listed: Gelistet
new:
title: Eigenes Emoji hinzufügen
@@ -242,33 +243,34 @@ de:
updated_msg: Emoji erfolgreich aktualisiert!
upload: Hochladen
dashboard:
- backlog: Unerledigte Jobs
+ backlog: Rückständige Jobs
config: Konfiguration
feature_deletions: Kontolöschung
- feature_invites: Einladungslinks
+ feature_invites: Einladungen
feature_profile_directory: Profilverzeichnis
- feature_registrations: Registrierung
- feature_relay: Föderations-Relay
+ feature_registrations: Offene Anmeldung
+ feature_relay: Föderationsrelais
feature_timeline_preview: Zeitleistenvorschau
- features: Eigenschaften
+ features: Funktionen
hidden_service: Föderation mit versteckten Diensten
- open_reports: Offene Meldungen
+ open_reports: Ausstehende Meldungen
recent_users: Neueste Nutzer
search: Volltextsuche
single_user_mode: Einzelnutzermodus
software: Software
space: Speicherverbrauch
title: Übersicht
- total_users: Benutzer:innen insgesamt
+ total_users: Benutzer_innen insgesamt
trends: Trends
week_interactions: Interaktionen diese Woche
week_users_active: Aktiv diese Woche
- week_users_new: Benutzer:innen diese Woche
+ week_users_new: Benutzer_innen diese Woche
domain_blocks:
add_new: Neue Domainblockade hinzufügen
created_msg: Die Domain-Blockade wird nun durchgeführt
destroyed_msg: Die Domain-Blockade wurde rückgängig gemacht
domain: Domain
+ existing_domain_block_html: Es gibt schon eine Blockade für %{name}, diese muss erst aufgehoben werden.
new:
create: Blockade einrichten
hint: Die Domain-Blockade wird nicht verhindern, dass Konteneinträge in der Datenbank erstellt werden. Aber es werden rückwirkend und automatisch alle Moderationsmethoden auf diese Konten angewendet.
@@ -282,8 +284,8 @@ de:
reject_media_hint: Entfernt lokal gespeicherte Mediendateien und verhindert deren künftiges Herunterladen. Für Sperren irrelevant
reject_reports: Meldungen ablehnen
reject_reports_hint: Ignoriere alle Meldungen von dieser Domain. Irrelevant für Sperrungen
- rejecting_media: Mediendateien ablehnen
- rejecting_reports: Beschwerdemeldungen ablehnen
+ rejecting_media: Mediendateien werden nicht gespeichert
+ rejecting_reports: Meldungen werden ignoriert
severity:
silence: stummgeschaltet
suspend: gesperrt
@@ -309,22 +311,22 @@ de:
title: E-Mail-Domain-Blockade
followers:
back_to_account: Zurück zum Konto
- title: "%{acct}'s Follower"
+ title: "%{acct}'s Folger_innen"
instances:
by_domain: Domain
- delivery_available: Zustellung ist verfügbar
+ delivery_available: Zustellung funktioniert
known_accounts:
one: "%{count} bekanntes Konto"
- other: "%{count} bekannte Accounts"
+ other: "%{count} bekannte Konten"
moderation:
all: Alle
- limited: Limitiert
+ limited: Beschränkt
title: Moderation
title: Föderation
- total_blocked_by_us: Von uns gesperrt
+ total_blocked_by_us: Von uns blockiert
total_followed_by_them: Gefolgt von denen
total_followed_by_us: Gefolgt von uns
- total_reported: Beschwerdemeldungen über sie
+ total_reported: Beschwerden über sie
total_storage: Medienanhänge
invites:
deactivate_all: Alle deaktivieren
@@ -348,9 +350,9 @@ de:
inbox_url: Relay-URL
pending: Warte auf Zustimmung des Relays
save_and_enable: Speichern und aktivieren
- setup: Relayverbindung einrichten
- status: Status
- title: Relays
+ setup: Relaisverbindung einrichten
+ status: Zustand
+ title: Relais
report_notes:
created_msg: Meldungs-Kommentar erfolgreich erstellt!
destroyed_msg: Meldungs-Kommentar erfolgreich gelöscht!
@@ -373,13 +375,13 @@ de:
create_and_unresolve: Mit Kommentar wieder öffnen
delete: Löschen
placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder irgendwelche andere Neuigkeiten…
- reopen: Meldung wieder öffnen
+ reopen: Meldung wieder eröffnen
report: 'Meldung #%{id}'
reported_account: Gemeldetes Konto
reported_by: Gemeldet von
resolved: Gelöst
resolved_msg: Meldung erfolgreich gelöst!
- status: Status
+ status: Zustand
title: Meldungen
unassign: Zuweisung entfernen
unresolved: Ungelöst
@@ -399,22 +401,22 @@ de:
title: Benutzerdefiniertes CSS
hero:
desc_html: Wird auf der Startseite angezeigt. Mindestens 600x100px sind empfohlen. Wenn es nicht gesetzt wurde, wird das Server-Thumbnail dafür verwendet
- title: Bild für Startseite
+ title: Bild für Einstiegsseite
mascot:
desc_html: Angezeigt auf mehreren Seiten. Mehr als 293x205px empfohlen. Wenn es nicht gesetzt wurde wird es auf das Standard-Maskottchen zurückfallen
title: Maskottchen-Bild
peers_api_enabled:
- desc_html: Domain-Namen, die der Server im Fediverse gefunden hat
- title: Veröffentliche Liste von gefundenen Servern
+ desc_html: Domain-Namen, die der Server im Fediversum gefunden hat
+ title: Veröffentliche entdeckte Server durch die API
preview_sensitive_media:
desc_html: Linkvorschauen auf anderen Webseiten werden ein Vorschaubild anzeigen, obwohl die Medien als heikel gekennzeichnet sind
- title: Heikle Medien in OpenGraph-Vorschauen anzeigen
+ title: Heikle Medien im OpenGraph-Vorschau anzeigen
profile_directory:
desc_html: Erlaube Benutzer auffindbar zu sein
title: Aktiviere Profilverzeichnis
registrations:
closed_message:
- desc_html: Wird auf der Frontseite angezeigt, wenn die Registrierung geschlossen ist. Du kannst HTML-Tags benutzen
+ desc_html: Wird auf der Einstiegsseite gezeigt, wenn die Anmeldung geschlossen ist. Du kannst HTML-Tags nutzen
title: Nachricht über geschlossene Registrierung
deletion:
desc_html: Allen erlauben, ihr Konto eigenmächtig zu löschen
@@ -430,7 +432,7 @@ de:
title: Registrierungsmodus
show_known_fediverse_at_about_page:
desc_html: Wenn aktiviert, wird es alle Beiträge aus dem bereits bekannten Teil des Fediversums auf der Startseite anzeigen. Andernfalls werden lokale Beitrage des Servers angezeigt.
- title: Verwende öffentliche Zeitleiste für die Vorschau
+ title: Zeige eine öffentliche Zeitleiste auf der Einstiegsseite
show_staff_badge:
desc_html: Zeige Mitarbeiter-Badge auf Benutzerseite
title: Zeige Mitarbeiter-Badge
@@ -441,17 +443,17 @@ de:
desc_html: Bietet sich für Verhaltenskodizes, Regeln, Richtlinien und weiteres an, was deinen Server auszeichnet. Du kannst HTML-Tags benutzen
title: Erweiterte Beschreibung des Servers
site_short_description:
- desc_html: Wird angezeigt in der Seitenleiste und in Meta-Tags. Beschreibe in einem einzigen Abschnitt, was Mastodon ist und was diesen Server ausmacht. Falls leer, wird die Server-Beschreibung verwendet.
- title: Kurze Server-Beschreibung
+ desc_html: Wird angezeigt in der Seitenleiste und in Meta-Tags. Beschreibe in einem einzigen Abschnitt, was Mastodon ist und was diesen Server von anderen unterscheidet. Falls leer, wird die Server-Beschreibung verwendet.
+ title: Kurze Beschreibung des Servers
site_terms:
- desc_html: Hier kannst du deine eigenen Geschäftsbedingungen, Datenschutzerklärung und anderes rechtlich Relevante eintragen. Du kannst HTML-Tags benutzen
- title: Eigene Geschäftsbedingungen
+ desc_html: Hier kannst du deine eigenen Geschäftsbedingungen, Datenschutzerklärung und anderes rechtlich Relevante eintragen. Du kannst HTML-Tags nutzen
+ title: Benutzerdefinierte Geschäftsbedingungen
site_title: Name des Servers
thumbnail:
desc_html: Wird für die Vorschau via OpenGraph und API verwendet. 1200×630 px wird empfohlen
- title: Server-Thumbnail
+ title: Vorschaubild des Servers
timeline_preview:
- desc_html: Auf der Frontseite die öffentliche Zeitleiste anzeigen
+ desc_html: Auf der Einstiegsseite die öffentliche Zeitleiste anzeigen
title: Zeitleisten-Vorschau
title: Server-Einstellungen
statuses:
@@ -464,7 +466,7 @@ de:
media:
title: Medien
no_media: Keine Medien
- no_status_selected: Keine Beiträge wurden verändert, weil keine ausgewählt wurden
+ no_status_selected: Keine Beiträge wurden geändert, weil keine ausgewählt wurden
title: Beiträge des Kontos
with_media: Mit Medien
subscriptions:
@@ -477,7 +479,7 @@ de:
tags:
accounts: Konten
hidden: Versteckt
- hide: Vor Verzeichnis verstecken
+ hide: Vom Profilverzeichnis verstecken
name: Hashtag
title: Hashtags
unhide: Zeige in Verzeichnis
@@ -497,13 +499,19 @@ de:
body: "%{reporter} hat %{target} gemeldet"
body_remote: Jemand von %{domain} hat %{target} gemeldet
subject: Neue Meldung auf %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Fortgeschrittene Benutzeroberfläche
+ advanced_web_interface_hint: Wenn du mehr aus deiner Bildschirmbreite herausholen möchtest, erlaubt dir die fortgeschrittene Benutzeroberfläche viele unterschiedliche Spalten auf einmal zu sehen, wie z.B. deine Startseite, Benachrichtigungen, das gesamte bekannte Netz, deine Listen und beliebige Hashtags.
+ animations_and_accessibility: Animationen und Barrierefreiheit
+ confirmation_dialogs: Bestätigungsfenster
+ sensitive_content: Heikle Inhalte
application_mailer:
notification_preferences: Ändere E-Mail-Einstellungen
salutation: "%{name},"
settings: 'E-Mail-Einstellungen ändern: %{link}'
view: 'Ansehen:'
view_profile: Zeige Profil
- view_status: Zeige Status
+ view_status: Beitrag öffnen
applications:
created: Anwendung erfolgreich erstellt
destroyed: Anwendung erfolgreich gelöscht
@@ -545,8 +553,8 @@ de:
following: 'Erfolg! Du folgst nun:'
post_follow:
close: Oder du schließt einfach dieses Fenster.
- return: Zeige Profil des Benutzers
- web: Das Web öffnen
+ return: Zeige das Profil
+ web: In der Benutzeroberfläche öffnen
title: "%{acct} folgen"
datetime:
distance_in_words:
@@ -557,8 +565,8 @@ de:
half_a_minute: Gerade eben
less_than_x_minutes: "%{count}m"
less_than_x_seconds: Gerade eben
- over_x_years: "%{count}y"
- x_days: "%{count}d"
+ over_x_years: "%{count}J"
+ x_days: "%{count}T"
x_minutes: "%{count}m"
x_months: "%{count}mo"
x_seconds: "%{count}s"
@@ -573,8 +581,8 @@ de:
directories:
directory: Profilverzeichnis
enabled: Du bist gerade in dem Verzeichnis gelistet.
- enabled_but_waiting: Du bist damit einverstanden im Verzeichnis gelistet zu werden, aber du hast nicht die minimale Anzahl an Folgenden (%{min_followers}), damit es passiert.
- explanation: Entdecke Benutzer basierend auf deren Interessen
+ enabled_but_waiting: Du bist damit einverstanden im Verzeichnis aufgelistet zu werden, aber du hast noch nicht genug Folger_innen (%{min_followers}).
+ explanation: Entdecke Benutzer_innen basierend auf deren Interessen
explore_mastodon: Entdecke %{title}
how_to_enable: Du hast dich gerade nicht dazu entschieden im Verzeichnis gelistet zu werden. Du kannst dich unten dafür eintragen. Benutze Hashtags in deiner Profilbeschreibung, um unter spezifischen Hashtags gelistet zu werden!
people:
@@ -706,7 +714,7 @@ de:
media_attachments:
validations:
images_and_video: Es kann kein Video an einen Beitrag, der bereits Bilder enthält, angehängt werden
- too_many: Es können nicht mehr als 4 Bilder angehängt werden
+ too_many: Es können nicht mehr als 4 Dateien angehängt werden
migrations:
acct: benutzername@domain des neuen Kontos
currently_redirecting: 'Deine Profilweiterleitung wurde gesetzt auf:'
@@ -758,7 +766,6 @@ de:
quadrillion: Q
thousand: K
trillion: T
- unit: ''
pagination:
newer: Neuer
next: Vorwärts
@@ -776,10 +783,9 @@ de:
too_few_options: muss mindestens einen Eintrag haben
too_many_options: kann nicht mehr als %{max} Einträge beinhalten
preferences:
- languages: Sprachen
other: Weiteres
- publishing: Beiträge
- web: Web
+ posting_defaults: Standardeinstellungen für Beiträge
+ public_timelines: Öffentliche Zeitleisten
relationships:
activity: Kontoaktivität
dormant: Inaktiv
@@ -862,7 +868,7 @@ de:
settings:
account: Konto
account_settings: Konto & Sicherheit
- appearance: Bearbeiten
+ appearance: Aussehen
authorized_apps: Autorisierte Anwendungen
back: Zurück zu Mastodon
delete: Konto löschen
@@ -877,7 +883,7 @@ de:
notifications: Benachrichtigungen
preferences: Einstellungen
profile: Profil
- relationships: Folgende und Follower
+ relationships: Folger_innen und Gefolgte
two_factor_authentication: Zwei-Faktor-Auth
statuses:
attached:
@@ -891,8 +897,8 @@ de:
boosted_from_html: Geteilt von %{acct_link}
content_warning: 'Inhaltswarnung: %{warning}'
disallowed_hashtags:
- one: 'Enthält den unerlaubten Hashtag: %{tags}'
- other: 'Enthält die unerlaubten Hashtags: %{tags}'
+ one: 'enthält einen verbotenen Hashtag: %{tags}'
+ other: 'enthält verbotene Hashtags: %{tags}'
language_detection: Sprache automatisch erkennen
open_in_web: Im Web öffnen
over_character_limit: Zeichenlimit von %{max} überschritten
@@ -919,17 +925,17 @@ de:
stream_entries:
pinned: Angehefteter Beitrag
reblogged: teilte
- sensitive_content: Sensible Inhalte
+ sensitive_content: Heikle Inhalte
terms:
body_html: |
Datenschutzerklärung
Welche Informationen sammeln wir?
-
Grundlegende Kontoinformationen: Wenn du dich auf diesem Server registrierst, wirst du darum gebeten, einen Benutzer:innen-Namen, eine E-Mail-Adresse und ein Passwort einzugeben. Du kannst auch zusätzliche Profilinformationen wie etwa einen Anzeigenamen oder eine Biografie eingeben und ein Profilbild oder ein Headerbild hochladen. Der Benutzer:innen-Name, der Anzeigename, die Biografie, das Profilbild und das Headerbild werden immer öffentlich angezeigt.
-
Beiträge, Folge- und andere öffentliche Informationen: Die Liste der Leute, denen du folgst, wird öffentlich gezeigt, das gleiche gilt für deine Folgenden (Follower). Sobald du eine Nachricht übermittelst, wird das Datum und die Uhrzeit gemeinsam mit der Information, welche Anwendung du dafür verwendet hast, gespeichert. Nachricht können Medienanhänge enthalten, etwa Bilder und Videos. Öffentliche und ungelistete Beiträge sind öffentlich verfügbar. Sobald du einen Beitrag auf deinem Profil anpinnst, sind dies auch öffentlich verfügbare Informationen. Deine Beiträge werden an deine Folgenden ausgeliefert, was in manchen Fällen bedeutet, dass sie an andere Server ausgeliefert werden und dort Kopien gespeichert werden. Sobald du Beiträge löschst, wird dies ebenso an deine Follower ausgeliefert. Die Handlungen des Teilens und Favorisieren eines anderen Beitrages ist immer öffentlich.
-
Direkte und "Nur Folgende"-Beiträge: Alle Beiträge werden auf dem Server gespeichert und verarbeitet. "Nur Folgende"-Beiträge werden an deine Folgenden und an Benutzer:innen, die du in ihnen erwähnst, ausgeliefert, direkte Beiträge nur an in ihnen erwähnte Benutzer:innen. In manchen Fällen bedeutet dass, dass sie an andere Server ausgeliefert werden und dort Kopien gespeichert werden. Wir bemühen uns nach bestem Wissen und Gewissen, den Zugriff auf diese Beiträge auf nur autorisierte Personen einzuschränken, jedoch könnten andere Server dabei scheitern. Deswegen ist es wichtig, die Server, zu denen deine Folgenden gehören, zu überprüfen. Du kannst eine Option in den Einstellungen umschalten, um neue Folgenden manuell anzunehmen oder abzuweisen. Bitte beachte, dass die Betreiber des Server und jedes empfangenden Servers solche Nachrichten anschauen könnten und dass Empfänger von diesen eine Bildschirmkopie erstellen könnten, sie kopieren oder anderweitig weiterverteilen könnten. Teile nicht irgendwelche gefährlichen Informationen über Mastodon.
-
Internet Protocol-Adressen (IP-Adressen) und andere Metadaten: Sobald du dich anmeldest, erfassen wir sowohl die IP-Adresse, von der aus du dich anmeldest, als auch den Namen deine Browseranwendung. Alle angemeldeten Sitzungen (Sessions) sind für deine Überprüfung und Widerruf in den Einstellungen verfügbar. Die letzte verwendete IP-Adresse wird bis zu 12 Monate lang gespeichert. Wir könnten auch Serverprotokoll behalten, welche die IP-Adresse von jeder Anfrage an unseren Server enthalten.
+
Grundlegende Kontoinformationen: Wenn du dich auf diesem Server registrierst, wirst du darum gebeten, einen Benutzer:innen-Namen, eine E-Mail-Adresse und ein Passwort einzugeben. Du kannst auch zusätzliche Profilinformationen wie etwa einen Anzeigenamen oder eine Biografie eingeben und ein Profilbild oder ein Headerbild hochladen. Der Benutzer:innen-Name, der Anzeigename, die Biografie, das Profilbild und das Headerbild werden immer öffentlich angezeigt.
+
Beiträge, Folge- und andere öffentliche Informationen: Die Liste der Leute, denen du folgst, wird öffentlich gezeigt, das gleiche gilt für deine Folgenden (Follower). Sobald du eine Nachricht übermittelst, wird das Datum und die Uhrzeit gemeinsam mit der Information, welche Anwendung du dafür verwendet hast, gespeichert. Nachricht können Medienanhänge enthalten, etwa Bilder und Videos. Öffentliche und ungelistete Beiträge sind öffentlich verfügbar. Sobald du einen Beitrag auf deinem Profil anpinnst, sind dies auch öffentlich verfügbare Informationen. Deine Beiträge werden an deine Folgenden ausgeliefert, was in manchen Fällen bedeutet, dass sie an andere Server ausgeliefert werden und dort Kopien gespeichert werden. Sobald du Beiträge löschst, wird dies ebenso an deine Follower ausgeliefert. Die Handlungen des Teilens und Favorisieren eines anderen Beitrages ist immer öffentlich.
+
Direkte und "Nur Folgende"-Beiträge: Alle Beiträge werden auf dem Server gespeichert und verarbeitet. "Nur Folgende"-Beiträge werden an deine Folgenden und an Benutzer:innen, die du in ihnen erwähnst, ausgeliefert, direkte Beiträge nur an in ihnen erwähnte Benutzer:innen. In manchen Fällen bedeutet dass, dass sie an andere Server ausgeliefert werden und dort Kopien gespeichert werden. Wir bemühen uns nach bestem Wissen und Gewissen, den Zugriff auf diese Beiträge auf nur autorisierte Personen einzuschränken, jedoch könnten andere Server dabei scheitern. Deswegen ist es wichtig, die Server, zu denen deine Folgenden gehören, zu überprüfen. Du kannst eine Option in den Einstellungen umschalten, um neue Folgenden manuell anzunehmen oder abzuweisen. Bitte beachte, dass die Betreiber des Server und jedes empfangenden Servers solche Nachrichten anschauen könnten und dass Empfänger von diesen eine Bildschirmkopie erstellen könnten, sie kopieren oder anderweitig weiterverteilen könnten. Teile nicht irgendwelche gefährlichen Informationen über Mastodon.
+
Internet Protocol-Adressen (IP-Adressen) und andere Metadaten: Sobald du dich anmeldest, erfassen wir sowohl die IP-Adresse, von der aus du dich anmeldest, als auch den Namen deine Browseranwendung. Alle angemeldeten Sitzungen (Sessions) sind für deine Überprüfung und Widerruf in den Einstellungen verfügbar. Die letzte verwendete IP-Adresse wird bis zu 12 Monate lang gespeichert. Wir könnten auch Serverprotokoll behalten, welche die IP-Adresse von jeder Anfrage an unseren Server enthalten.
@@ -939,9 +945,9 @@ de:
Jede der von dir gesammelten Information kann in den folgenden Weisen verwendet werden:
-
Um die Kernfunktionalität von Mastodon bereitzustellen. Du kannst du mit dem Inhalt anderer Leute interagieren und deine eigenen Inhalte beitragen, wenn du angemeldet bist. Zum Beispiel kannst du anderen folgen, um deren kombinierten Beiträge in deine personalisierten Start-Timeline zu sehen.
-
Um Moderation der Community zu ermöglichen, zum Beispiel beim Vergleichen deiner IP-Adresse mit anderen bekannten, um Verbotsumgehung oder andere Vergehen festzustellen.
-
Die E-Mail-Adresse, die du bereitstellst, kann dazu verwendet werden, dir Informationen, Benachrichtigungen über andere Leute, die mit deinen Inhalten interagieren oder dir Nachrichten senden, und auf Anfragen, Wünsche und/oder Fragen zu antworten.
+
Um die Kernfunktionalität von Mastodon bereitzustellen. Du kannst du mit dem Inhalt anderer Leute interagieren und deine eigenen Inhalte beitragen, wenn du angemeldet bist. Zum Beispiel kannst du anderen folgen, um deren kombinierten Beiträge in deine personalisierten Start-Timeline zu sehen.
+
Um Moderation der Community zu ermöglichen, zum Beispiel beim Vergleichen deiner IP-Adresse mit anderen bekannten, um Verbotsumgehung oder andere Vergehen festzustellen.
+
Die E-Mail-Adresse, die du bereitstellst, kann dazu verwendet werden, dir Informationen, Benachrichtigungen über andere Leute, die mit deinen Inhalten interagieren oder dir Nachrichten senden, und auf Anfragen, Wünsche und/oder Fragen zu antworten.
@@ -957,8 +963,8 @@ de:
Wir werden mit bestem Wissen und Gewissen:
-
Serverprotokolle, die IP-Adressen von allen deinen Anfragen an diesen Server, falls solche Protokolle behalten werden, für nicht mehr als 90 Tage behalten.
-
registrierten Benutzer:innen zugeordnete IP-Adressen nicht länger als 12 Monate behalten.
+
Serverprotokolle, die IP-Adressen von allen deinen Anfragen an diesen Server, falls solche Protokolle behalten werden, für nicht mehr als 90 Tage behalten.
+
registrierten Benutzer:innen zugeordnete IP-Adressen nicht länger als 12 Monate behalten.
Du kannst ein Archiv deines Inhalts anfordern und herunterladen, inkludierend deiner Beiträge, Medienanhänge, Profilbilder und Headerbilder.
@@ -1015,7 +1021,7 @@ de:
month: "%b %Y"
two_factor_authentication:
code_hint: Gib zur Bestätigung den Code ein, den deine Authenticator-App generiert hat
- description_html: Wenn du Zwei-Faktor-Authentisierung (2FA) aktivierst, wirst du dein Telefon zum Anmelden benötigen. Darauf werden Tokens erzeugt, die du bei der Anmeldung eingeben musst.
+ description_html: Wenn du Zwei-Faktor-Authentifizierung (2FA) aktivierst, wirst du dein Telefon zum Anmelden benötigen. Darauf werden Sicherheitscodes erzeugt, die du bei der Anmeldung eingeben musst.
disable: Deaktivieren
enable: Aktivieren
enabled: Zwei-Faktor-Authentisierung ist aktiviert
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
index 927eeee5a..366bd81b9 100644
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@@ -12,52 +12,53 @@ ar:
last_attempt: بإمكانك إعادة المحاولة مرة واحدة قبل أن يتم قفل حسابك.
locked: إن حسابك مقفل.
not_found_in_database: "%{authentication_keys} أو كلمة سر خاطئة."
- timeout: لقد إنتهت مدة صلاحية جلستك. قم بتسجيل الدخول من جديد للمواصلة.
+ pending: إنّ حسابك في انتظار مراجعة.
+ timeout: لقد انتهت مدة صلاحية جلستك. قم بتسجيل الدخول من جديد للمواصلة.
unauthenticated: يجب عليك تسجيل الدخول أو إنشاء حساب قبل المواصلة.
unconfirmed: يجب عليك تأكيد عنوان بريدك الإلكتروني قبل المواصلة.
mailer:
confirmation_instructions:
action: للتحقق من عنوان البريد الإلكتروني
action_with_app: تأكيد ثم العودة إلى %{app}
- explanation: لقد قمت بإنشاء حساب على %{host} بواسطة عنوان البريد الإلكتروني الحالي. إنك على بعد خطوات قليلة من تفعليه. إن لم تكن من طلب ذلك، يرجى ألّا تولي إهتماما بهذه الرسالة.
+ explanation: لقد قمت بإنشاء حساب على %{host} بواسطة عنوان البريد الإلكتروني الحالي. إنك على بعد خطوات قليلة من تفعليه. إن لم تكن من طلب ذلك، يرجى ألّا تولي اهتماما بهذه الرسالة.
extra_html: ندعوك إلى الإطلاع على القواعد الخاصة بمثيل الخادوم هذا and و شروط الخدمة الخاصة بنا.
- subject: 'ماستدون : تعليمات التأكيد لمثيل الخادوم %{instance}'
+ subject: 'ماستدون: تعليمات التأكيد لمثيل الخادوم %{instance}'
title: للتحقق من عنوان البريد الإلكتروني
email_changed:
- explanation: 'لقد تم تغيير عنوان البريد الإلكتروني الخاص بحسابك إلى :'
+ explanation: 'لقد تم تغيير عنوان البريد الإلكتروني الخاص بحسابك إلى:'
extra: إن لم تقم شخصيًا بتعديل عنوان بريدك الإلكتروني ، ذلك يعني أنّ شخصا آخر قد نَفِذَ إلى حسابك. فالرجاء قم بتعديل كلمتك السرية في الحال أو قم بالإتصال بمدير مثيل الخادوم إن كنت غير قادر على استعمال حسابك.
- subject: 'ماستدون : تم استبدال عنوان بريدك الإلكتروني'
+ subject: 'ماستدون: تم استبدال عنوان بريدك الإلكتروني'
title: عنوان البريد الإلكتروني الجديد
password_change:
explanation: تم تغيير كلمة السر الخاصة بحسابك.
- extra: إن لم تقم شخصيًا بتعديل كلمتك السرية، ذلك يعني أنّ شخصا آخر قد سيطر على حسابك. فالرجاء قم بتعديل كلمتك السرية في الحال أو قم بالإتصال بمدير مثيل الخادوم إن كنت غير قادر على استعمال حسابك.
- subject: 'ماستدون : تم تغيير كلمة المرور'
+ extra: إن لم تقم شخصيًا بتعديل كلمتك السرية، ذلك يعني أنّ شخصا آخر قد سيطر على حسابك. فالرجاء قم بتعديل كلمتك السرية في الحال أو قم بالاتصال بمدير مثيل الخادوم إن كنت غير قادر على استعمال حسابك.
+ subject: 'ماستدون: تم تغيير كلمة المرور'
title: تم تغيير كلمة السر
reconfirmation_instructions:
explanation: ندعوك لتأكيد العنوان الجديد قصد تعديله في بريدك.
- extra: إن لم تكن صاحب هذا الطلب ، يُرجى عدم إعارة الإهتمام لهذه الرسالة. فعنوان البريد الإلكتروني المتعلق بحساب ماستدون سوف يبقى هو مِن غير أي تعديل إلّا و فقط إن قمت بالنقر على الرابط أعلاه قصد تعديله.
- subject: 'ماستدون : تأكيد كلمة السر الخاصة بـ %{instance}'
+ extra: إن لم تكن صاحب هذا الطلب ، يُرجى عدم إعارة الاهتمام لهذه الرسالة. فعنوان البريد الإلكتروني المتعلق بحساب ماستدون سوف يبقى هو مِن غير أي تعديل إلّا و فقط إن قمت بالنقر على الرابط أعلاه قصد تعديله.
+ subject: 'ماستدون: تأكيد كلمة السر الخاصة بـ %{instance}'
title: التحقق من عنوان البريد الإلكتروني
reset_password_instructions:
action: تغيير كلمة السر
explanation: لقد قمت بطلب تغيير كلمة السر الخاصة بحسابك.
- extra: إن لم تكن صاحب هذا الطلب ، يُرجى عدم إعارة الإهتمام لهذه الرسالة. فكلِمَتُك السرية تبقى هي مِن غير أي تعديل إلّا و فقط إن قمت بالنقر على الرابط أعلاه قصد إنشاء كلمة سرية جديدة.
- subject: 'ماستدون : تعليمات إستعادة كلمة المرور'
+ extra: إن لم تكن صاحب هذا الطلب ، يُرجى عدم إعارة الاهتمام لهذه الرسالة. فكلِمَتُك السرية تبقى هي مِن غير أي تعديل إلّا و فقط إن قمت بالنقر على الرابط أعلاه قصد إنشاء كلمة سرية جديدة.
+ subject: 'ماستدون: تعليمات استعادة كلمة المرور'
title: إعادة تعيين كلمة السر
unlock_instructions:
- subject: 'ماستدون : تعليمات فك القفل'
+ subject: 'ماستدون: تعليمات فك القفل'
omniauth_callbacks:
failure: تعذرت المصادقة من %{kind} بسبب "%{reason}".
success: تمت المصادقة بنجاح عبر حساب %{kind}.
passwords:
- no_token: ليس بإمكانك النفاذ إلى هذه الصفحة إن لم تقم بالنقر على الرابط المتواجد في الرسالة الإلكترونية. الرجاء التحقق مِن أنك قمت بإدخال عنوان الرابط كاملا كما هو مذكور في رسالة إعادة تعيين الكلمة السرية.
- send_instructions: إن كان عنوان بريدك الإلكتروني ضمن قاعدة بياناتنا، فسوف تتلقّى في غضون دقائق رابطا يُمكّنُك مِن استعادة كلمتك السرية على عنوان علبة البريد الإلكتروني الخاصة بك.إن لم تجد هذه الرسالة، يرجى تفقد مجلّد البريد المزعج.
- send_paranoid_instructions: إن كان عنوان بريدك الإلكتروني ضمن قاعدة بياناتنا، فسوف تتلقّى في غضون دقائق رابطا يُمكّنُك مِن استعادة كلمتك السرية على عنوان علبة البريد الإلكتروني الخاصة بك.إن لم تجد هذه الرسالة، يرجى تفقد مجلّد البريد المزعج.
+ no_token: ليس بإمكانك النفاذ إلى هذه الصفحة إن لم تقم بالنقر على الرابط المتواجد في الرسالة الإلكترونية. الرجاء التحقق مِن أنك قمت بإدخال عنوان الرابط كاملا كما هو مذكور في رسالة إعادة تعيين الكلمة السرية.
+ send_instructions: إن كان عنوان بريدك الإلكتروني ضمن قاعدة بياناتنا، فسوف تتلقّى في غضون دقائق رابطا يُمكّنُك مِن استعادة كلمتك السرية على عنوان علبة البريد الإلكتروني الخاصة بك. إن لم تجد هذه الرسالة، يرجى تفقد مجلّد البريد المزعج.
+ send_paranoid_instructions: إن كان عنوان بريدك الإلكتروني ضمن قاعدة بياناتنا، فسوف تتلقّى في غضون دقائق رابطا يُمكّنُك مِن استعادة كلمتك السرية على عنوان علبة البريد الإلكتروني الخاصة بك. إن لم تجد هذه الرسالة، يرجى تفقد مجلّد البريد المزعج.
updated: تم تغيير كلمة المرور بنجاح. أنت مسجل الآن.
updated_not_active: تم تغيير كلمة المرور بنجاح.
registrations:
- destroyed: إلى اللقاء ! لقد تم إلغاء حسابك. نتمنى أن نراك مجددا.
- signed_up: أهلا وسهلا ! تم تسجيل دخولك بنجاح.
+ destroyed: إلى اللقاء! لقد تم إلغاء حسابك. نتمنى أن نراك مجددا.
+ signed_up: أهلا وسهلا! تم تسجيل دخولك بنجاح.
signed_up_but_inactive: لقد تمت عملية إنشاء حسابك بنجاح إلاّ أنه لا يمكننا تسجيل دخولك إلاّ بعد قيامك بتفعيله.
signed_up_but_locked: لقد تم تسجيل حسابك بنجاح إلّا أنه لا يمكنك تسجيل الدخول لأن حسابك مجمد.
signed_up_but_unconfirmed: لقد تم إرسال رسالة تحتوي على رابط للتفعيل إلى عنوان بريدك الإلكتروني. بالضغط على الرابط سوف يتم تفعيل حسابك. لذا يُرجى إلقاء نظرة على ملف الرسائل غير المرغوب فيها إنْ لم تَعثُر على الرسالة السالفة الذِكر.
@@ -70,12 +71,12 @@ ar:
unlocks:
send_instructions: سوف تتلقى خلال بضع دقائق رسالة إلكترونية تحتوي على التعليمات اللازمة لفك القفل عن حسابك. إن لم تتلقى تلك الرسالة ، ندعوك إلى تفقُّد مجلد البريد المزعج.
send_paranoid_instructions: إن كان حسابك موجود فعليًا فسوف تتلقى في غضون دقائق رسالة إلكترونية تحتوي على تعليمات تدُلُّك على كيفية فك القفل عن حسابك. إن لم تتلقى تلك الرسالة ، ندعوك إلى تفقُّد مجلد البريد المزعج.
- unlocked: لقد تمت عملية إلغاء تجميد حسابك بنجاح. للمواصلة، يُرجى تسجيل الدخول.
+ unlocked: لقد تمت عملية إلغاء تجميد حسابك بنجاح. للمواصلة ، يُرجى تسجيل الدخول.
errors:
messages:
- already_confirmed: قمت بتأكيده من قبل، يرجى إعادة محاولة تسجيل الدخول
+ already_confirmed: قمت بتأكيده من قبل ، يرجى إعادة محاولة تسجيل الدخول
confirmation_period_expired: يجب التأكد منه قبل انقضاء مدة %{period}، يرجى إعادة طلب جديد
- expired: إنتهت مدة صلاحيته، الرجاء طلب واحد جديد
+ expired: انتهت مدة صلاحيته، الرجاء طلب واحد جديد
not_found: لا يوجد
not_locked: ليس مقفلاً
not_saved:
@@ -83,5 +84,5 @@ ar:
many: "%{count} أخطاء منعت هذا %{resource} من الحفظ:"
one: 'خطأ واحد منع هذا %{resource} من الحفظ:'
other: "%{count} أخطاء منعت هذا %{resource} من الحفظ:"
- two: 'أخطاء منعت هذا %{resource} من الحفظ:'
- zero: 'أخطاء منعت هذا %{resource} من الحفظ:'
+ two: "%{count} أخطاء منعت هذا %{resource} من الحفظ:"
+ zero: "%{count} أخطاء منعت هذا %{resource} من الحفظ:"
diff --git a/config/locales/devise.bn.yml b/config/locales/devise.bn.yml
new file mode 100644
index 000000000..152c69829
--- /dev/null
+++ b/config/locales/devise.bn.yml
@@ -0,0 +1 @@
+bn:
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index aea361d0d..7f2df1f99 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -3,15 +3,17 @@ ca:
devise:
confirmations:
confirmed: L'adreça de correu s'ha confirmat correctament.
- send_instructions: En pocs minuts rebràs un correu electrònic amb instruccions sobre com confirmar l'adreça de correu.
- send_paranoid_instructions: Si l'adreça de correu electrònic existeix en la nostra base de dades, en pocs minuts rebràs un correu electrònic amb instruccions sobre com confirmar l'adreça de correu.
+ send_instructions: "En pocs minuts rebràs un correu electrònic amb instruccions sobre com confirmar l'adreça de correu. \nSi us plau verifica la carpeta de corrreu brossa si no has rebut aquest correu."
+ send_paranoid_instructions: |-
+ Si l'adreça de correu electrònic existeix en la nostra base de dades, en pocs minuts rebràs un correu electrònic amb instruccions sobre com confirmar l'adreça de correu.
+ Si us plau verifica la carpeta de corrreu brossa si no has rebut aquest correu.
failure:
already_authenticated: Ja estàs registrat.
inactive: El teu compte encara no s'ha activat.
invalid: "%{authentication_keys} o contrasenya no són vàlids."
- last_attempt: Tens un intent més, abans que es bloqui el compte.
- locked: El compte s'ha blocat.
- not_found_in_database: "%{authentication_keys} o contrasenya no vàlids."
+ last_attempt: Tens un intent més, abans que es bloqueji el compte.
+ locked: El compte s'ha bloquejat.
+ not_found_in_database: "%{authentication_keys} o contrasenya no són vàlids."
pending: El teu compte encara està en revisió.
timeout: La sessió ha expirat. Inicia sessió una altra vegada per a continuar.
unauthenticated: Cal iniciar sessió o registrar-se abans de continuar.
@@ -50,7 +52,7 @@ ca:
subject: 'Mastodon: Instruccions per a desblocar'
omniauth_callbacks:
failure: No podem autentificar-te desde %{kind} degut a "%{reason}".
- success: Autentificat amb èxit des del compte %{kind} .
+ success: Autentificat amb èxit des del compte %{kind}.
passwords:
no_token: No pots accedir a aquesta pàgina sense provenir des del correu de restabliment de la contrasenya. Si vens des del correu de restabliment de contrasenya, assegura't que estàs emprant l'adreça completa proporcionada.
send_instructions: Rebràs un correu electrònic amb instruccions sobre com reiniciar la contrasenya en pocs minuts.
@@ -65,7 +67,7 @@ ca:
signed_up_but_pending: S'ha enviat un missatge amb un enllaç de confirmació a la teva adreça de correu electrònic. Després de que hagis fet clic a l'enllaç, revisarem la teva sol·licitud. Se't notificarà si s'aprova.
signed_up_but_unconfirmed: Un missatge amb un enllaç de confirmació ha estat enviat per correu electrònic. Si us plau segueixi l'enllaç per activar el seu compte.
update_needs_confirmation: Ha actualitzat el seu compte amb èxit, però necessitem verificar la nova adreça de correu. Si us plau comprovi el correu i segueixi l'enllaç per confirmar la nova adreça de correu.
- updated: el seu compte ha estat actualitzat amb èxit.
+ updated: El seu compte ha estat actualitzat amb èxit.
sessions:
already_signed_out: Has tancat la sessió amb èxit.
signed_in: T'has registrat amb èxit.
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index bc9340605..94c41ed98 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -83,5 +83,6 @@ cs:
not_locked: nebyl uzamčen
not_saved:
few: "%{count} chyby zabránily uložení tohoto %{resource}:"
+ many: "%{count} chyb zabránilo uložení tohoto %{resource}:"
one: '1 chyba zabránila uložení tohoto %{resource}:'
other: "%{count} chyb zabránilo uložení tohoto %{resource}:"
diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml
index 8ea7e1b4f..727c71464 100644
--- a/config/locales/devise.cy.yml
+++ b/config/locales/devise.cy.yml
@@ -12,6 +12,7 @@ cy:
last_attempt: Mae gennych un cyfle arall cyn i'ch cyfrif gael ei gloi.
locked: Mae eich cyfrif wedi ei gloi.
not_found_in_database: "%{authentication_keys} neu gyfrinair annilys."
+ pending: Mae eich cyfrif dal o dan adolygiad.
timeout: Mae eich sesiwn wedi dod i ben. Mewngofnodwch eto i barhau.
unauthenticated: Mae angen i chi fewngofnodi neu gofrestru cyn parhau.
unconfirmed: Mae rhaid i chi gadarnhau eich cyfeiriad e-bost cyn parhau.
@@ -20,6 +21,7 @@ cy:
action: Gwiriwch eich cyfeiriad e-bost
action_with_app: Cadarnhau a dychwelyd i %{app}
explanation: Yr ydych wedi creu cyfrif ar %{host} gyda'r cyfrif e-bost hwn. Dim ond un clic sydd angen i'w wneud yn weithredol. Os nad chi oedd hyn, anwybyddwch yr e-bost hwn os gwelwch yn dda.
+ explanation_when_pending: Rydych wedi gwneud cais am wahoddiad i %{host} gyda'r ebost hyn. Unwaith rydych wedi cadarnhau eich ebost, byddem yn adolygu eich cais. Ni fyddwch yn gallu mewngofnodi tan yr amser hono. Os caiff eich cais ei wrthod, felly nid oes angen unrhyw gweithred pellach o chi. Os nad oeddech wedi gwneud y cais hyn, anwybyddu'r ebost hon, os gwelwch yn dda.
extra_html: Gwnewch yn siŵr i edrych ar reolau'r achos a ein telerau gwasanaeth.
subject: 'Mastodon: Canllawiau cadarnhau i %{instance}'
title: Gwirio cyfeiriad e-bost
@@ -60,6 +62,7 @@ cy:
signed_up: Croeso! Rydych wedi cofrestru'n llwyddiannus.
signed_up_but_inactive: Yr ydych wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allwn eich mewngofnodi achos nid yw eich cyfrif wedi ei actifadu eto.
signed_up_but_locked: Yr ydych wedi cofrestru'n llwyddiannus. Fodd bynnag, ni allwn eich mewngofnodi achos fod eich cyfrif wedi ei gloi.
+ signed_up_but_pending: Mae neges a'ch cysylltiad cadarnhau wedi cael ei hanfon i'ch ebost. Ar ôl i chi ei glicio, byddem yn adolygu eich cais. Byddwch yn derbyn hysbysiad os caiff ei gymeradwyo.
signed_up_but_unconfirmed: Mae neges gyda dolen cadarnhau wedi ei anfon i'ch cyfeiriad e-bost. Dilynwch y ddolen er mwyn actifadu eich cyfrif. Edrychwch yn eich ffolder sbam os na dderbynioch chi'r e-bost hwn os gwelwch yn dda.
update_needs_confirmation: Rydych wedi diweddaru eich cyfrif yn llwyddiannus, ond mae angen i ni wirio'ch cyfeiriad e-bost newydd. Edrychwch ar eich e-byst a dilynwch y ddolen gadarnhau er mwyn cadarnhau eich cyfeiriad e-bost newydd. Edrychwch ar eich ffolder sbam os na dderbynioch chi yr e-bost hwn.
updated: Mae eich cyfrif wedi ei ddiweddaru yn llwyddiannus.
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index b63815309..d7b7b2d6c 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -12,6 +12,7 @@ eo:
last_attempt: Vi ankoraŭ povas provi unufoje antaŭ ol via konto estos ŝlosita.
locked: Via konto estas ŝlosita.
not_found_in_database: Nevalida %{authentication_keys} aŭ pasvorto.
+ pending: Via konto ankoraŭ estas kontrolanta.
timeout: Via seanco eksvalidiĝis. Bonvolu ensaluti denove por daŭrigi.
unauthenticated: Vi devas ensaluti aŭ registriĝi antaŭ ol daŭrigi.
unconfirmed: Vi devas konfirmi vian retadreson antaŭ ol daŭrigi.
@@ -20,6 +21,7 @@ eo:
action: Konfirmi retadreson
action_with_app: Konfirmi kaj reveni al %{app}
explanation: Vi kreis konton en %{host} per ĉi tiu retadreso. Nur klako restas por aktivigi ĝin. Se tio ne estis vi, bonvolu ignori ĉi tiun retmesaĝon.
+ explanation_when_pending: Vi petis inviton al %{host} per ĉi tiu retpoŝta adreso. Kiam vi konfirmas vian retpoŝtan adreson, ni revizios vian kandidatiĝon. Vi ne povas ensaluti ĝis tiam. Se via kandidatiĝo estas rifuzita, viaj datumoj estos forigitaj, do neniu alia ago estos postulita de vi. Se tio ne estis vi, bonvolu ignori ĉi tiun retpoŝton.
extra_html: Bonvolu rigardi la regulojn de la servilo kaj niajn uzkondiĉojn.
subject: 'Mastodon: Konfirmaj instrukcioj por %{instance}'
title: Konfirmi retadreson
@@ -60,6 +62,7 @@ eo:
signed_up: Bonvenon! Vi sukcese registriĝis.
signed_up_but_inactive: Vi sukcese registriĝis. Tamen, ni ne povis ensalutigi vin, ĉar via konto ankoraŭ ne estas konfirmita.
signed_up_but_locked: Vi sukcese registriĝis. Tamen, ni ne povis ensalutigi vin, ĉar via konto estas ŝlosita.
+ signed_up_but_pending: Mesaĝo kun konfirma ligilo estis sendita al via retpoŝta adreso. Post kiam vi alklakis la ligilon, ni revizios vian kandidatiĝon. Vi estos sciigita se ĝi estas aprobita.
signed_up_but_unconfirmed: Retmesaĝo kun konfirma ligilo estis sendita al via retadreso. Bonvolu sekvi la ligilon por aktivigi vian konton. Bonvolu kontroli vian spamujon, se vi ne ricevis ĉi tiun retmesaĝon.
update_needs_confirmation: Vi sukcese ĝisdatigis vian konton, sed ni bezonas kontroli vian novan retadreson. Bonvolu kontroli viajn retmesaĝojn kaj sekvi la konfirman ligilon por konfirmi vian novan retadreson. Bonvolu kontroli vian spamujon, se vi ne ricevis ĉi tiun retmesaĝon.
updated: Via konto estis sukcese ĝisdatigita.
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index ecb97fd13..8210415f2 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -2,7 +2,7 @@
es:
devise:
confirmations:
- confirmed: Su dirección de correo ha sido confirmada con éxito.
+ confirmed: Su direccion de email ha sido confirmada con exito.
send_instructions: Recibirá un correo electrónico con instrucciones sobre cómo confirmar su dirección de correo en pocos minutos.
send_paranoid_instructions: Si su dirección de correo electrónico existe en nuestra base de datos, recibirá un correo electrónico con instrucciones sobre cómo confirmar su dirección de correo en pocos minutos.
failure:
@@ -12,19 +12,22 @@ es:
last_attempt: Tiene un intento más antes de que su cuenta sea bloqueada.
locked: Su cuenta está bloqueada.
not_found_in_database: Inválido %{authentication_keys} o contraseña.
+ pending: Su cuenta aun se encuentra bajo revisión.
timeout: Su sesión ha expirado. Por favor inicie sesión de nuevo para continuar.
unauthenticated: Necesita iniciar sesión o registrarse antes de continuar.
unconfirmed: Tiene que confirmar su dirección de correo electrónico antes de continuar.
mailer:
confirmation_instructions:
action: Verificar dirección de correo electrónico
+ action_with_app: Confirmar y regresar a %{app}
explanation: Has creado una cuenta en %{host} con esta dirección de correo electrónico. Estas a un clic de activarla. Si no fue usted, por favor ignore este correo electrónico.
+ explanation_when_pending: Usted ha solicitado una invitación a %{host} con esta dirección de correo electrónico. Una vez que confirme su dirección de correo electrónico, revisaremos su aplicación. No puede iniciar sesión hasta que su aplicación sea revisada. Si su solicitud está rechazada, sus datos serán eliminados, así que no será necesaria ninguna acción adicional por ti. Si no fuera usted, por favor ignore este correo electrónico.
extra_html: Por favor revise las reglas de la instancia y nuestros términos de servicio.
subject: 'Mastodon: Instrucciones de confirmación para %{instance}'
title: Verificar dirección de correo electrónico
email_changed:
explanation: 'El correo electrónico para su cuenta esta siendo cambiada a:'
- extra: Si usted no a cambiado su correo electrónico. es probable que alguien a conseguido acceso a su cuenta. Por favor cambie su contraseña inmediatamente o contacte a el administrador de la instancia si usted esta bloqueado de su cuenta.
+ extra: Si usted no ha cambiado su correo electrónico, es probable que alguien haya conseguido acceso a su cuenta. Por favor cambie su contraseña inmediatamente o contacte al administrador de la instancia si usted no puede iniciar sesión.
subject: 'Mastodon: Correo electrónico cambiado'
title: Nueva dirección de correo electrónico
password_change:
@@ -59,6 +62,7 @@ es:
signed_up: "¡Bienvenido! Se ha registrado con éxito."
signed_up_but_inactive: Se ha registrado con éxito. Sin embargo, no podemos identificarle porque su cuenta no ha sido activada todavía.
signed_up_but_locked: Se ha registrado con éxito. Sin embargo, no podemos identificarle porque su cuenta está bloqueada.
+ signed_up_but_pending: Un mensaje con un enlace de confirmacion ha sido enviado a su direccion de email. Luego de clickear el link revisaremos su aplicacion. Seras notificado si es aprovada.
signed_up_but_unconfirmed: Un mensaje con un enlace de confirmación ha sido enviado a su correo electrónico. Por favor siga el enlace para activar su cuenta.
update_needs_confirmation: Ha actualizado su cuenta con éxito, pero necesitamos verificar su nueva dirección de correo. Por favor compruebe su correo y siga el enlace para confirmar su nueva dirección de correo.
updated: su cuenta ha sido actualizada con éxito.
diff --git a/config/locales/devise.eu.yml b/config/locales/devise.eu.yml
index 65046dc0f..3526f2ab5 100644
--- a/config/locales/devise.eu.yml
+++ b/config/locales/devise.eu.yml
@@ -12,6 +12,7 @@ eu:
last_attempt: Saiakera bat geratzen zaizu zure kontua giltzapetu aurretik.
locked: Zure kontua giltzapetuta dago.
not_found_in_database: Baliogabeko %{authentication_keys} edo pasahitza.
+ pending: Zure kontua oraindik berrikusteke dago.
timeout: Zure saioa iraungitu da. Hasi saioa berriro jarraitzeko.
unauthenticated: Saioa hasi edo izena eman behar duzu jarraitu aurretik.
unconfirmed: Zure e-mail helbidea baieztatu behar duzu jarraitu aurretik.
@@ -20,6 +21,7 @@ eu:
action: Baieztatu e-mail helbidea
action_with_app: Berretsi eta itzuli %{app} aplikaziora
explanation: Kontu bat sortu duzu %{host} ostalarian e-mail helbide honekin. Aktibatzeko klik bat falta zaizu. Ez baduzu zuk sortu, ez egin ezer e-mail honekin.
+ explanation_when_pending: "%{host} instantziara gonbidatua izatea eskatu duzu e-mail helbide honekin. Behin zure e-mail helbidea berresten duzula, zure eskaera berrikusiko da. Ezin duzu aurretik saioa hasi. Zure eskaera ukatuko balitz, zure datuak ezabatuko lirateke, eta ez zenuke beste ezer egiteko beharrik. Hau ez bazara zu izan, ezikusi e-mail hau."
extra_html: Egiaztatu zerbitzariaren arauak eta zerbitzuaren erabilera baldintzak.
subject: 'Mastodon: %{instance} instantziaren argibideak baieztapenerako'
title: Baieztatu e-mail helbidea
@@ -60,6 +62,7 @@ eu:
signed_up: Ongi etorri! Ongi hasi duzu saioa.
signed_up_but_inactive: Ongi eman duzu izena. Hala ere, ezin duzu saioa hasi zure kontua oraindik ez dagoelako aktibatuta.
signed_up_but_locked: Ongi eman duzu izena. Hala ere, ezin duzu saioa hasi zure kontua giltzapetuta dagoelako.
+ signed_up_but_pending: Berrespen esteka bat duen mezu bat bidali da zure e-mail helbidera. Behin esteka sakatzen duzula, zure eskaera berrikusiko da. Onartzen bada jakinaraziko zaizu.
signed_up_but_unconfirmed: Baieztapen esteka bat duen e-mail bidali zaizu. Jarraitu esteka zure kontua aktibatzeko. Egiaztatu spam karpeta ez baduzu e-mail hau jaso.
update_needs_confirmation: Zure kontua ongi eguneratu duzu, baina zure email helbide berria egiaztatu behar dugu. Baieztapen esteka bat duen e-mail bidali zaizu, jarraitu esteka zure e-mal helbide berria baieztatzeko. Egiaztatu spam karpeta ez baduzu e-mail hau jaso.
updated: Zure kontua ongi eguneratu da.
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
index 3d8f7fa59..be8af6f9e 100644
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@@ -56,6 +56,3 @@ he:
expired: פג תוקפו. נא לבקש חדש
not_found: לא נמצא
not_locked: לא היה נעול
- not_saved:
- one: 'שגיאה אחת מנעה את שמירת %{resource} זה:'
- other: "%{count} שגיאות מנעו את שמירת %{resource} זה:"
diff --git a/config/locales/devise.hr.yml b/config/locales/devise.hr.yml
index 2a859054a..e0c569cee 100644
--- a/config/locales/devise.hr.yml
+++ b/config/locales/devise.hr.yml
@@ -2,18 +2,9 @@
hr:
devise:
confirmations:
- already_authenticated: Već si prijavljen.
confirmed: Tvoja email adresa je uspješno potvrđena.
- inactive: Tvoj račun još nije aktiviran.
- invalid: Nevaljan %{authentication_keys} ili lozinka.
- last_attempt: Imaš još jedan pokušaj prije no što ti se račun zaključa.
- locked: Tvoj račun je zaključan.
- not_found_in_database: Nevaljan %{authentication_keys} ili lozinka.
send_instructions: Primit ćeš email sa uputama kako potvrditi svoju email adresu za nekoliko minuta.
send_paranoid_instructions: Ako tvoja email adresa postoji u našoj bazi podataka, primit ćeš email sa uputama kako ju potvrditi za nekoliko minuta.
- timeout: Tvoja sesija je istekla. Molimo te, prijavi se ponovo kako bi nastavio.
- unauthenticated: Moraš se registrirati ili prijaviti prije no što nastaviš.
- unconfirmed: Moraš potvrditi svoju email adresu prije no što nastaviš.
mailer:
confirmation_instructions:
subject: 'Mastodon: Upute za potvrđivanje %{instance}'
@@ -58,4 +49,3 @@ hr:
expired: je istekao, zatraži novu
not_found: nije nađen
not_locked: nije zaključan
- not_saved: "%{count} greške su zabranile da ovaj %{resource} bude sačuvan:"
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 67baca016..e495cb5f0 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -2,40 +2,43 @@
hu:
devise:
confirmations:
- confirmed: Az e-mail címed sikeresen meg lett erősítve.
+ confirmed: Az e-mail címed sikeresen megerősítésre került.
send_instructions: Pár percen belül kapni fogsz egy e-mailt az e-mail címed megerősítéséhez szükséges lépésekről.
send_paranoid_instructions: Ha az e-mail címed létezik az adatbázisunkban, pár percen belül kapni fogsz egy e-mailt az e-mail címed megerősítéséhez szükséges lépésekről.
failure:
already_authenticated: Már bejelentkeztél.
- inactive: Fiókod még nem lett aktiválva.
+ inactive: Fiókodat még nem aktiválták.
invalid: Helytelen %{authentication_keys} vagy jelszó.
- last_attempt: Már csak egy próbálkozásod maradt mielőtt a fiókod lezárásra kerül.
+ last_attempt: Már csak egy próbálkozásod maradt mielőtt a fiókodat lezárjuk.
locked: Fiókod le van zárva.
not_found_in_database: Helytelen %{authentication_keys} vagy jelszó.
+ pending: Fiókod még engedélyezés alatt áll.
timeout: A munkamenet lejárt. Jelentkezz be újra a folytatáshoz.
unauthenticated: A folytatás előtt be kell jelentkezned.
unconfirmed: A folytatás előtt meg kell erősítened az e-mail címed.
mailer:
confirmation_instructions:
action: Erősítsd meg az e-mail címedet
- explanation: Ezzel az e-mail címmel kezdeményeztek regisztrációt a(z) %{host} oldalon. Csak egy kattintás, és a felhasználói fiókdat aktiváljuk. Ha a regisztrációt nem te kezdeményezted, kérjük tekintsd ezt az e-mailt tárgytalannak.
- extra_html: Kérjük tekintsd át a az instancia szabályzatát és a felhasználási feltételeket.
+ action_with_app: Megerősítés majd vissza ide %{app}
+ explanation: Ezzel az e-mail címmel kezdeményeztek regisztrációt a(z) %{host} oldalon. Csak egy kattintás, és a felhasználói fiókodat aktiváljuk. Ha a regisztrációt nem te kezdeményezted, kérjük tekintsd ezt az e-mailt tárgytalannak.
+ explanation_when_pending: Ezzel az e-mail címmel meghívást kértél a(z) %{host} oldalon. Ahogy megerősíted az e-mail címed, átnézzük a jelentkezésedet. Ennek ideje alatt nem tudsz belépni. Ha a jelentkezésed elutasítjuk, az adataidat töröljük, más teendőd nincs. Ha a kérelmet nem te kezdeményezted, kérjük tekintsd ezt az e-mailt tárgytalannak.
+ extra_html: Kérjük tekintsd át a a szerver szabályzatát és a felhasználási feltételeket.
subject: 'Mastodon: Megerősítési lépések %{instance}'
title: E-mail cím megerősítése
email_changed:
explanation: 'A fiókodhoz tartozó e-mail címet az alábbira módosítod:'
- extra: Ha nem te kezdeményezted a fiókodhoz tartozó e-mail cím módosítását, valaki hozzáférhetett a fiókodhoz. Legjobb, ha azonnal megváltoztatod a jelszavadat; ha nem férsz hozzá a fiókodhoz, vedd fel a kapcsolatot az instanciád adminisztrátorával.
+ extra: Ha nem te kezdeményezted a fiókodhoz tartozó e-mail cím módosítását, valaki hozzáférhetett a fiókodhoz. Legjobb, ha azonnal megváltoztatod a jelszavadat; ha nem férsz hozzá a fiókodhoz, vedd fel a kapcsolatot a szervered adminisztrátorával.
subject: 'Mastodon: a fiókodhoz tartozó e-mail címet megváltoztattuk'
title: Új e-mail cím
password_change:
explanation: A fiókodhoz tartozó jelszót megváltoztattuk.
- extra: Ha nem te kezdeményezted a fiókodhoz tartozó jelszó módosítását, valaki hozzáférhetett a fiókodhoz. Legjobb, ha azonnal megváltoztatod a jelszavadat; ha nem férsz hozzá a fiókodhoz, vedd fel a kapcsolatot az instanciád adminisztrátorával.
- subject: 'Mastodon: Jelszó megváltoztatva'
- title: Sikeres jelszó-módosítás
+ extra: Ha nem te kezdeményezted a fiókodhoz tartozó jelszó módosítását, valaki hozzáférhetett a fiókodhoz. Legjobb, ha azonnal megváltoztatod a jelszavadat; ha nem férsz hozzá a fiókodhoz, vedd fel a kapcsolatot a szervered adminisztrátorával.
+ subject: 'Mastodon: Jelszavad megváltoztattuk'
+ title: Sikeres jelszómódosítás
reconfirmation_instructions:
explanation: Az e-mail cím megváltoztatásához meg kell erősítened az új címet.
extra: Amennyiben nem te kezdeményezted a módosítást, kérjük tekintsd ezt az e-mailt tárgytalannak. A Mastodon fiókodhoz tartozó e-mail címed változatlan marad mindaddig, amíg rá nem kattintasz a fenti linkre.
- subject: 'Mastodon: erősítsd meg a(z) %{instance} instanciához tartozó e-mail címed'
+ subject: 'Mastodon: erősítsd meg a(z) %{instance} szerverhez tartozó e-mail címed'
title: E-mail cím megerősítése
reset_password_instructions:
action: Jelszó módosítása
@@ -46,30 +49,31 @@ hu:
unlock_instructions:
subject: 'Mastodon: Feloldási lépések'
omniauth_callbacks:
- failure: "%{kind} nem hitelesíthető, mert %{reason}."
+ failure: Sikertelen hitelesítés %{kind} fiókról, mert "%{reason}".
success: Sikeres hitelesítés %{kind} fiókról.
passwords:
- no_token: Nem férhetsz hozzá az oldalhoz jelszó visszaállító e-mail nélkül. Ha egy jelszó visszaállító e-mail hozott ide, ellenőrizd, hogy a megadott teljes URL-t használd.
- send_instructions: Pár percen belül kapni fogsz egy e-mailt arról, hogy hogyan tudod visszaállítani a jelszavadat.
- send_paranoid_instructions: Ha létezik az e-mail cím, pár percen belül kapni fogsz egy e-mailt arról, hogy hogyan tudod visszaállítani a jelszavadat.
+ no_token: Nem férhetsz hozzá ehhez az oldalhoz jelszó visszaállító e-mail nélkül. Ha egy jelszó visszaállító e-mail hozott ide, ellenőrizd, hogy a megadott teljes URL-t használd.
+ send_instructions: Pár percen belül kapni fogsz egy e-mailt arról, hogy hogyan tudod visszaállítani a jelszavadat. Kérlek ellenőrizd a levélszemét mappádat, ha nem kaptál ilyen e-mailt.
+ send_paranoid_instructions: Ha létezik az e-mail cím, pár percen belül kapni fogsz egy e-mailt arról, hogy hogyan tudod visszaállítani a jelszavadat. Kérlek ellenőrizd a levélszemét mappádat, ha nem kaptál ilyen e-mailt.
updated: Jelszavad sikeresen frissült. Bejelentkeztél.
- updated_not_active: Jelszavad sikeresen meg lett változtatva.
+ updated_not_active: Jelszavad sikeresen megváltoztattuk.
registrations:
- destroyed: Viszlát! A fiókod sikeresen törölve. Reméljük hamarosan viszontláthatunk.
+ destroyed: Viszlát! A fiókodat sikeresen töröltük. Reméljük hamarosan viszontláthatunk.
signed_up: Üdvözlünk! Sikeresen regisztráltál.
- signed_up_but_inactive: Sikeresen regisztráltál. Ennek ellenére nem tudunk beléptetni, ugyanis a fiókod még nem lett aktiválva.
- signed_up_but_locked: Sikeresen regisztráltál. Ennek ellenére nem tudunk beléptetni, ugyanis a fiókod le lett zárva.
- signed_up_but_unconfirmed: Egy üzenet a megerősítési linkkel kiküldésre került az e-mail címedre. Kérjük használd a linket a fiókod aktiválásához.
- update_needs_confirmation: Sikeresen frissítetted a fiókodat, de szükségünk van az e-mail címed megerősítésére. Kérlek ellenőrizd az e-mailedet és kövesd a levélben szereplő megerősítési linket az e-mail címed megerősítéséhez.
+ signed_up_but_inactive: Sikeresen regisztráltál. Ennek ellenére nem tudunk beléptetni, ugyanis a fiókodat még nem aktiválták.
+ signed_up_but_locked: Sikeresen regisztráltál. Ennek ellenére nem tudunk beléptetni, ugyanis a fiókod le van zárva.
+ signed_up_but_pending: Egy üzenetet a megerősítési linkkel kiküldtünk az e-mail címedre. Ha kattintasz a linkre, átnézzük a kérelmedet. Értesítünk, ha jóváhagytuk.
+ signed_up_but_unconfirmed: Egy üzenetet a megerősítési linkkel kiküldtünk az e-mail címedre. Kérjük használd a linket a fiókod aktiválásához.
+ update_needs_confirmation: Sikeresen frissítetted a fiókodat, de szükségünk van az e-mail címed megerősítésére. Kérlek ellenőrizd az e-mailedet és kövesd a levélben szereplő megerősítési linket az e-mail címed megerősítéséhez. Ellenőrizd a levélszemét mappád, ha nem kaptál volna ilyen levelet.
updated: Fiókod frissítése sikeres.
sessions:
- already_signed_out: Sikeres kijelenkezés.
+ already_signed_out: Sikeres kijelentkezés.
signed_in: Sikeres bejelentkezés.
signed_out: Sikeres kijelentkezés.
unlocks:
- send_instructions: Pár percen belül egy e-mailt fogsz kapni a feloldáshoz szükséges lépésekkel.
- send_paranoid_instructions: Ha a fiókod létezik, pár percen belül egy e-mailt fogsz kapni a feloldáshoz szükséges lépésekkel.
- unlocked: A fiókod sikeresen fel lett oldva. Jelentkezz be a folytatáshoz.
+ send_instructions: Pár percen belül egy e-mailt fogsz kapni a feloldáshoz szükséges lépésekkel. Ellenőrizd a levélszemét mappád, ha nem kaptál volna ilyen levelet.
+ send_paranoid_instructions: Ha a fiókod létezik, pár percen belül egy e-mailt fogsz kapni a feloldáshoz szükséges lépésekkel. Ellenőrizd a levélszemét mappád, ha nem kaptál volna ilyen levelet.
+ unlocked: A fiókodat sikeresen feloldottuk. Jelentkezz be a folytatáshoz.
errors:
messages:
already_confirmed: már meg lett erősítve, kérjük jelentkezz be
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
new file mode 100644
index 000000000..c40654016
--- /dev/null
+++ b/config/locales/devise.hy.yml
@@ -0,0 +1 @@
+hy:
diff --git a/config/locales/devise.id.yml b/config/locales/devise.id.yml
index 47fac413f..5fa902091 100644
--- a/config/locales/devise.id.yml
+++ b/config/locales/devise.id.yml
@@ -57,5 +57,4 @@ id:
not_found: tidak ditemukan
not_locked: tidak dikunci
not_saved:
- one: '1 error yang membuat %{resource} ini tidak dapat disimpan:'
other: "%{count} error yang membuat %{resource} ini tidak dapat disimpan:"
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index fc36fdbff..b603e12c6 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -12,6 +12,7 @@ it:
last_attempt: Hai un altro tentativo prima che il tuo account venga bloccato.
locked: Il tuo account è stato bloccato.
not_found_in_database: "%{authentication_keys} o password invalida."
+ pending: Il tuo account è ancora in fase di approvazione.
timeout: La tua sessione è terminata. Per favore, effettua l'accesso o registrati per continuare.
unauthenticated: Devi effettuare l'accesso o registrarti per continuare.
unconfirmed: Devi confermare il tuo indirizzo email per continuare.
@@ -20,6 +21,7 @@ it:
action: Verifica indirizzo email
action_with_app: Conferma e torna a %{app}
explanation: Hai creato un account su %{host} con questo indirizzo email. Sei lonatno solo un clic dall'attivarlo. Se non sei stato tu, per favore ignora questa email.
+ explanation_when_pending: Hai richiesto un invito a %{host} con questo indirizzo email. Una volta confermato il tuo indirizzo e-mail, analizzeremo la tua richiesta. Non potrai eseguire l'accesso fino a quel momento. Se la tua richiesta sarà rifiutata, i tuoi dati saranno rimossi, quindi nessun'altra azione ti sarà richiesta. Se non fossi stato tu, per favore ignora questa email.
extra_html: Per favore controllale regole del server e i nostri termini di servizio.
subject: 'Mastodon: Istruzioni di conferma per %{instance}'
title: Verifica indirizzo email
@@ -60,6 +62,7 @@ it:
signed_up: Benvenuto! Ti sei registrato con successo.
signed_up_but_inactive: Ti sei registrato con successo. Purtroppo però non possiamo farti accedere perché non hai ancora attivato il tuo account.
signed_up_but_locked: Ti sei registrato con successo. Purtroppo però non possiamo farti accedere perché il tuo account è bloccato.
+ signed_up_but_pending: Un messaggio con un collegamento per la conferma è stato inviato al tuo indirizzo email. Dopo aver cliccato il collegamento, esamineremo la tua richiesta. Ti sarà notificato se verrà approvata.
signed_up_but_unconfirmed: Un messaggio con un link di conferma è stato inviato al tuo indirizzo email. Per favore, visita il link per attivare il tuo account.
update_needs_confirmation: Hai aggiornato correttamente il tuo account, ma abbiamo bisogno di verificare il tuo nuovo indirizzo email. Per favore, controlla la posta in arrivo e visita il link di conferma per verificare il tuo indirizzo email.
updated: Il tuo account è stato aggiornato con successo.
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index 3dac63050..dc147be62 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -12,7 +12,7 @@ ja:
last_attempt: あと1回失敗するとアカウントがロックされます。
locked: アカウントはロックされました。
not_found_in_database: "%{authentication_keys}かパスワードが誤っています。"
- pending: あなたのアカウントはまだ審査中です。
+ pending: あなたのアカウントはまだ承認待ちです。
timeout: セッションの有効期限が切れました。続行するには再度ログインしてください。
unauthenticated: 続行するにはログインするか、アカウントを作成してください。
unconfirmed: 続行するにはメールアドレスを確認する必要があります。
@@ -21,7 +21,7 @@ ja:
action: メールアドレスの確認
action_with_app: 確認し %{app} に戻る
explanation: このメールアドレスで%{host}にアカウントを作成しました。有効にするまであと一歩です。もし心当たりがない場合、申し訳ありませんがこのメールを無視してください。
- explanation_when_pending: このメールアドレスで%{host}への登録を申請しました。メールアドレスを確認したら、サーバー管理者が申請を審査します。それまでログインできません。申請が却下された場合、あなたのデータは削除されますので以降の操作は必要ありません。もし心当たりがない場合、申し訳ありませんがこのメールを無視してください。
+ explanation_when_pending: このメールアドレスで%{host}への登録を申請しました。あなたがメールアドレスを確認したら、サーバー管理者が申請を審査します。それまでログインできません。申請が却下された場合、あなたのデータは削除されますので以降の操作は必要ありません。もし心当たりがない場合、申し訳ありませんがこのメールを無視してください。
extra_html: また サーバーのルール と 利用規約 もお読みください。
subject: 'Mastodon: メールアドレスの確認 %{instance}'
title: メールアドレスの確認
@@ -82,5 +82,4 @@ ja:
not_found: 見つかりません
not_locked: ロックされていません
not_saved:
- one: エラーが発生したため、%{resource}の保存に失敗しました。
other: "%{count}個のエラーが発生したため、%{resource}の保存に失敗しました:"
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 33ca8f842..f48531246 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -74,3 +74,12 @@ ko:
send_instructions: 몇 분 이내로 계정 잠금 해제에 대한 안내 메일이 발송 됩니다. 메일을 받지 못 하신 경우 스팸 폴더를 확인해 주세요.
send_paranoid_instructions: 계정이 존재한다면 몇 분 이내로 계정 잠금 해제에 대한 안내 메일이 발송 됩니다. 메일을 받지 못 하신 경우 스팸 폴더를 확인해 주세요.
unlocked: 계정이 성공적으로 잠금 해제 되었습니다. 계속 하려면 로그인 하세요.
+ errors:
+ messages:
+ already_confirmed: 이미 확인 되었습니다, 로그인 하세요
+ confirmation_period_expired: "%{period} 안에 확인을 해야 합니다, 새로 요청하세요"
+ expired: 만료되었습니다, 새로 요청하세요
+ not_found: 찾을 수 없습니다
+ not_locked: 잠기지 않았습니다
+ not_saved:
+ other: "%{count}개의 에러로 인해 %{resource}가 저장 될 수 없습니다:"
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
new file mode 100644
index 000000000..6c5cb837a
--- /dev/null
+++ b/config/locales/devise.lt.yml
@@ -0,0 +1 @@
+lt:
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
new file mode 100644
index 000000000..1be0eabc0
--- /dev/null
+++ b/config/locales/devise.lv.yml
@@ -0,0 +1 @@
+lv:
diff --git a/config/locales/devise.ms.yml b/config/locales/devise.ms.yml
new file mode 100644
index 000000000..2925688a0
--- /dev/null
+++ b/config/locales/devise.ms.yml
@@ -0,0 +1 @@
+ms:
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 96d14d9d2..51a95403f 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -9,7 +9,6 @@ nl:
already_authenticated: Je bent al ingelogd.
inactive: Jouw account is nog niet geactiveerd.
invalid: "%{authentication_keys} of wachtwoord ongeldig."
- invalid_token: Ongeldige bevestigingscode.
last_attempt: Je hebt nog één poging over voordat jouw account wordt opgeschort.
locked: Jouw account is opgeschort.
not_found_in_database: "%{authentication_keys} of wachtwoord ongeldig."
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
new file mode 100644
index 000000000..79dbaa871
--- /dev/null
+++ b/config/locales/devise.ro.yml
@@ -0,0 +1 @@
+ro:
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index 5ce04ba7a..85de603d3 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -81,6 +81,7 @@ sk:
not_found: nenájdený
not_locked: nebol zamknutý
not_saved:
- few: "%{resource} nebol uložený kvôli %{count} chybám:"
- one: "%{resource} nebol uložený kvôli chybe:"
- other: "%{resource} nebol uložený kvôli %{count} chybám:"
+ few: "%{count} chýb zabránilo uloženiu tohto %{resource}:"
+ many: "%{count} chýb zabránilo uloženiu tohto %{resource}:"
+ one: '1 chyba zabránila uloženiu tohto %{resource}:'
+ other: "%{count} chyby zabránili uloženiu tohto %{resource}:"
diff --git a/config/locales/devise.sr-Latn.yml b/config/locales/devise.sr-Latn.yml
index 21ddbd726..c2c5f7c76 100644
--- a/config/locales/devise.sr-Latn.yml
+++ b/config/locales/devise.sr-Latn.yml
@@ -58,6 +58,5 @@ sr-Latn:
not_locked: nije zaključan
not_saved:
few: "%{count} greške sprečavaju %{resource}a:"
- many: "%{count} grešaka sprečavaju %{resource}a:"
one: '1 greška sprečava %{resource}a:'
other: "%{count} grešaka sprečavaju %{resource}a:"
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index 475d1e2a5..baffc2701 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -80,6 +80,5 @@ sr:
not_locked: није закључан
not_saved:
few: "%{count} грешке спречавају %{resource}a:"
- many: "%{count} грешака спречавају %{resource}a:"
one: '1 грешка спречава %{resource}а:'
other: "%{count} грешака спречавају %{resource}a:"
diff --git a/config/locales/devise.ta.yml b/config/locales/devise.ta.yml
new file mode 100644
index 000000000..4320953ce
--- /dev/null
+++ b/config/locales/devise.ta.yml
@@ -0,0 +1 @@
+ta:
diff --git a/config/locales/devise.te.yml b/config/locales/devise.te.yml
new file mode 100644
index 000000000..34c54f18f
--- /dev/null
+++ b/config/locales/devise.te.yml
@@ -0,0 +1 @@
+te:
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index e20df69af..8a9a65465 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -2,60 +2,37 @@
th:
devise:
confirmations:
- confirmed: Your email address has been successfully confirmed.
+ confirmed: ยืนยันที่อยู่อีเมลของคุณสำเร็จ
send_instructions: You will receive an email with instructions for how to confirm your email address in a few minutes.
send_paranoid_instructions: If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes.
failure:
- already_authenticated: You are already signed in.
- inactive: Your account is not activated yet.
- invalid: Invalid %{authentication_keys} or password.
- last_attempt: You have one more attempt before your account is locked.
- locked: Your account is locked.
- not_found_in_database: Invalid %{authentication_keys} or password.
- timeout: Your session expired. Please sign in again to continue.
- unauthenticated: You need to sign in or sign up before continuing.
- unconfirmed: You have to confirm your email address before continuing.
+ already_authenticated: คุณได้ลงชื่อเข้าอยู่แล้ว
+ inactive: ยังไม่ได้เปิดใช้งานบัญชีของคุณ
+ invalid: "%{authentication_keys} หรือรหัสผ่านไม่ถูกต้อง"
+ not_found_in_database: "%{authentication_keys} หรือรหัสผ่านไม่ถูกต้อง"
+ timeout: เซสชันของคุณหมดอายุแล้ว โปรดลงชื่อเข้าอีกครั้งเพื่อดำเนินการต่อ
mailer:
- confirmation_instructions:
- subject: 'Mastodon: Confirmation instructions for %{instance}'
+ email_changed:
+ title: ที่อยู่อีเมลใหม่
password_change:
- subject: 'Mastodon: Password changed'
+ subject: 'Mastodon: เปลี่ยนรหัสผ่านแล้ว'
+ title: เปลี่ยนรหัสผ่านแล้ว
reset_password_instructions:
- subject: 'Mastodon: Reset password instructions'
- unlock_instructions:
- subject: 'Mastodon: Unlock instructions'
- omniauth_callbacks:
- failure: Could not authenticate you from %{kind} because "%{reason}".
- success: Successfully authenticated from %{kind} account.
+ action: เปลี่ยนรหัสผ่าน
passwords:
- no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided.
send_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes.
send_paranoid_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes.
- updated: Your password has been changed successfully. You are now signed in.
- updated_not_active: Your password has been changed successfully.
registrations:
- destroyed: Bye! Your account has been successfully cancelled. We hope to see you again soon.
- signed_up: Welcome! You have signed up successfully.
- signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
- signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
signed_up_but_unconfirmed: A message with a confirmation link has been sent to your email address. Please follow the link to activate your account.
update_needs_confirmation: You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address.
- updated: Your account has been updated successfully.
sessions:
- already_signed_out: Signed out successfully.
- signed_in: Signed in successfully.
- signed_out: Signed out successfully.
+ already_signed_out: ลงชื่อออกสำเร็จ
+ signed_in: ลงชื่อเข้าสำเร็จ
+ signed_out: ลงชื่อออกสำเร็จ
unlocks:
send_instructions: You will receive an email with instructions for how to unlock your account in a few minutes.
send_paranoid_instructions: If your account exists, you will receive an email with instructions for how to unlock it in a few minutes.
- unlocked: Your account has been unlocked successfully. Please sign in to continue.
errors:
messages:
- already_confirmed: was already confirmed, please try signing in
- confirmation_period_expired: needs to be confirmed within %{period}, please request a new one
- expired: has expired, please request a new one
not_found: ไม่พบ
- not_locked: was not locked
- not_saved:
- one: '1 error prohibited this %{resource} from being saved:'
- other: "%{count} errors prohibited this %{resource} from being saved:"
+ not_locked: ไม่ได้ล็อคอยู่
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index bef2baa18..22fa130f6 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -12,24 +12,27 @@ zh-CN:
last_attempt: 你还有最后一次尝试机会,再次失败你的帐户将被锁定。
locked: 你的帐户已被锁定。
not_found_in_database: "%{authentication_keys}或密码错误。"
+ pending: 你的账户仍在审核中。
timeout: 你已登录超时,请重新登录。
unauthenticated: 继续操作前请注册或者登录。
unconfirmed: 继续操作前请先确认你的帐户。
mailer:
confirmation_instructions:
action: 验证电子邮件地址
+ action_with_app: 确认并返回%{app}
explanation: 你在 %{host} 上使用这个电子邮件地址创建了一个帐户。只需点击下面的链接,即可完成激活。如果你并没有创建过帐户,请忽略此邮件。
- extra_html: 请记得阅读本实例的相关规定和我们的使用条款。
+ explanation_when_pending: 你用这个电子邮件申请了在 %{host} 注册。在确认电子邮件地址之后,我们会审核你的申请。在此之前,你不能登录。如果你的申请被驳回,你的数据会被移除,因此你无需再采取任何行动。如果申请人不是你,请忽略这封邮件。
+ extra_html: 请记得阅读本服务器的相关规定和我们的使用条款。
subject: Mastodon:确认 %{instance} 帐户信息
title: 验证电子邮件地址
email_changed:
explanation: 你的帐户的电子邮件地址即将变更为:
- extra: 如果你并没有请求更改你的电子邮件地址,则他人很有可能已经入侵你的帐户。请立即更改你的密码;如果你已经无法访问你的帐户,请联系实例的管理员请求协助。
+ extra: 如果你并没有请求更改你的电子邮件地址,则他人很有可能已经入侵你的帐户。请立即更改你的密码;如果你已经无法访问你的帐户,请联系服务器管理员请求协助。
subject: Mastodon:电子邮件地址已被更改
title: 新电子邮件地址
password_change:
explanation: 你的帐户的密码已被更改。
- extra: 如果你并没有请求更改你的密码,则他人很有可能已经入侵你的帐户。请立即更改你的密码;如果你已经无法访问你的帐户,请联系实例的管理员请求协助。
+ extra: 如果你并没有请求更改你的密码,则他人很有可能已经入侵你的帐户。请立即更改你的密码;如果你已经无法访问你的帐户,请联系服务器的管理员请求协助。
subject: Mastodon:密码已被更改
title: 密码已被重置
reconfirmation_instructions:
@@ -59,6 +62,7 @@ zh-CN:
signed_up: 欢迎!你已注册成功。
signed_up_but_inactive: 你已注册,但尚未激活帐户。
signed_up_but_locked: 你已注册,但帐户被锁定了。
+ signed_up_but_pending: 一封带有确认链接的邮件已经发送到了您的邮箱。 在您点击确认链接后,我们将会审核您的申请。审核通过后,我们将会通知您。
signed_up_but_unconfirmed: 一封带有确认链接的邮件已经发送至你的邮箱,请点击邮件中的链接以激活你的帐户。如果没有,请检查你的垃圾邮件。
update_needs_confirmation: 信息更新成功,但我们需要验证你的新电子邮件地址,请点击邮件中的链接以确认。如果没有,请检查你的垃圾邮箱。
updated: 帐户资料更新成功。
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index b7d88ef94..ceae8b238 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -78,5 +78,4 @@ zh-HK:
not_found: 找不到
not_locked: 並未被鎖定
not_saved:
- one: 1 個錯誤令 %{resource} 無法被儲存︰
other: "%{count} 個錯誤令 %{resource} 無法被儲存︰"
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 0ade1e60a..cb989630e 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -82,5 +82,4 @@ zh-TW:
not_found: 找不到
not_locked: 並未被鎖定
not_saved:
- one: 因 1 個錯誤導致 %{resource} 無法儲存:
other: 因 %{count} 錯誤導致 %{resource} 無法儲存:
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index 200d340a8..6f9e38f8b 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -29,7 +29,7 @@ ar:
edit:
title: تعديل التطبيق
form:
- error: عفوا ! تحقق من خُلوّ الاستمارة من الأخطاء من فضلك
+ error: عفوا! تحقق من خُلوّ الاستمارة من الأخطاء من فضلك
help:
native_redirect_uri: إستخدم %{native_redirect_uri} للاختبار و التجريب محليا
redirect_uri: إستخدم خطا واحدا لكل رابط
@@ -46,12 +46,12 @@ ar:
new:
title: تطبيق جديد
show:
- actions: Actions
+ actions: الإجراءات
application_id: معرف التطبيق
callback_urls: روابط رد النداء
scopes: المجالات
secret: السر
- title: 'تطبيق : %{name}'
+ title: 'تطبيق: %{name}'
authorizations:
buttons:
authorize: ترخيص
@@ -72,7 +72,7 @@ ar:
index:
application: التطبيق
created_at: صُرّح له في
- date_format: "%d-%m-%Y %H:%M:%S"
+ date_format: "%Y-%m-%d %H:%M:%S"
scopes: المجالات
title: تطبيقاتك المرخص لها
errors:
@@ -85,11 +85,11 @@ ar:
invalid_resource_owner: إنّ المُعرِّفات التي قدّمها صاحب المورِد غير صحيحة أو أنه لا وجود لصاحب المورِد
invalid_scope: المجال المطلوب غير صحيح أو مجهول أو مُعبَّر عنه بشكل خاطئ.
invalid_token:
- expired: إنتهت فترة صلاحيته رمز المصادقة
+ expired: انتهت فترة صلاحيته رمز المصادقة
revoked: تم إبطال رمز المصادقة
unknown: رمز المصادقة غير صالح
resource_owner_authenticator_not_configured: لقد أخفقت عملية البحث عن صاحب المَورِد لغياب الضبط في Doorkeeper.configure.resource_owner_authenticator.
- server_error: لقد صادفَ خادوم التصريحات ضروفا غير مواتية، الأمر الذي مَنَعه مِن مواصلة دراسة الطلب.
+ server_error: لقد صادفَ خادوم التصريحات ظروفا غير مواتية، الأمر الذي مَنَعه مِن مواصلة دراسة الطلب.
temporarily_unavailable: تعذر على خادم التفويض معالجة الطلب و ذلك بسبب زيادة مؤقتة في التحميل أو عملية صيانة مبرمجة على الخادم.
unauthorized_client: لا يصرح للعميل بتنفيذ هذا الطلب باستخدام هذه الطريقة.
unsupported_grant_type: هذا النوع من منح التصريح غير معتمد في خادم الترخيص.
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index 24de4aee0..f36187e12 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -56,8 +56,6 @@ bg:
able_to: Ще е възможно
prompt: Приложението %{client_name} заявява достъп до твоя акаунт
title: Изисква се упълномощаване
- show:
- title: Copy this authorization code and paste it to the application.
authorized_applications:
buttons:
revoke: Отмяна
@@ -66,7 +64,6 @@ bg:
index:
application: Приложение
created_at: Създадено на
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Диапазони
title: Твоите упълномощени приложения
errors:
diff --git a/config/locales/doorkeeper.bn.yml b/config/locales/doorkeeper.bn.yml
new file mode 100644
index 000000000..152c69829
--- /dev/null
+++ b/config/locales/doorkeeper.bn.yml
@@ -0,0 +1 @@
+bn:
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 8366912dc..dde70f47a 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -29,7 +29,7 @@ ca:
edit:
title: Edita l'aplicació
form:
- error: Ep! Comprova el formulari
+ error: Ep! Comprova el formulari per a possibles errors
help:
native_redirect_uri: Utilitza %{native_redirect_uri} per a proves locals
redirect_uri: Utilitza una línia per URI
@@ -114,7 +114,35 @@ ca:
application:
title: OAuth autorització requerida
scopes:
+ admin:read: llegir totes les dades en el servidor
+ admin:read:accounts: llegir l'informació sensible de tots els comptes
+ admin:read:reports: llegir l'informació sensible de tots els informes i comptes reportats
+ admin:write: modificar totes les dades en el servidor
+ admin:write:accounts: fer l'acció de moderació en els comptes
+ admin:write:reports: fer l'acció de moderació en els informes
follow: seguir, blocar, desblocar i deixar de seguir comptes
push: rebre notificacions push del teu compte
read: llegir les dades del teu compte
+ read:accounts: veure informació dels comptes
+ read:blocks: veure els teus bloqueijos
+ read:favourites: veure els teus favorits
+ read:filters: veure els teus filtres
+ read:follows: veure els teus seguiments
+ read:lists: veure les teves llistes
+ read:mutes: veure els teus silenciats
+ read:notifications: veure les teves notificacions
+ read:reports: veure els teus informes
+ read:search: cerca en nom teu
+ read:statuses: veure tots els toots
write: publicar en el teu nom
+ write:accounts: modifica el teu perfil
+ write:blocks: bloqueja comptes i dominis
+ write:favourites: afavoreix toots
+ write:filters: crear filtres
+ write:follows: seguir usuaris
+ write:lists: crear llistes
+ write:media: pujar fitxers multimèdia
+ write:mutes: silencia usuaris i converses
+ write:notifications: esborra les teves notificacions
+ write:reports: informe d’altres persones
+ write:statuses: publicar toots
diff --git a/config/locales/doorkeeper.co.yml b/config/locales/doorkeeper.co.yml
index 542ad7c57..d45041a4e 100644
--- a/config/locales/doorkeeper.co.yml
+++ b/config/locales/doorkeeper.co.yml
@@ -114,6 +114,12 @@ co:
application:
title: Auturizazione OAuth riquestata
scopes:
+ admin:read: leghje tutti i dati nant'à u servore
+ admin:read:accounts: leghje i cuntinuti sensibili di tutti i conti
+ admin:read:reports: leghje i cuntinuti sensibili di tutti i rapporti è conti signalati
+ admin:write: mudificà tutti i dati nant'à u servore
+ admin:write:accounts: realizà azzione di muderazione nant'à i conti
+ admin:write:reports: realizà azzione di muderazione nant'à i rapporti
follow: Mudificà rilazione trà i conti
push: Riceve e vostre nutificazione push
read: leghje tutte l’infurmazioni di u vostru contu
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index f523e125d..cb5cd147c 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -114,6 +114,12 @@ cs:
application:
title: Je požadována autorizace OAuth
scopes:
+ admin:read: číst všechna data na serveru
+ admin:read:accounts: číst citlivé informace všech účtů
+ admin:read:reports: číst citlivé informace všech nahlášení a nahlášených účtů
+ admin:write: měnit všechna data na serveru
+ admin:write:accounts: provádět moderátorské akce s účty
+ admin:write:reports: provádět moderátorské akce s nahlášeními
follow: upravovat vztahy mezi profily
push: přijímat vaše push oznámení
read: vidět všechna data vašeho účtu
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index 87d7a8660..19798c4d9 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -72,7 +72,7 @@ cy:
index:
application: Rhaglen
created_at: Awdurdodedig
- date_format: "%Y-%m-%d %H:%M:%S"
+ date_format: "%Y-%m-%d% %H:%M:%S"
scopes: Rhinweddau
title: Eich rhaglenni awdurdodedig
errors:
@@ -115,7 +115,7 @@ cy:
title: Mae awdurdodiad OAuth yn ofynnol
scopes:
follow: addasu perthnasau cyfrif
- push: derbyn eich hysbysiadau PUSH
+ push: derbyn eich hysbysiadau gwthiadwy
read: darllen holl ddata eich cyfrif
read:accounts: gweld gwybodaeth y cyfrif
read:blocks: gweld eich blociau
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index df964e4b1..b0f50a893 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -72,7 +72,6 @@ da:
index:
application: Applikation
created_at: Godkendt
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Omfang
title: Dine godkendte applikationer
errors:
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index bf4b06e7c..c41a847b2 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -23,7 +23,7 @@ de:
cancel: Abbrechen
destroy: Löschen
edit: Bearbeiten
- submit: Übertragen
+ submit: Speichern
confirmations:
destroy: Bist du sicher?
edit:
@@ -31,8 +31,8 @@ de:
form:
error: Hoppla! Bitte überprüfe das Formular auf mögliche Fehler
help:
- native_redirect_uri: "%{native_redirect_uri} für lokale Tests benutzen"
- redirect_uri: Bitte benutze eine Zeile pro URI
+ native_redirect_uri: Benutze %{native_redirect_uri} für lokale Tests
+ redirect_uri: Benutze eine Zeile pro URI
scopes: Bitte die Befugnisse mit Leerzeichen trennen. Zur Verwendung der Standardwerte freilassen.
index:
application: Anwendung
@@ -71,25 +71,25 @@ de:
revoke: Bist du sicher?
index:
application: Anwendung
- created_at: autorisiert am
+ created_at: Autorisiert am
date_format: "%d.%m.%Y %H:%M:%S"
scopes: Befugnisse
title: Deine autorisierten Anwendungen
errors:
messages:
- access_denied: Der »resource owner« oder der Autorisierungs-Server hat die Anfrage verweigert.
- credential_flow_not_configured: Die Prozedur »Resource Owner Password Credentials« schlug fehl, da Doorkeeper.configure.resource_owner_from_credentials nicht konfiguriert ist.
+ access_denied: Die Anfrage wurde durch Benutzer_in oder Autorisierungs-Server verweigert.
+ credential_flow_not_configured: Das Konto konnte nicht gefunden werden, da Doorkeeper.configure.resource_owner_from_credentials nicht konfiguriert ist.
invalid_client: 'Client-Authentifizierung ist fehlgeschlagen: Client unbekannt, keine Authentisierung mitgeliefert oder Authentisierungsmethode wird nicht unterstützt.'
invalid_grant: Die beigefügte Autorisierung ist ungültig, abgelaufen, wurde widerrufen, einem anderen Client ausgestellt oder der Weiterleitungs-URI stimmt nicht mit der Autorisierungs-Anfrage überein.
invalid_redirect_uri: Der beigefügte Weiterleitungs-URI ist ungültig.
invalid_request: Die Anfrage enthält ein nicht-unterstütztes Argument, ein Parameter fehlt, oder sie ist anderweitig fehlerhaft.
- invalid_resource_owner: Die angegebenen Zugangsdaten für den Ressourcenbesitzer sind ungültig oder der Ressourcenbesitzer kann nicht gefunden werden
+ invalid_resource_owner: Die angegebenen Zugangsdaten für das Konto sind ungültig oder das Konto kann nicht gefunden werden
invalid_scope: Die angeforderte Befugnis ist ungültig, unbekannt oder fehlerhaft.
invalid_token:
expired: Der Zugriffs-Token ist abgelaufen
revoked: Der Zugriffs-Token wurde widerrufen
unknown: Der Zugriffs-Token ist ungültig
- resource_owner_authenticator_not_configured: Die Prozedur »Resource Owner find« ist fehlgeschlagen, da Doorkeeper.configure.resource_owner_authenticator nicht konfiguriert ist.
+ resource_owner_authenticator_not_configured: Das Konto konnte nicht gefunden werden, da Doorkeeper.configure.resource_owner_authenticator nicht konfiguriert ist.
server_error: Der Autorisierungs-Server hat ein unerwartetes Problem festgestellt und konnte die Anfrage nicht bearbeiten.
temporarily_unavailable: Der Autorisierungs-Server ist aufgrund von zwischenzeitlicher Überlastung oder Wartungsarbeiten derzeit nicht in der Lage, die Anfrage zu bearbeiten.
unauthorized_client: Der Client ist nicht dazu autorisiert, diese Anfrage mit dieser Methode auszuführen.
@@ -114,6 +114,12 @@ de:
application:
title: OAuth-Autorisierung nötig
scopes:
+ admin:read: alle Daten auf dem Server lesen
+ admin:read:accounts: sensible Daten aller Konten lesen
+ admin:read:reports: sensible Daten aller Meldungen und gemeldeten Konten lesen
+ admin:write: alle Daten auf dem Server ändern
+ admin:write:accounts: Moderationsaktionen auf Konten ausführen
+ admin:write:reports: Moderationsaktionen auf Meldungen ausführen
follow: Kontenbeziehungen verändern
push: deine Push-Benachrichtigungen erhalten
read: all deine Daten lesen
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index e820ff8a6..c63688ade 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -114,6 +114,12 @@ el:
application:
title: Απαιτείται έγκριση OAuth
scopes:
+ admin:read: ανάγνωση δεδομένων στον διακομιστή
+ admin:read:accounts: ανάγνωση ευαίσθητων πληροφοριών όλων των λογαριασμών
+ admin:read:reports: ανάγνωση ευαίσθητων πληροφοριών όλων των καταγγελιών και των καταγγελλομένων λογαριασμών
+ admin:write: αλλαγή δεδομένων στον διακομιστή
+ admin:write:accounts: εκτέλεση διαχειριστικών ενεργειών σε λογαριασμούς
+ admin:write:reports: εκτέλεση διαχειριστικών ενεργειών σε καταγγελίες
follow: να αλλάζει τις σχέσεις με λογαριασμούς
push: να λαμβάνει τις ειδοποιήσεις σου
read: να διαβάζει όλα τα στοιχεία του λογαριασμού σου
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index f1fe03716..d9b7c2c8e 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -114,6 +114,12 @@ en:
application:
title: OAuth authorization required
scopes:
+ admin:read: read all data on the server
+ admin:read:accounts: read sensitive information of all accounts
+ admin:read:reports: read sensitive information of all reports and reported accounts
+ admin:write: modify all data on the server
+ admin:write:accounts: perform moderation actions on accounts
+ admin:write:reports: perform moderation actions on reports
follow: modify account relationships
push: receive your push notifications
read: read all your account's data
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index 937ecd32a..752387d87 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -117,3 +117,4 @@ es:
follow: seguir, bloquear, desbloquear y dejar de seguir cuentas
read: leer los datos de tu cuenta
write: publicar en tu nombre
+ write:blocks: bloquear cuentas y dominios
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index e19126554..b677c3346 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -23,7 +23,6 @@ fa:
cancel: لغو
destroy: پاک کردن
edit: ویرایش
- submit: Submit
confirmations:
destroy: آیا مطمئن هستید؟
edit:
@@ -46,7 +45,6 @@ fa:
new:
title: برنامهٔ تازه
show:
- actions: Actions
application_id: کلید کلاینت
callback_urls: نشانیهای Callabck
scopes: دامنهها
@@ -72,29 +70,17 @@ fa:
index:
application: برنامه
created_at: مجازشده از
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: اجازهها
title: برنامههای مجاز
errors:
messages:
access_denied: دارندهٔ منبع یا سرور اجازه دهنده درخواست را نپذیرفت.
- credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
- invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
- invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
- invalid_redirect_uri: The redirect uri included is not valid.
- invalid_request: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
- invalid_resource_owner: The provided resource owner credentials are not valid, or resource owner cannot be found
- invalid_scope: The requested scope is invalid, unknown, or malformed.
invalid_token:
expired: کد دسترسی منقضی شده است
revoked: کد دسترسی فسخ شده است
unknown: کد دسترسی معتبر نیست
- resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfiged.
server_error: خطای پیشبینینشدهای برای سرور اجازهدهنده رخ داد که جلوی اجرای این درخواست را گرفت.
temporarily_unavailable: سرور اجازهدهنده به دلیل بار زیاد یا تعمیرات سرور هماینک نمیتواند درخواست شما را بررسی کند.
- unauthorized_client: The client is not authorized to perform this request using this method.
- unsupported_grant_type: The authorization grant type is not supported by the authorization server.
- unsupported_response_type: The authorization server does not support this response type.
flash:
applications:
create:
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index a3b878b65..10613d435 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -72,7 +72,6 @@ fi:
index:
application: Sovellus
created_at: Valtuutettu
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Oikeudet
title: Valtuutetut sovellukset
errors:
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index eae691659..352561768 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -5,7 +5,6 @@ fr:
doorkeeper/application:
name: Nom
redirect_uri: L’URL de redirection
- scope: Portée
scopes: Étendues
website: Site web de l’application
errors:
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index 0dc45d5a3..90cbd9b38 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -114,6 +114,12 @@ gl:
application:
title: Precisa autorización OAuth
scopes:
+ admin:read: ler todos os datos no servidor
+ admin:read:accounts: ler información sensible de todas as contas
+ admin:read:reports: ler información sensible de todos os informes e contas reportadas
+ admin:write: modificar todos os datos no servidor
+ admin:write:accounts: executar accións de moderación nas contas
+ admin:write:reports: executar accións de moderación nos informes
follow: modificar as relacións da conta
push: recibir notificacións push
read: ler todos os datos da súa conta
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index d797b0ac9..78bb0a142 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -72,7 +72,6 @@ he:
index:
application: ישום
created_at: מאושר
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: תחומים
title: ישומיך המאושרים
errors:
diff --git a/config/locales/doorkeeper.hr.yml b/config/locales/doorkeeper.hr.yml
index e0240938e..221ec27e9 100644
--- a/config/locales/doorkeeper.hr.yml
+++ b/config/locales/doorkeeper.hr.yml
@@ -4,7 +4,6 @@ hr:
attributes:
doorkeeper/application:
name: Ime
- redirect_uri: Redirect URI
errors:
models:
doorkeeper/application:
@@ -33,7 +32,6 @@ hr:
redirect_uri: Koristi jednu liniju po URI
scopes: Odvoji scopes sa razmacima. Ostavi prazninu kako bi koristio zadane scopes.
index:
- callback_url: Callback URL
name: Ime
new: Nova Aplikacija
title: Tvoje aplikacije
@@ -43,7 +41,6 @@ hr:
actions: Akcije
application_id: Id Aplikacije
callback_urls: Callback urls
- scopes: Scopes
secret: Tajna
title: 'Aplikacija: %{name}'
authorizations:
@@ -56,8 +53,6 @@ hr:
able_to: Moći će
prompt: Aplikacija %{client_name} je zatražila pristup tvom računu
title: Traži se autorizacija
- show:
- title: Copy this authorization code and paste it to the application.
authorized_applications:
buttons:
revoke: Odbij
@@ -66,15 +61,11 @@ hr:
index:
application: Aplikacija
created_at: Ovlašeno
- date_format: "%Y-%m-%d %H:%M:%S"
- scopes: Scopes
title: Tvoje autorizirane aplikacije
errors:
messages:
access_denied: Vlasnik resursa / autorizacijski server je odbio zahtjev.
- credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
invalid_client: Autentifikacija klijenta nije uspjela zbog nepoznatog klijenta, neuključene autentifikacije od strane klijenta, ili nepodržane metode autentifikacije.
- invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
invalid_redirect_uri: The redirect uri included nije valjan.
invalid_request: Zahtjevu nedostaje traženi parametar, uključuje nepodržanu vrijednost parametra, ili je na neki drugi način neispravno formiran.
invalid_resource_owner: The provided resource owner credentials nisu valjani, ili vlasnik resursa ne može biti nađen
@@ -83,7 +74,6 @@ hr:
expired: Pristupni token je istekao
revoked: Pristupni token je odbijen
unknown: Pristupni token nije valjan
- resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfiged.
server_error: Autorizacijski server naišao je na neočekivani uvjet, što ga je onemogućilo da ispuni zahtjev.
temporarily_unavailable: Autorizacijski server trenutno nije u mogućnosti izvesti zahtjev zbog privremenog preopterećenja ili održavanja servera.
unauthorized_client: Klijent nije ovlašten izvesti zahtjev koristeći ovu metodu.
@@ -104,7 +94,6 @@ hr:
admin:
nav:
applications: Aplikacije
- oauth2_provider: OAuth2 Provider
application:
title: Traži se OAuth autorizacija
scopes:
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index fa706e100..122392864 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -3,8 +3,8 @@ hu:
activerecord:
attributes:
doorkeeper/application:
- name: Név
- redirect_uri: Visszairányító URI
+ name: Alkalmazás neve
+ redirect_uri: Átirányító URI
scopes: Hatáskör
website: Az alkalmazás weboldala
errors:
@@ -33,7 +33,7 @@ hu:
help:
native_redirect_uri: Használj %{native_redirect_uri} a helyi tesztekhez
redirect_uri: Egy sor URI-nként
- scopes: A nézeteket szóközzel válaszd el. Hagyd üresen az alapértelmezett nézetekhez.
+ scopes: A hatásköröket szóközzel válaszd el. Hagyd üresen az alapértelmezett hatáskörökhöz.
index:
application: Alkalmazás
callback_url: Callback URL
@@ -42,14 +42,14 @@ hu:
new: Új alkalmazás
scopes: Hatáskör
show: Mutat
- title: Alkalmazásod
+ title: Alkalmazásaid
new:
title: Új alkalmazás
show:
actions: Műveletek
application_id: Alkalmazás azonosító
- callback_urls: Callback urlek
- scopes: Nézetek
+ callback_urls: Callback URL-ek
+ scopes: Hatáskörök
secret: Titok
title: 'Alkalmazás: %{name}'
authorizations:
@@ -63,7 +63,7 @@ hu:
prompt: "%{client_name} nevű alkalmazás engedélyt kér a fiókodhoz való hozzáféréshez."
title: Engedély szükséges
show:
- title: Copy this authorization code and paste it to the application.
+ title: Másold le ezt az engedélyező kódot és írd be az alkalmazásba.
authorized_applications:
buttons:
revoke: Visszavonás
@@ -71,28 +71,28 @@ hu:
revoke: Biztos vagy benne?
index:
application: Alkalmazás
- created_at: Készítve
+ created_at: Felhatalmazva
date_format: "%Y-%m-%d %H:%M:%S"
scopes: Hatáskör
title: Engedélyezett alkalmazásaid
errors:
messages:
- access_denied: Az erőforrás tulajdonosa vagy hitelesítő kiszolgálója megtakadta a kérést.
+ access_denied: Az erőforrás tulajdonosa vagy hitelesítő kiszolgálója megtagadta a kérést.
credential_flow_not_configured: Az erőforrás tulajdonos jelszóadatainak átadása megszakadt, mert a Doorkeeper.configure.resource_owner_from_credentials beállítatlan.
- invalid_client: A kliens hitelesítése megszakadt, mert a ismeretlen a kliens, kliens nem küldött hitelesítést, vagy ismeretlen a kliens
- invalid_grant: A biztosított hitelesítés érvénytelen, lejárt, visszavont, vagy nem egyezik a hitelesítéi kérésben használt URIval, vagy más kliensnek lett címezve.
- invalid_redirect_uri: A redirect uri nem valós.
- invalid_request: A kérésből hiányzik egy szükséges paraméter, nem támogatott paramétert tartalmaz, vagy egyéb módon hibás.
+ invalid_client: A kliens hitelesítése megszakadt, mert ismeretlen a kliens, a kliens nem küldött hitelesítést, vagy a hitelesítés módja nem támogatott.
+ invalid_grant: A biztosított hitelesítés érvénytelen, lejárt, visszavont, vagy nem egyezik a hitelesítési kérésben használt URI-val, vagy más kliensnek címezték.
+ invalid_redirect_uri: Az átirányító URI nem valós.
+ invalid_request: A kérésből hiányzik egy szükséges paraméter, nem támogatott paramétert tartalmaz, vagy máshogy sérült.
invalid_resource_owner: A biztosított erőforrás tulajdonosának hitelesítő adatai nem valósak, vagy az erőforrás tulajdonosa nem található.
invalid_scope: A kért nézet érvénytelen, ismeretlen, vagy hibás.
invalid_token:
expired: Hozzáférési kulcs lejárt
- revoked: Hozzáférési kulcs vissza lett vonva
+ revoked: Hozzáférési kulcsot visszavonták
unknown: Hozzáférési kulcs érvénytelen
resource_owner_authenticator_not_configured: Erőforrás tulajdonos keresés megszakadt, ugyanis a Doorkeeper.configure.resource_owner_authenticator beállítatlan.
server_error: Hitelesítő szervert váratlan esemény érte, mely meggátolta a kérés teljesítését.
- temporarily_unavailable: A hitelesítő szerver jelenleg nem tudja teljesíteni a kérést egy átmeneti túlterheltség vagy a kiszolgáló karbantartása miatt.
- unauthorized_client: A kliens nincs feljogosítva a kérés teljesítésére.
+ temporarily_unavailable: A hitelesítő szerver jelenleg nem tudja teljesíteni a kérést átmeneti túlterheltség vagy a kiszolgáló karbantartása miatt.
+ unauthorized_client: A kliens nincs feljogosítva erre a kérésre.
unsupported_grant_type: A hitelesítés módja nem támogatott a hitelesítő kiszolgálón.
unsupported_response_type: A hitelesítő kiszolgáló nem támogatja ezt a választ.
flash:
@@ -114,6 +114,29 @@ hu:
application:
title: OAuth engedély szükséges
scopes:
- follow: fiókok követése, blokkoláse, blokkolás feloldása és követés abbahagyása
+ follow: fiókok követése, letiltása, tiltás feloldása és követés abbahagyása
+ push: push értesítések fogadása
read: fiókod adatainak olvasása
- write: bejegyzés írása a nevedben
+ read:accounts: fiók adatainak megtekintése
+ read:blocks: letiltások megtekintése
+ read:favourites: kedvencek megtekintése
+ read:filters: szűrök megtekintése
+ read:follows: követések megtekintése
+ read:lists: listák megtekintése
+ read:mutes: némítások megtekintése
+ read:notifications: értesítések megtekintése
+ read:reports: bejelentések megtekintése
+ read:search: nevedben keresés
+ read:statuses: tülkök megtekintése
+ write: fiókod adatainak megváltoztatása
+ write:accounts: profilod megváltoztatása
+ write:blocks: fiókok és domainek letiltása
+ write:favourites: tülkök kedvencnek jelölése
+ write:filters: szűrők létrehozása
+ write:follows: mások követése
+ write:lists: listák létrehozása
+ write:media: média feltöltése
+ write:mutes: emberek és beszélgetések némítása
+ write:notifications: értesítések törlése
+ write:reports: mások bejelentése
+ write:statuses: tülkök közzététele
diff --git a/config/locales/doorkeeper.hy.yml b/config/locales/doorkeeper.hy.yml
new file mode 100644
index 000000000..c40654016
--- /dev/null
+++ b/config/locales/doorkeeper.hy.yml
@@ -0,0 +1 @@
+hy:
diff --git a/config/locales/doorkeeper.id.yml b/config/locales/doorkeeper.id.yml
index 0a99b86c0..3f9dee2ac 100644
--- a/config/locales/doorkeeper.id.yml
+++ b/config/locales/doorkeeper.id.yml
@@ -62,8 +62,6 @@ id:
able_to: Mempunyai akses untuk
prompt: Aplikasi %{client_name} meminta akses pada akun anda
title: Izin diperlukan
- show:
- title: Copy this authorization code and paste it to the application.
authorized_applications:
buttons:
revoke: Cabut izin
@@ -72,7 +70,6 @@ id:
index:
application: Aplikasi
created_at: Diizinkan pada
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Scope
title: Aplikasi yang anda izinkan
errors:
diff --git a/config/locales/doorkeeper.io.yml b/config/locales/doorkeeper.io.yml
index 28466d3ae..ff1fdf9c2 100644
--- a/config/locales/doorkeeper.io.yml
+++ b/config/locales/doorkeeper.io.yml
@@ -31,82 +31,14 @@ io:
help:
native_redirect_uri: Uzez %{native_redirect_uri} por lokala probi
redirect_uri: Uzez un lineo por singla URI
- scopes: Separate scopes with spaces. Leave blank to use the default scopes.
index:
- callback_url: Callback URL
- name: Name
new: New Application
- title: Your applications
new:
title: New Application
show:
- actions: Actions
application_id: Application Id
callback_urls: Callback urls
- scopes: Scopes
secret: Secret
- title: 'Application: %{name}'
- authorizations:
- buttons:
- authorize: Authorize
- deny: Deny
- error:
- title: An error has occurred
- new:
- able_to: It will be able to
- prompt: Application %{client_name} requests access to your account
- title: Authorization required
- show:
- title: Copy this authorization code and paste it to the application.
- authorized_applications:
- buttons:
- revoke: Revoke
- confirmations:
- revoke: Are you sure?
- index:
- application: Application
- created_at: Authorized
- date_format: "%Y-%m-%d %H:%M:%S"
- scopes: Scopes
- title: Your authorized applications
- errors:
- messages:
- access_denied: The resource owner or authorization server denied the request.
- credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
- invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
- invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
- invalid_redirect_uri: The redirect uri included is not valid.
- invalid_request: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
- invalid_resource_owner: The provided resource owner credentials are not valid, or resource owner cannot be found
- invalid_scope: The requested scope is invalid, unknown, or malformed.
- invalid_token:
- expired: The access token expired
- revoked: The access token was revoked
- unknown: The access token is invalid
- resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfiged.
- server_error: The authorization server encountered an unexpected condition which prevented it from fulfilling the request.
- temporarily_unavailable: The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.
- unauthorized_client: The client is not authorized to perform this request using this method.
- unsupported_grant_type: The authorization grant type is not supported by the authorization server.
- unsupported_response_type: The authorization server does not support this response type.
- flash:
- applications:
- create:
- notice: Application created.
- destroy:
- notice: Application deleted.
- update:
- notice: Application updated.
- authorized_applications:
- destroy:
- notice: Application revoked.
- layouts:
- admin:
- nav:
- applications: Applications
- oauth2_provider: OAuth2 Provider
- application:
- title: OAuth authorization required
scopes:
follow: follow, block, unblock and unfollow accounts
read: read your account's data
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index a76130bb9..361d0bd75 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -36,11 +36,11 @@ it:
scopes: Dividi gli scopes con spazi. Lascia vuoto per utilizzare gli scopes di default.
index:
application: Applicazione
- callback_url: Callback URL
+ callback_url: URL di callback
delete: Elimina
name: Nome
new: Nuova applicazione
- scopes: Scopes
+ scopes: Visibilità
show: Mostra
title: Le tue applicazioni
new:
@@ -114,6 +114,12 @@ it:
application:
title: Autorizzazione OAuth richiesta
scopes:
+ admin:read: leggere tutti i dati dal server
+ admin:read:accounts: leggere dati sensibili di tutti gli account
+ admin:read:reports: leggere dati sensibili di tutte le segnalazioni e gli account segnalati
+ admin:write: modificare tutti i dati sul server
+ admin:write:accounts: eseguire azioni di moderazione sugli account
+ admin:write:reports: eseguire azioni di moderazione sulle segnalazioni
follow: modificare relazioni tra account
push: ricevere le tue notifiche push
read: leggere tutte le informazioni del tuo account
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 9bc2d9a80..d80212f82 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -114,6 +114,12 @@ ja:
application:
title: OAuth認証
scopes:
+ admin:read: サーバーのすべてのデータの読み取り
+ admin:read:accounts: すべてのアカウントの機密情報の読み取り
+ admin:read:reports: すべての通報と通報されたアカウントの機密情報の読み取り
+ admin:write: サーバーのすべてのデータの変更
+ admin:write:accounts: アカウントに対するアクションの実行
+ admin:write:reports: 通報に対するアクションの実行
follow: アカウントのつながりを変更
push: プッシュ通知の受信
read: アカウントのすべてのデータの読み取り
diff --git a/config/locales/doorkeeper.ka.yml b/config/locales/doorkeeper.ka.yml
index e462e66f1..f4178a752 100644
--- a/config/locales/doorkeeper.ka.yml
+++ b/config/locales/doorkeeper.ka.yml
@@ -72,7 +72,6 @@ ka:
index:
application: აპლიკაცია
created_at: ავტორიზებული
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: ფარგლები
title: თქვენი ავტორიზებული აპლიკაციები
errors:
diff --git a/config/locales/doorkeeper.kk.yml b/config/locales/doorkeeper.kk.yml
index 409435802..97897cdcb 100644
--- a/config/locales/doorkeeper.kk.yml
+++ b/config/locales/doorkeeper.kk.yml
@@ -72,7 +72,6 @@ kk:
index:
application: Қосымша
created_at: Авторизацияланды
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Scopеs
title: Your authorized applicаtions
errors:
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
new file mode 100644
index 000000000..76e725deb
--- /dev/null
+++ b/config/locales/doorkeeper.ko.yml
@@ -0,0 +1,131 @@
+---
+ko:
+ activerecord:
+ attributes:
+ doorkeeper/application:
+ name: 애플리케이션 이름
+ redirect_uri: 리디렉션 URI
+ scopes: 범위
+ website: 애플리케이션 웹사이트
+ errors:
+ models:
+ doorkeeper/application:
+ attributes:
+ redirect_uri:
+ fragment_present: fragment를 포함할 수 없습니다
+ invalid_uri: 올바른 URI여야 합니다.
+ relative_uri: 절대경로 URI여야 합니다
+ secured_uri: HTTPS/SSL URI여야 합니다.
+ doorkeeper:
+ applications:
+ buttons:
+ authorize: 승인
+ cancel: 취소
+ destroy: 제거
+ edit: 수정
+ submit: 제출
+ confirmations:
+ destroy: 확실합니까?
+ edit:
+ title: 애플리케이션 수정
+ form:
+ error: 이런! 에러를 확인하세요
+ help:
+ native_redirect_uri: "%{native_redirect_uri}를 이용해 로컬 테스트를 할 수 있습니다"
+ redirect_uri: 한 줄에 하나의 URI를 작성하세요
+ scopes: 스페이스로 범위를 구분하세요. 빈 칸으로 놔두면 기본 범위를 사용합니다.
+ index:
+ application: 애플리케이션
+ callback_url: 콜백 URL
+ delete: 삭제
+ name: 이름
+ new: 새 애플리케이션
+ scopes: 범위
+ show: 표시
+ title: 당신의 애플리케이션들
+ new:
+ title: 새 애플리케이션
+ show:
+ actions: 동작
+ application_id: 클라이언트 키
+ callback_urls: 콜백 URL
+ scopes: 범위
+ secret: 클라이언트 비밀키
+ title: '애플리케이션: %{name}'
+ authorizations:
+ buttons:
+ authorize: 승인
+ deny: 거부
+ error:
+ title: 에러가 발생하였습니다
+ new:
+ able_to: 다음과 같은 행동들이 가능합니다
+ prompt: "%{client_name}이 당신의 계정에 접근 권한을 요청합니다"
+ title: 승인 필요
+ show:
+ title: 이 승인 코드를 복사하여 애플리케이션에 붙여넣으세요
+ authorized_applications:
+ buttons:
+ revoke: 취소
+ confirmations:
+ revoke: 확실합니까?
+ index:
+ application: 애플리케이션
+ created_at: 승인 됨
+ date_format: "%Y-%m-%d %H:%M:%S"
+ scopes: 범위
+ title: 당신의 승인 된 애플리케이션들
+ errors:
+ messages:
+ access_denied: 리소스 소유자 또는 권한 부여 서버가 요청을 거부했습니다.
+ invalid_redirect_uri: 리디렉션 URI가 올바르지 않습니다
+ invalid_request: 요청에 필요한 매개변수가 없거나, 지원 되지 않는 매개변수가 있거나, 형식이 잘못되었습니다.
+ invalid_token:
+ expired: 액세스 토큰이 만료되었습니다.
+ revoked: 액세스 토큰이 취소되었습니다.
+ unknown: 액세스 토큰이 잘못되었습니다.
+ flash:
+ applications:
+ create:
+ notice: 애플리케이션이 생성 되었습니다.
+ destroy:
+ notice: 애플리케이션이 삭제 되었습니다.
+ update:
+ notice: 애플리케이션이 갱신 되었습니다.
+ authorized_applications:
+ destroy:
+ notice: 애플리케이션이 취소 되었습니다.
+ layouts:
+ admin:
+ nav:
+ applications: 애플리케이션
+ oauth2_provider: OAuth2 제공자
+ application:
+ title: OAuth 인증이 필요합니다
+ scopes:
+ follow: 계정의 관계를 수정
+ push: 푸시 알림을 받기
+ read: 계정의 모든 데이터를 읽기
+ read:accounts: 계정의 정보를 보기
+ read:blocks: 차단을 보기
+ read:favourites: 관심글을 보기
+ read:filters: 필터를 보기
+ read:follows: 팔로우를 보기
+ read:lists: 리스트를 보기
+ read:mutes: 뮤트를 보기
+ read:notifications: 알림 보기
+ read:reports: 신고 보기
+ read:search: 당신의 권한으로 검색
+ read:statuses: 게시물 모두 보기
+ write: 계정 정보 수정
+ write:accounts: 프로필 수정
+ write:blocks: 계정이나 도메인 차단
+ write:favourites: 관심글 지정
+ write:filters: 필터 만들기
+ write:follows: 사람을 팔로우
+ write:lists: 리스트 만들기
+ write:media: 미디어 파일 업로드
+ write:mutes: 사람이나 대화 뮤트
+ write:notifications: 알림 모두 지우기
+ write:reports: 다른 사람을 신고
+ write:statuses: 게시물 게시
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
new file mode 100644
index 000000000..6c5cb837a
--- /dev/null
+++ b/config/locales/doorkeeper.lt.yml
@@ -0,0 +1 @@
+lt:
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
new file mode 100644
index 000000000..1be0eabc0
--- /dev/null
+++ b/config/locales/doorkeeper.lv.yml
@@ -0,0 +1 @@
+lv:
diff --git a/config/locales/doorkeeper.ms.yml b/config/locales/doorkeeper.ms.yml
new file mode 100644
index 000000000..2925688a0
--- /dev/null
+++ b/config/locales/doorkeeper.ms.yml
@@ -0,0 +1 @@
+ms:
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index bf6d46f4b..aa37ea190 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -110,7 +110,6 @@ nl:
admin:
nav:
applications: Toepassingen
- home: Home
oauth2_provider: OAuth2-provider
application:
title: OAuth-autorisatie vereist
diff --git a/config/locales/doorkeeper.no.yml b/config/locales/doorkeeper.no.yml
index 56c15fab7..263fef15e 100644
--- a/config/locales/doorkeeper.no.yml
+++ b/config/locales/doorkeeper.no.yml
@@ -72,7 +72,6 @@
index:
application: Applikasjon
created_at: Autorisert
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Omfang
title: Dine autoriserte applikasjoner
errors:
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index de724f6c9..2068eeef4 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -114,6 +114,12 @@ pl:
application:
title: Uwierzytelnienie OAuth jest wymagane
scopes:
+ admin:read: odczytaj wszystkie dane na serwerze
+ admin:read:accounts: odczytaj wrażliwe informacje na wszystkich kontach
+ admin:read:reports: odczytaj wrażliwe informacje ze wszystkich zgłoszeń oraz zgłoszonych kont
+ admin:write: zmodyfikuj wszystkie dane na serwerze
+ admin:write:accounts: wykonaj działania moderacyjne na kontach
+ admin:write:reports: wykonaj działania moderacyjne na zgłoszeniach
follow: możliwość śledzenia kont
push: otrzymywanie powiadomień push dla Twojego konta
read: możliwość odczytu wszystkich danych konta
diff --git a/config/locales/doorkeeper.pt.yml b/config/locales/doorkeeper.pt.yml
index e76cd01fd..f21e84d17 100644
--- a/config/locales/doorkeeper.pt.yml
+++ b/config/locales/doorkeeper.pt.yml
@@ -72,7 +72,6 @@ pt:
index:
application: Aplicação
created_at: Criada em
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Autorizações
title: As tuas aplicações autorizadas
errors:
diff --git a/config/locales/doorkeeper.ro.yml b/config/locales/doorkeeper.ro.yml
index fea4baf60..79dbaa871 100644
--- a/config/locales/doorkeeper.ro.yml
+++ b/config/locales/doorkeeper.ro.yml
@@ -1,3 +1 @@
----
ro:
- doorkeeper: {}
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index f37317559..ebe90a189 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -63,7 +63,7 @@ ru:
prompt: Приложение %{client_name} запрашивает доступ к Вашему аккаунту
title: Требуется авторизация
show:
- title: Copy this authorization code and paste it to the application.
+ title: Скопируйте этот код авторизации и вставьте его в приложении.
authorized_applications:
buttons:
revoke: Отозвать авторизацию
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index 98597ca8b..f54eb6d48 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -72,7 +72,6 @@ sk:
index:
application: Aplikácia
created_at: Autorizované
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Oprávnenia
title: Vaše autorizované aplikácie
errors:
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index c27457089..26d92ddb5 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -4,3 +4,145 @@ sl:
attributes:
doorkeeper/application:
name: Ime programa
+ redirect_uri: Preusmeritev URI
+ scopes: Obsegi
+ website: Spletišče programa
+ errors:
+ models:
+ doorkeeper/application:
+ attributes:
+ redirect_uri:
+ fragment_present: ne more vsebovati fragmenta.
+ invalid_uri: mora biti veljaven URI.
+ relative_uri: mora biti absolutni URI.
+ secured_uri: mora biti HTTPS/SSL URI.
+ doorkeeper:
+ applications:
+ buttons:
+ authorize: Overi
+ cancel: Prekliči
+ destroy: Uniči
+ edit: Uredi
+ submit: Pošlji
+ confirmations:
+ destroy: Ali ste prepričani?
+ edit:
+ title: Uredi aplikacijo
+ form:
+ error: Ups! Preverite obrazec za morebitne napake
+ help:
+ native_redirect_uri: Uporabite %{native_redirect_uri} za krajevne preizkuse
+ redirect_uri: Uporabite eno vrstico na URI
+ scopes: Ločite obsege s presledki. Pustite prazno, da uporabite privzete obsege.
+ index:
+ application: Program
+ callback_url: Povratni URL
+ delete: Izbriši
+ name: Ime
+ new: Nov program
+ scopes: Obsegi
+ show: Pokaži
+ title: Vaši programi
+ new:
+ title: Nov program
+ show:
+ actions: Dejanja
+ application_id: Ključ odjemalca
+ callback_urls: Povratni URL-ji
+ scopes: Obsegi
+ secret: Skrivnost odjemalca
+ title: 'Program: %{name}'
+ authorizations:
+ buttons:
+ authorize: Overi
+ deny: Zavrni
+ error:
+ title: Prišlo je do napake
+ new:
+ able_to: To bo lahko
+ prompt: Program %{client_name} zahteva dostop do vašega računa
+ title: Potrebna je pooblastitev
+ show:
+ title: Kopirajte to pooblastilno kodo in jo prilepite v program.
+ authorized_applications:
+ buttons:
+ revoke: Prekliči
+ confirmations:
+ revoke: Ali ste prepričani?
+ index:
+ application: Program
+ created_at: Odobreno
+ date_format: "%Y-%m-%d %H:%M:%S"
+ scopes: Obsegi
+ title: Vaši odobreni programi
+ errors:
+ messages:
+ access_denied: Lastnik virov ali strežnik pooblastil je zavrnil zahtevo.
+ credential_flow_not_configured: Pretok geselskih pooblastil lastnika virov ni uspel, ker Doorkeeper.configure.resource_owner_from_credentials ni nastavljen.
+ invalid_client: Overitev odjemalca ni uspelo zaradi neznanega odjemalca, zaradi nevključitve overitve odjemalca ali zaradi nepodprte metode overitve.
+ invalid_grant: Predložena odobritev za pooblastilo je neveljavna, potekla, preklicana, se ne ujema z URI preusmeritvijo, ki je uporabljena v zahtevi za pooblastilo ali je bila izdana drugemu odjemalcu.
+ invalid_redirect_uri: URI za preusmeritev ni veljaven.
+ invalid_request: Zahtevku manjka zahtevan parameter, vključuje nepodprto vrednost parametra ali je nepravilno oblikovan.
+ invalid_resource_owner: Predložene poverilnice lastnika virov niso veljavne ali pa lastnika virov ni mogoče najti
+ invalid_scope: Zahtevani obseg je neveljaven, neznan ali nepravilen.
+ invalid_token:
+ expired: Žeton za dostop je pretekel
+ revoked: Žeton za dostop je bil preklican
+ unknown: Žeton za dostop je neveljaven
+ resource_owner_authenticator_not_configured: Iskanje lastnika virov ni uspelo, ker Doorkeeper.configure.resource_owner_authenticator ni nastavljen.
+ server_error: Strežnik pooblastil je naletel na nepričakovano stanje, ki je preprečilo, da bi izpolnil zahtevo.
+ temporarily_unavailable: Strežnik pooblastil, zaradi začasne preobremenitve ali vzdrževanja, trenutno ne more obdelati zahteve.
+ unauthorized_client: Odjemalec nima pooblastila za izvajanje te zahteve po tej metodi.
+ unsupported_grant_type: Strežnik pooblastil ne podpira vrste odobritve pooblastila.
+ unsupported_response_type: Strežnik pooblastil ne podpira te vrste odziva.
+ flash:
+ applications:
+ create:
+ notice: Program je ustvarjen.
+ destroy:
+ notice: Program je izbrisan.
+ update:
+ notice: Program je posodobljen.
+ authorized_applications:
+ destroy:
+ notice: Program je preklican.
+ layouts:
+ admin:
+ nav:
+ applications: Programi
+ oauth2_provider: Ponudnik OAuth2
+ application:
+ title: Potrebna je OAuth pooblastitev
+ scopes:
+ admin:read: preberi vse podatke na strežniku
+ admin:read:accounts: preberi občutljive informacije vseh računov
+ admin:read:reports: preberi občutljive informacije vseh prijav in prijavljenih računov
+ admin:write: spremeni vse podatke na strežniku
+ admin:write:accounts: izvedi moderirana dejanja na računih
+ admin:write:reports: izvedi moderirana dejanja na prijavah
+ follow: spremeni razmerja med računi
+ push: prejmi potisna obvestila
+ read: preberi vse podatke svojega računa
+ read:accounts: oglejte si podrobnosti računov
+ read:blocks: oglejte si svoje blokirane
+ read:favourites: oglejte si svoje priljubljene
+ read:filters: oglejte si svoje filtre
+ read:follows: oglejte si svoje sledilce
+ read:lists: oglejte si svoje sezname
+ read:mutes: oglejte si svoje utišane
+ read:notifications: oglejte si svoja obvestila
+ read:reports: oglejte si svoje prijave
+ read:search: iščite v svojem imenu
+ read:statuses: oglejte si vsa stanja
+ write: spremenite vse podatke svojega računa
+ write:accounts: spremenite svoj profil
+ write:blocks: blokirajte račune in domene
+ write:favourites: priljubljena stanja
+ write:filters: ustvari filtre
+ write:follows: sledi osebam
+ write:lists: ustvarite sezname
+ write:media: pošlji medije
+ write:mutes: utišaj osebe in pogovore
+ write:notifications: počisti svoja obvestila
+ write:reports: prijavi druge osebe
+ write:statuses: objavi stanja
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index 25440cbb0..4fd246eff 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -72,7 +72,6 @@ sv:
index:
application: Applikation
created_at: Auktoriserad
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: Omfattning
title: Dina behöriga ansökningar
errors:
diff --git a/config/locales/doorkeeper.ta.yml b/config/locales/doorkeeper.ta.yml
new file mode 100644
index 000000000..4320953ce
--- /dev/null
+++ b/config/locales/doorkeeper.ta.yml
@@ -0,0 +1 @@
+ta:
diff --git a/config/locales/doorkeeper.te.yml b/config/locales/doorkeeper.te.yml
new file mode 100644
index 000000000..34c54f18f
--- /dev/null
+++ b/config/locales/doorkeeper.te.yml
@@ -0,0 +1 @@
+te:
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 60edae1e4..5866baa43 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -3,111 +3,120 @@ th:
activerecord:
attributes:
doorkeeper/application:
- name: ชื่อ
- redirect_uri: เปลี่ยนเส้นทาง URI
+ name: ชื่อแอปพลิเคชัน
+ redirect_uri: URI การเปลี่ยนเส้นทาง
+ scopes: ขอบเขต
+ website: เว็บไซต์แอปพลิเคชัน
errors:
models:
doorkeeper/application:
attributes:
redirect_uri:
- fragment_present: cannot contain a fragment.
- invalid_uri: ต้องใช้ URI ที่ถูกต้อง.
- relative_uri: ต้องเป็น absolute URI.
- secured_uri: ต้องใช้ HTTPS/SSL URI.
+ fragment_present: ไม่สามารถมีส่วนย่อย
+ invalid_uri: ต้องเป็น URI ที่ถูกต้อง
+ relative_uri: ต้องเป็น URI แบบเต็ม
+ secured_uri: ต้องเป็น URI แบบ HTTPS/SSL
doorkeeper:
applications:
buttons:
- authorize: Authorize
+ authorize: อนุญาต
cancel: ยกเลิก
destroy: ทำลาย
edit: แก้ไข
- submit: Submit
+ submit: ส่ง
confirmations:
- destroy: แน่ใจนะ?
+ destroy: คุณแน่ใจหรือไม่?
edit:
- title: แก้ไข แอ๊ฟพลิเคชั่น
- form:
- error: Whoops! Check your form for possible errors
+ title: แก้ไขแอปพลิเคชัน
help:
- native_redirect_uri: ใช้ %{native_redirect_uri} สำหรับการทดสอบ
- redirect_uri: ใช้บรรทัดละหนึ่ง URI
- scopes: Separate scopes with spaces. Leave blank to use the default scopes.
+ native_redirect_uri: ใช้ %{native_redirect_uri} สำหรับการทดสอบในเว็บ
+ redirect_uri: ใช้หนึ่งบรรทัดต่อ URI
+ scopes: แยกขอบเขตด้วยช่องว่าง เว้นว่างเพื่อใช้ขอบเขตเริ่มต้น
index:
- callback_url: Callback URL
+ application: แอปพลิเคชัน
+ callback_url: URL เรียกกลับ
+ delete: ลบ
name: ชื่อ
- new: New Application
- title: Your applications
+ new: แอปพลิเคชันใหม่
+ scopes: ขอบเขต
+ show: แสดง
+ title: แอปพลิเคชันของคุณ
new:
- title: New Application
+ title: แอปพลิเคชันใหม่
show:
- actions: Actions
- application_id: Application Id
- callback_urls: Callback urls
- scopes: Scopes
- secret: Secret
- title: 'Application: %{name}'
+ actions: การกระทำ
+ application_id: กุญแจไคลเอ็นต์
+ callback_urls: URL เรียกกลับ
+ scopes: ขอบเขต
+ secret: รหัสลับไคลเอ็นต์
+ title: 'แอปพลิเคชัน: %{name}'
authorizations:
buttons:
- authorize: อนุญาติ
- deny: ไม่อนุญาติ
+ authorize: อนุญาต
+ deny: ปฏิเสธ
error:
- title: An error has occurred
+ title: เกิดข้อผิดพลาด
new:
- able_to: It will be able to
- prompt: Application %{client_name} requests access to your account
- title: Authorization required
+ able_to: แอปจะสามารถ
+ prompt: แอปพลิเคชัน %{client_name} ขอเข้าถึงบัญชีของคุณ
+ title: ต้องมีการอนุญาต
show:
- title: Copy this authorization code and paste it to the application.
+ title: คัดลอกรหัสการอนุญาตนี้แล้ววางลงในแอปพลิเคชัน
authorized_applications:
buttons:
- revoke: ยกเลิกการอนุญาติ
+ revoke: เพิกถอน
confirmations:
- revoke: Are you sure?
+ revoke: คุณแน่ใจหรือไม่?
index:
- application: Application
- created_at: Authorized
- date_format: "%Y-%m-%d %H:%M:%S"
- scopes: Scopes
- title: Your authorized applications
+ application: แอปพลิเคชัน
+ created_at: อนุญาตเมื่อ
+ scopes: ขอบเขต
+ title: แอปพลิเคชันที่ได้รับอนุญาตของคุณ
errors:
messages:
- access_denied: The resource owner or authorization server denied the request.
- credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
- invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
- invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
- invalid_redirect_uri: The redirect uri included is not valid.
- invalid_request: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
- invalid_resource_owner: The provided resource owner credentials are not valid, or resource owner cannot be found
- invalid_scope: The requested scope is invalid, unknown, or malformed.
- invalid_token:
- expired: The access token expired
- revoked: The access token was revoked
- unknown: The access token is invalid
- resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfiged.
- server_error: The authorization server encountered an unexpected condition which prevented it from fulfilling the request.
- temporarily_unavailable: The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.
- unauthorized_client: The client is not authorized to perform this request using this method.
- unsupported_grant_type: The authorization grant type is not supported by the authorization server.
- unsupported_response_type: The authorization server does not support this response type.
+ access_denied: เจ้าของทรัพยากรหรือเซิร์ฟเวอร์การอนุญาตปฏิเสธคำขอ
flash:
applications:
create:
- notice: Application created.
+ notice: สร้างแอปพลิเคชันแล้ว
destroy:
- notice: Application deleted.
+ notice: ลบแอปพลิเคชันแล้ว
update:
- notice: Application updated.
+ notice: อัปเดตแอปพลิเคชันแล้ว
authorized_applications:
destroy:
- notice: Application revoked.
+ notice: เพิกถอนแอปพลิเคชันแล้ว
layouts:
admin:
nav:
- applications: Applications
- oauth2_provider: OAuth2 Provider
+ applications: แอปพลิเคชัน
+ oauth2_provider: ผู้ให้บริการ OAuth2
application:
- title: OAuth authorization required
+ title: ต้องมีการอนุญาต OAuth
scopes:
- follow: follow, block, unblock and unfollow accounts
- read: read your account's data
- write: post on your behalf
+ follow: ปรับเปลี่ยนความสัมพันธ์ของบัญชี
+ push: รับการแจ้งเตือนแบบผลักของคุณ
+ read: อ่านข้อมูลบัญชีทั้งหมดของคุณ
+ read:accounts: ดูข้อมูลบัญชี
+ read:blocks: ดูการปิดกั้นของคุณ
+ read:favourites: ดูรายการโปรดของคุณ
+ read:filters: ดูตัวกรองของคุณ
+ read:follows: ดูการติดตามของคุณ
+ read:lists: ดูรายการของคุณ
+ read:mutes: ดูการปิดเสียงของคุณ
+ read:notifications: ดูการแจ้งเตือนของคุณ
+ read:reports: ดูรายงานของคุณ
+ read:search: ค้นหาในนามของคุณ
+ read:statuses: ดูสถานะทั้งหมด
+ write: ปรับเปลี่ยนข้อมูลบัญชีทั้งหมดของคุณ
+ write:accounts: ปรับเปลี่ยนโปรไฟล์ของคุณ
+ write:blocks: ปิดกั้นบัญชีและโดเมน
+ write:favourites: ชื่นชอบสถานะ
+ write:filters: สร้างตัวกรอง
+ write:follows: ติดตามผู้คน
+ write:lists: สร้างรายการ
+ write:media: อัปโหลดไฟล์สื่อ
+ write:mutes: ปิดเสียงผู้คนและการสนทนา
+ write:notifications: ล้างการแจ้งเตือนของคุณ
+ write:reports: รายงานผู้คนอื่น ๆ
+ write:statuses: เผยแพร่สถานะ
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index 205ad026f..305a5c1d6 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -58,8 +58,6 @@ uk:
able_to: Він зможе
prompt: Податок %{client_name} просить доступу до вашого акаунту
title: Необхідна авторизація
- show:
- title: Copy this authorization code and paste it to the application.
authorized_applications:
buttons:
revoke: Відкликати авторизацію
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 3c7dd99be..dd9337904 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -72,7 +72,6 @@ zh-CN:
index:
application: 应用
created_at: 授权时间
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: 权限范围
title: 已授权的应用列表
errors:
@@ -114,7 +113,35 @@ zh-CN:
application:
title: 需要 OAuth 认证
scopes:
+ admin:read: 读取服务器上的所有数据
+ admin:read:accounts: 读取所有账户的敏感信息
+ admin:read:reports: 读取所有举报和被举报账户的敏感信息
+ admin:write: 修改服务器上的所有数据
+ admin:write:accounts: 对账户执行管理操作
+ admin:write:reports: 对举报执行管理操作
follow: 关注或屏蔽用户
push: 接收你的帐户的推送通知
read: 读取你的帐户数据
- write: 为你发表嘟文
+ read:accounts: 查看账户信息
+ read:blocks: 查看你的屏蔽列表
+ read:favourites: 查看你的收藏
+ read:filters: 查看你的过滤器
+ read:follows: 查看你的关注
+ read:lists: 查看你的列表
+ read:mutes: 查看你的隐藏列表
+ read:notifications: 查看你的通知
+ read:reports: 查看你的举报
+ read:search: 以你的身份搜索
+ read:statuses: 查看所有嘟文
+ write: 修改你的账户数据
+ write:accounts: 修改你的个人资料
+ write:blocks: 屏蔽账户和域名
+ write:favourites: 收藏嘟文
+ write:filters: 创建过滤器
+ write:follows: 关注其他人
+ write:lists: 创建列表
+ write:media: 上传媒体文件
+ write:mutes: 隐藏用户和对话
+ write:notifications: 清除你的通知
+ write:reports: 举报他人
+ write:statuses: 发表嘟文
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index 19ed76d1a..d9c91caf0 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -72,7 +72,6 @@ zh-HK:
index:
application: 應用程式
created_at: 授權日期
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: 權限範圍
title: 已獲你授權的程用程式
errors:
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 690fc4513..41dd17264 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -72,7 +72,6 @@ zh-TW:
index:
application: 應用程式
created_at: 授權時間
- date_format: "%Y-%m-%d %H:%M:%S"
scopes: 權限範圍
title: 已授權的應用程式
errors:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index f2b6751ff..a08ec7141 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -41,7 +41,7 @@ el:
user_count_before: Σπίτι για
what_is_mastodon: Τι είναι το Mastodon;
accounts:
- choices_html: 'Επιλογές του/της %{name}:'
+ choices_html: 'Επιλογές από %{name}:'
follow: Ακολούθησε
followers:
one: Ακόλουθος
@@ -68,6 +68,7 @@ el:
admin: Διαχειριστής
bot: Μποτ (αυτόματος λογαριασμός)
moderator: Μεσολαβητής
+ unavailable: Το προφίλ δεν είναι διαθέσιμο
unfollow: Διακοπή παρακολούθησης
admin:
account_actions:
@@ -80,6 +81,7 @@ el:
destroyed_msg: Επιτυχής καταστροφή σημειώματος μεσολάβησης!
accounts:
approve: Έγκριση
+ approve_all: Έγκριση όλων
are_you_sure: Σίγουρα;
avatar: Αβατάρ
by_domain: Τομέας
@@ -132,6 +134,7 @@ el:
moderation_notes: Σημειώσεις μεσολάβησης
most_recent_activity: Πιο πρόσφατη δραστηριότητα
most_recent_ip: Πιο πρόσφατη IP
+ no_account_selected: Κανείς λογαριασμός δεν ενημερώθηκε αφού κανείς δεν ήταν επιλεγμένος
no_limits_imposed: Χωρίς όρια
not_subscribed: Άνευ συνδρομής
outbox_url: URL εξερχομένων
@@ -144,6 +147,7 @@ el:
push_subscription_expires: Η εγγραφή PuSH λήγει
redownload: Ανανέωση αβατάρ
reject: Απόρριψη
+ reject_all: Απόρριψη όλων
remove_avatar: Απομακρυσμένο αβατάρ
remove_header: Αφαίρεση επικεφαλίδας
resend_confirmation:
@@ -170,6 +174,7 @@ el:
statuses: Καταστάσεις
subscribe: Εγγραφή
suspended: Σε αναστολή
+ time_in_queue: Σε αναμονή για %{time}
title: Λογαριασμοί
unconfirmed_email: Ανεπιβεβαίωτο email
undo_silenced: Αναίρεση αποσιώπησης
@@ -245,6 +250,7 @@ el:
feature_profile_directory: Κατάλογος χρηστών
feature_registrations: Εγγραφές
feature_relay: Ανταποκριτής ομοσπονδίας
+ feature_timeline_preview: Προεπισκόπιση ροής
features: Λειτουργίες
hidden_service: Ομοσπονδία με κρυμμένες υπηρεσίες
open_reports: ανοιχτές καταγγελίες
@@ -264,6 +270,7 @@ el:
created_msg: Ο αποκλεισμός τομέα είναι υπό επεξεργασία
destroyed_msg: Ο αποκλεισμός τομέα άρθηκε
domain: Τομέας
+ existing_domain_block_html: Έχεις ήδη επιβάλλει αυστηρότερους περιορισμούς στο %{name}, πρώτα θα πρέπει να τους αναιρέσεις.
new:
create: Δημιουργία αποκλεισμού
hint: Ο αποκλεισμός τομέα δεν θα αποτρέψει νέες καταχωρίσεις λογαριασμών στην βάση δεδομένων, αλλά θα εφαρμόσει αναδρομικά και αυτόματα συγκεκριμένες πολιτικές μεσολάβησης σε αυτούς τους λογαριασμούς.
@@ -329,6 +336,8 @@ el:
expired: Ληγμένες
title: Φίλτρο
title: Προσκλήσεις
+ pending_accounts:
+ title: Λογαριασμοί σε αναμονή (%{count})
relays:
add_new: Πρόσθεσε νέο ανταποκριτή (relay)
delete: Διαγραφή
@@ -465,7 +474,7 @@ el:
confirmed: Επιβεβαιωμένες
expires_in: Λήγει σε
last_delivery: Τελευταία παράδοση
- title: WebSub
+ title: Πρωτόκολλο WebSub
topic: Θέμα
tags:
accounts: Λογαριασμοί
@@ -490,6 +499,12 @@ el:
body: Ο/Η %{reporter} κατήγγειλε τον/την %{target}
body_remote: Κάποιος/α από τον τομέα %{domain} κατήγγειλε τον/την %{target}
subject: Νέα καταγγελία για %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Προηγμένη λειτουργία χρήσης
+ advanced_web_interface_hint: 'Αν θέλεις να χρησιμοποιήσεις ολόκληρο το πλάτος της οθόνης σου, η προηγμένη λειτουργία χρήσης σου επιτρέπει να ορίσεις πολλαπλές κολώνες ώστε να βλέπεις ταυτόχρονα όση πληροφορία θέλεις: Την αρχική ροή, τις ειδοποιήσεις, την ομοσπονδιακή ροή και όσες λίστες και ταμπέλες θέλεις.'
+ animations_and_accessibility: Κίνηση και προσβασιμότητα
+ confirmation_dialogs: Ερωτήσεις επιβεβαίωσης
+ sensitive_content: Ευαίσθητο περιεχόμενο
application_mailer:
notification_preferences: Αλλαγή προτιμήσεων email
salutation: "%{name},"
@@ -522,7 +537,7 @@ el:
or_log_in_with: Ή συνδέσου με
providers:
cas: Υπηρεσία Κεντρικής Πιστοποίησης (CAS)
- saml: SAML
+ saml: Πρωτόκολλο SAML
register: Εγγραφή
registration_closed: Το %{instance} δεν δέχεται νέα μέλη
resend_confirmation: Στείλε ξανά τις οδηγίες επιβεβαίωσης
@@ -631,6 +646,7 @@ el:
all: Όλα
changes_saved_msg: Οι αλλαγές αποθηκεύτηκαν!
copy: Αντιγραφή
+ order_by: Ταξινόμηση κατά
save_changes: Αποθήκευσε τις αλλαγές
validation_errors:
one: Κάτι δεν είναι εντάξει ακόμα! Για κοίταξε το παρακάτω σφάλμα
@@ -646,10 +662,13 @@ el:
keybase:
invalid_token: Τα κλειδιά Keybase είναι κατακερματισμένες υπογραφές και πρέπει να έχουν μήκος 66 δεκαεξαδικών χαρακτήρων
verification_failed: Το Keybase δεν δέχτηκε αυτό το κλειδί ως υπογραφή του χρήστη %{kb_username}. Παρακαλούμε δοκίμασε μέσω Keybase.
+ wrong_user: Δεν επιτρέπεται να δημιουργηθεί ένα αποδεικτικό για %{proving} υπό τη σύνδεση ως %{current}. Συνδέσου ως %{proving} και δοκίμασε ξανά.
explanation_html: Εδώ μπορείς να συνδέσεις κρυπτογραφικά τις υπόλοιπες ταυτοτητές σου, όπως για παράδειγμα ένα προφίλ στο Keybase. Αυτό επιτρέπει σε άλλους ανθρώπους να σου στέλνουν κρυπτογραφημένα μηνύματα και να μπορούν να εμπιστευτούν το περιεχόμενο που τους στέλνεις εσύ.
i_am_html: Είμαι ο/η %{username} στην υπηρεσία %{service}.
identity: Ταυτότητα
inactive: Ανενεργή
+ publicize_checkbox: 'Και κάνε τουτ αυτό:'
+ publicize_toot: 'Αποδείχτηκε! Λέγομαι %{username} στο %{service}: %{url}'
status: Κατάσταση επαλήθευσης
view_proof: Εμφάνιση απόδειξης
imports:
@@ -764,13 +783,14 @@ el:
too_few_options: πρέπει να έχει περισσότερες από μια επιλογές
too_many_options: δεν μπορεί να έχει περισσότερες από %{max} επιλογές
preferences:
- languages: Γλώσσες
other: Άλλο
- publishing: Δημοσίευση
- web: Διαδίκτυο
+ posting_defaults: Προεπιλογές δημοσίευσης
+ public_timelines: Δημόσιες ροές
relationships:
activity: Δραστηριότητα λογαριασμού
dormant: Αδρανής
+ last_active: Τελευταία δραστηριότητα
+ most_recent: Πιο πρόσφατα
moved: Μετακόμισε
mutual: Αμοιβαίος
primary: Βασικός
@@ -846,6 +866,9 @@ el:
revoke_success: Η σύνδεση ανακλήθηκε επιτυχώς
title: Σύνδεση
settings:
+ account: Λογαριασμός
+ account_settings: Ρυθμίσεις λογαριασμού
+ appearance: Εμφάνιση
authorized_apps: Εγκεκριμένες εφαρμογές
back: Πίσω στο Mastodon
delete: Διαγραφή λογαριασμού
@@ -855,9 +878,11 @@ el:
featured_tags: Χαρακτηριστικές ταμπέλες
identity_proofs: Αποδείξεις ταυτοτήτων
import: Εισαγωγή
+ import_and_export: Εισαγωγή & Εξαγωγή
migrate: Μετακόμιση λογαριασμού
notifications: Ειδοποιήσεις
preferences: Προτιμήσεις
+ profile: Προφίλ
relationships: Ακολουθεί και ακολουθείται
two_factor_authentication: Πιστοποίηση 2 παραγόντων (2FA)
statuses:
@@ -907,10 +932,10 @@ el:
Ποιες πληροφορίες συλλέγουμε;
-
Βασικά στοιχεία λογαριασμού: Όταν εγγραφείς σε αυτό τον διακομιστή, μπορεί να σου ζητηθεί όνομα χρήστη, διεύθυνση email και ένας κωδικός. Μπορεί επίσης να εισάγεις επιπλέον πληροφορίες λογαριασμού όπως ένα όνομα λογαριασμού και σύντομο βιογραφικό και να ανεβάσεις εικόνα προφίλ και επικεφαλίδας. Το όνομα χρήστη, το όνομα λογαριασμού, το βιογραφικό και οι εικόνες προφίλ και επικεφαλίδας είναι πάντα δημόσια εμφανείς.
-
Δημοσιεύσεις, ακόλουθοι και λοιπά δημόσια στοιχεία: Η λίστα των ανθρώπων που ακολουθείς εμφανίζεται δημόσια, το ίδιο και οι ακόλουθοί σου. Όταν υποβάλλεις ένα μήνυμα, η ημερομηνία και ώρα αποθηκεύονται καθώς και η εφαρμογή που χρησιμοποίησες για την υποβολή του. Τα μηνύματα μπορεί να περιέχουν συνημμένα πολυμέσα όπως εικόνες και βίντεο. Τα δημόσια και τα μη καταχωρημένα μηνύματα είναι δημόσια διαθέσιμα. Όταν προβάλεις μια δημοσίευση στο προφίλ σου, είναι και αυτό δημόσια διαθέσιμο. Οι δημοσιεύσεις σου παραδίδονται στους ακολούθους σου, σε κάποιες περιπτώσεις αυτό σημαίνει ότι παραδίδονται σε διαφορετικούς διακομιστές (servers) και αντίγραφά τους αποθηκεύονται σε αυτούς. Παρομοίως, όταν διαγράψεις δημοσιεύσεις, αυτό μεταφέρεται στους ακόλουθους σου. Η αναδημοσίευση και η σημείωση ως αγαπημένης μιας δημοσίευσης είναι πάντα δημόσια.
-
Προσωπικές δημοσιεύσεις και προς ακόλουθους: Όλες οι δημοσιεύσεις αποθηκεύονται και επεξεργάζονται στον διακομιστή. Οι δημοσιεύσεις προς τους ακόλουθους παραδίδονται στους ακόλουθους σου και σε όσους χρήστες αναφέρονται σε αυτές. Σε κάποιες περιπτώσεις αυτό σημαίνει πως παραδίδονται σε διαφορετικούς διακομιστές και αντίγραφά τους αποθηκεύονται σε αυτούς. Καταβάλουμε ειλικρινή προσπάθεια περιορισμού πρόσβασης σε αυτές τις δημοσιεύσεις μόνο σε εγκεκριμένα άτομα, όμως διαφορετικοί διακομιστές μπορεί να μην το πετυχαίνουν αυτό. Για αυτό, είναι σημαντικό να ελέγχεις τους διακομιστές στους οποίους ανήκουν οι ακόλουθοί σου. Μπορείς να ενεργοποιήσεις την επιλογή χειροκίνητης αποδοχής ή απόρριψης των νέων ακόλουθών σου στις ρυθμίσεις. Παρακαλούμε έχε υπόψιν σου πως οι διαχειριστές του διακομιστή και των αποδεκτών διακομιστών πιθανόν να κοιτάνε αυτά τα μηνύματα, και πως οι τελικοί αποδέκτες μπορούν να αποθηκεύσουν την οθόνη, το μήνυμα ή να το αναμεταδώσουν με άλλους τρόπους. Μην μοιράζεσαι επικύνδυνες πληροφορίες μέσω του Mastodon.
-
Διευθύνσεις IP και άλλα metadata: Όταν συνδέεσαι, καταγράφουμε την διεύθυνση IP σου, καθώς και το όνομα της εφαρμογής του φυλλομετρητή σου (browser). Όλες οι τρέχουσες συνδέσεις στον λογαριασμό σου είναι διαθέσιμες προς ανασκόπηση στις ρυθμίσεις. Η πιο πρόσφατη διεύθυνση IP αποθηκεύεται για μέχρι 12 μήνες. Επίσης μπορεί να διατηρήσουμε ιστορικό του διακομιστή (log files) που να περιέχει την διεύθυνση ΙΡ κάθε κλήσης προς τον διακομιστή μας.
+
Βασικά στοιχεία λογαριασμού: Όταν εγγραφείς σε αυτό τον διακομιστή, μπορεί να σου ζητηθεί όνομα χρήστη, διεύθυνση email και ένας κωδικός. Μπορεί επίσης να εισάγεις επιπλέον πληροφορίες λογαριασμού όπως ένα όνομα λογαριασμού και σύντομο βιογραφικό και να ανεβάσεις εικόνα προφίλ και επικεφαλίδας. Το όνομα χρήστη, το όνομα λογαριασμού, το βιογραφικό και οι εικόνες προφίλ και επικεφαλίδας είναι πάντα δημόσια εμφανείς.
+
Δημοσιεύσεις, ακόλουθοι και λοιπά δημόσια στοιχεία: Η λίστα των ανθρώπων που ακολουθείς εμφανίζεται δημόσια, το ίδιο και οι ακόλουθοί σου. Όταν υποβάλλεις ένα μήνυμα, η ημερομηνία και ώρα αποθηκεύονται καθώς και η εφαρμογή που χρησιμοποίησες για την υποβολή του. Τα μηνύματα μπορεί να περιέχουν συνημμένα πολυμέσα όπως εικόνες και βίντεο. Τα δημόσια και τα μη καταχωρημένα μηνύματα είναι δημόσια διαθέσιμα. Όταν προβάλεις μια δημοσίευση στο προφίλ σου, είναι και αυτό δημόσια διαθέσιμο. Οι δημοσιεύσεις σου παραδίδονται στους ακολούθους σου, σε κάποιες περιπτώσεις αυτό σημαίνει ότι παραδίδονται σε διαφορετικούς διακομιστές (servers) και αντίγραφά τους αποθηκεύονται σε αυτούς. Παρομοίως, όταν διαγράψεις δημοσιεύσεις, αυτό μεταφέρεται στους ακόλουθους σου. Η αναδημοσίευση και η σημείωση ως αγαπημένης μιας δημοσίευσης είναι πάντα δημόσια.
+
Προσωπικές δημοσιεύσεις και προς ακόλουθους: Όλες οι δημοσιεύσεις αποθηκεύονται και επεξεργάζονται στον διακομιστή. Οι δημοσιεύσεις προς τους ακόλουθους παραδίδονται στους ακόλουθους σου και σε όσους χρήστες αναφέρονται σε αυτές. Σε κάποιες περιπτώσεις αυτό σημαίνει πως παραδίδονται σε διαφορετικούς διακομιστές και αντίγραφά τους αποθηκεύονται σε αυτούς. Καταβάλουμε ειλικρινή προσπάθεια περιορισμού πρόσβασης σε αυτές τις δημοσιεύσεις μόνο σε εγκεκριμένα άτομα, όμως διαφορετικοί διακομιστές μπορεί να μην το πετυχαίνουν αυτό. Για αυτό, είναι σημαντικό να ελέγχεις τους διακομιστές στους οποίους ανήκουν οι ακόλουθοί σου. Μπορείς να ενεργοποιήσεις την επιλογή χειροκίνητης αποδοχής ή απόρριψης των νέων ακόλουθών σου στις ρυθμίσεις. Παρακαλούμε έχε υπόψιν σου πως οι διαχειριστές του διακομιστή και των αποδεκτών διακομιστών πιθανόν να κοιτάνε αυτά τα μηνύματα, και πως οι τελικοί αποδέκτες μπορούν να αποθηκεύσουν την οθόνη, το μήνυμα ή να το αναμεταδώσουν με άλλους τρόπους. Μην μοιράζεσαι επικύνδυνες πληροφορίες μέσω του Mastodon.
+
Διευθύνσεις IP και άλλα metadata: Όταν συνδέεσαι, καταγράφουμε την διεύθυνση IP σου, καθώς και το όνομα της εφαρμογής του φυλλομετρητή σου (browser). Όλες οι τρέχουσες συνδέσεις στον λογαριασμό σου είναι διαθέσιμες προς ανασκόπηση στις ρυθμίσεις. Η πιο πρόσφατη διεύθυνση IP αποθηκεύεται για μέχρι 12 μήνες. Επίσης μπορεί να διατηρήσουμε ιστορικό του διακομιστή (log files) που να περιέχει την διεύθυνση ΙΡ κάθε κλήσης προς τον διακομιστή μας.
@@ -920,9 +945,9 @@ el:
Οι πληροφορίες σου που συλλέγουμε μπορεί να χρησιμοποιηθούν με τους ακόλουθους τρόπους:
-
Για να παρέχουμε την βασική λειτουργικότητα του Mastodon. Μπορείς να αλληλεπιδράσεις με τις δημοσιεύσεις άλλων και να κάνεις τις δικές σου μόνο αφού συνδεθείς. Για παράδειγμα, μπορείς να ακολουθήσεις άλλους χρήστες για να βλέπεις τις συνολικές δημοσιεύσεις τους στη δική σου, προσωπική αρχική ροή.
-
Για να διευκολύνουμε τη διαχείριση της κοινότητας, για παράδειγμα συγκρίνοντας τη δική σου διεύθυνση IP με άλλες γνωστές διευθύνσεις για να καθορίσουμε περιπτώσεις αποφυγής αποκλεισμού ή άλλων παραβάσεων.
-
Η διεύθυνση email που δίνεις μπορεί να χρησιμοποιηθεί για να σου στείλουμε πληροφορίες, ειδοποιήσεις για αλληλεπιδράσεις άλλων χρηστών με τις δημοσιεύσεις σου και να ανταποκριθούμε σε ερωτήματά σου.
+
Για να παρέχουμε την βασική λειτουργικότητα του Mastodon. Μπορείς να αλληλεπιδράσεις με τις δημοσιεύσεις άλλων και να κάνεις τις δικές σου μόνο αφού συνδεθείς. Για παράδειγμα, μπορείς να ακολουθήσεις άλλους χρήστες για να βλέπεις τις συνολικές δημοσιεύσεις τους στη δική σου, προσωπική αρχική ροή.
+
Για να διευκολύνουμε τη διαχείριση της κοινότητας, για παράδειγμα συγκρίνοντας τη δική σου διεύθυνση IP με άλλες γνωστές διευθύνσεις για να καθορίσουμε περιπτώσεις αποφυγής αποκλεισμού ή άλλων παραβάσεων.
+
Η διεύθυνση email που δίνεις μπορεί να χρησιμοποιηθεί για να σου στείλουμε πληροφορίες, ειδοποιήσεις για αλληλεπιδράσεις άλλων χρηστών με τις δημοσιεύσεις σου και να ανταποκριθούμε σε ερωτήματά σου.
@@ -938,8 +963,8 @@ el:
Καταβάλουμε κάθε δυνατή προσπάθεια να:
-
Διατηρήσουμε αρχεία ενεργειών των διακομιστών (servers) για όλα τα αιτήματα σε αυτόν τον διακομιστή, και αυτά τα αρχεία διατηρούνται για μέγιστο χρόνο 90 ημερών.
-
Διατηρήσουμε τις διευθύνσεις IP που σχετίζονται με εγγεγραμμένους χρήστες για μέγιστο χρόνο 12 μηνών.
+
Διατηρήσουμε αρχεία ενεργειών των διακομιστών (servers) για όλα τα αιτήματα σε αυτόν τον διακομιστή, και αυτά τα αρχεία διατηρούνται για μέγιστο χρόνο 90 ημερών.
+
Διατηρήσουμε τις διευθύνσεις IP που σχετίζονται με εγγεγραμμένους χρήστες για μέγιστο χρόνο 12 μηνών.
Μπορείς να αιτηθείς και να αποθηκεύσεις τοπικά ένα αρχείο του περιεχομένου σου που περιλαμβάνει τις δημοσιεύσεις, τα συνημμένα πολυμέσα, την εικόνα προφίλ και την εικόνα επικεφαλίδας.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 26475b4d3..a00383e51 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -174,6 +174,7 @@ en:
statuses: Statuses
subscribe: Subscribe
suspended: Suspended
+ time_in_queue: Waiting in queue %{time}
title: Accounts
unconfirmed_email: Unconfirmed email
undo_silenced: Undo silence
@@ -293,8 +294,8 @@ en:
one: One account in the database affected
other: "%{count} accounts in the database affected"
retroactive:
- silence: Unsilence all existing accounts from this domain
- suspend: Unsuspend all existing accounts from this domain
+ silence: Unsilence existing affected accounts from this domain
+ suspend: Unsuspend existing affected accounts from this domain
title: Undo domain block for %{domain}
undo: Undo
undo: Undo domain block
@@ -498,6 +499,12 @@ en:
body: "%{reporter} has reported %{target}"
body_remote: Someone from %{domain} has reported %{target}
subject: New report for %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Advanced web interface
+ advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.'
+ animations_and_accessibility: Animations and accessibility
+ confirmation_dialogs: Confirmation dialogs
+ sensitive_content: Sensitive content
application_mailer:
notification_preferences: Change e-mail preferences
salutation: "%{name},"
@@ -777,10 +784,9 @@ en:
too_few_options: must have more than one item
too_many_options: can't contain more than %{max} items
preferences:
- languages: Languages
other: Other
- publishing: Publishing
- web: Web
+ posting_defaults: Posting defaults
+ public_timelines: Public timelines
relationships:
activity: Account activity
dormant: Dormant
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index d428a95c3..33ba16210 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -759,10 +759,7 @@ en_GB:
too_few_options: must have more than one item
too_many_options: can't contain more than %{max} items
preferences:
- languages: Languages
other: Other
- publishing: Publishing
- web: Web
relationships:
activity: Account activity
dormant: Dormant
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index b85cb1a49..c71b42fdd 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1,7 +1,7 @@
---
eo:
about:
- about_hashtag_html: Ĉi tiuj estas la publikaj mesaĝoj markitaj per #%{hashtag}. Vi povas interagi kun ili se vi havas konton ie ajn en la fediverse.
+ about_hashtag_html: Ĉi tiuj estas la publikaj fajfoj markitaj per #%{hashtag}. Vi povas interagi kun ili se vi havas konton ie ajn en la fediverse.
about_mastodon_html: Mastodon estas socia reto bazita sur malfermitaj retaj protokoloj kaj sur libera malfermitkoda programo. Ĝi estas sencentra kiel retmesaĝoj.
about_this: Pri
active_count_after: aktiva
@@ -68,6 +68,7 @@ eo:
admin: Administranto
bot: Roboto
moderator: Kontrolanto
+ unavailable: Profilo ne disponebla
unfollow: Ne plu sekvi
admin:
account_actions:
@@ -80,6 +81,7 @@ eo:
destroyed_msg: Kontrola noto sukcese detruita!
accounts:
approve: Aprobi
+ approve_all: Aprobi ĉiujn
are_you_sure: Ĉu vi certas?
avatar: Profilbildo
by_domain: Domajno
@@ -132,6 +134,7 @@ eo:
moderation_notes: Kontrolaj notoj
most_recent_activity: Lasta ago
most_recent_ip: Lasta IP
+ no_account_selected: Neniu konto estis ŝanĝita ĉar neniu estis selektita
no_limits_imposed: Neniu limito trudita
not_subscribed: Ne abonita
outbox_url: Elira URL
@@ -144,6 +147,7 @@ eo:
push_subscription_expires: Eksvalidiĝo de la abono al PuSH
redownload: Aktualigi profilon
reject: Malakcepti
+ reject_all: Malaprobi ĉiujn
remove_avatar: Forigi profilbildon
remove_header: Forigi kapan bildon
resend_confirmation:
@@ -491,6 +495,10 @@ eo:
body: "%{reporter} signalis %{target}"
body_remote: Iu de %{domain} signalis %{target}
subject: Nova signalo por %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Altnivela retpaĝa interfaco
+ confirmation_dialogs: Konfirmaj dialogoj
+ sensitive_content: Tikla enhavo
application_mailer:
notification_preferences: Ŝanĝi retmesaĝajn preferojn
salutation: "%{name},"
@@ -655,8 +663,8 @@ eo:
i_am_html: Mi estas %{username} en %{service}.
identity: Identeco
inactive: Malaktiva
- publicize_checkbox: 'And toot this:'
- publicize_toot: 'It is proven! I am %{username} on %{service}: %{url}'
+ publicize_checkbox: 'Kaj fajfi ĉi tio:'
+ publicize_toot: 'I estas pruvita! Mi estas %{username} sur %{service}: %{url}'
status: Confirmo statuso
view_proof: Vidi pruvo
imports:
@@ -754,7 +762,6 @@ eo:
quadrillion: Dd
thousand: m
trillion: Dn
- unit: " "
pagination:
newer: Pli nova
next: Sekva
@@ -772,23 +779,16 @@ eo:
too_few_options: devas enhavi pli da unu propono
too_many_options: ne povas enhavi pli da %{max} proponoj
preferences:
- languages: Lingvoj
other: Aliaj aferoj
- publishing: Publikado
- web: Reto
relationships:
- activity: Account activity
- dormant: Dormant
- last_active: Last active
- most_recent: Most recent
- moved: Moved
- mutual: Mutual
- primary: Primary
- relationship: Relationship
- remove_selected_domains: Remove all followers from the selected domains
- remove_selected_followers: Remove selected followers
- remove_selected_follows: Unfollow selected users
- status: Account status
+ dormant: Dormanta
+ last_active: Lasta aktiva
+ most_recent: Plej lasta
+ moved: Moviĝita
+ mutual: Reciproka
+ primary: Primara
+ relationship: Rilato
+ status: Statuso de la konto
remote_follow:
acct: Enmetu vian uzantnomo@domajno de kie vi volas agi
missing_resource: La URL de plusendado ne estis trovita
@@ -856,6 +856,9 @@ eo:
revoke_success: Seanco sukcese malvalidigita
title: Seancoj
settings:
+ account: Konto
+ account_settings: Agordoj de konto
+ appearance: Apero
authorized_apps: Rajtigitaj aplikaĵoj
back: Reveni al Mastodon
delete: Konta forigo
@@ -863,12 +866,14 @@ eo:
edit_profile: Redakti profilon
export: Eksporti datumojn
featured_tags: Elstarigitaj kradvortoj
- identity_proofs: Identity proofs
+ identity_proofs: Pruvo de identeco
import: Importi
+ import_and_export: Alporto kaj elporto
migrate: Konta migrado
notifications: Sciigoj
preferences: Preferoj
- relationships: Follows and followers
+ profile: Profilo
+ relationships: Sekvatoj kaj sekvantoj
two_factor_authentication: Dufaktora aŭtentigo
statuses:
attached:
@@ -899,7 +904,7 @@ eo:
vote: Voĉdoni
show_more: Montri pli
sign_in_to_participate: Ensaluti por partopreni en la konversacio
- title: '%{name}: "%{quote}"'
+ title: "%{name}: “%{quote}”"
visibilities:
private: Montri nur al sekvantoj
private_long: Montri nur al sekvantoj
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3a8e8dc0b..49765cd0a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -4,25 +4,32 @@ es:
about_hashtag_html: Estos son toots públicos etiquetados con #%{hashtag}. Puedes interactuar con ellos si tienes una cuenta en cualquier parte del fediverso.
about_mastodon_html: 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
+ active_count_after: activo
administered_by: 'Administrado por:'
api: API
apps: Aplicaciones móviles
contact: Contacto
contact_missing: No especificado
contact_unavailable: N/A
+ discover_users: Descubrir usuarios
documentation: Documentación
extended_description_html: |
Un buen lugar para las reglas
La descripción extendida no se ha colocado aún.
+ federation_hint_html: Con una cuenta en %{instance} usted podrá seguir a las personas en cualquier servidor de Mastodon y más allá.
generic_description: "%{domain} es un servidor en la red"
+ get_apps: Probar una aplicación móvil
hosted_on: Mastodon hosteado en %{domain}
learn_more: Aprende más
privacy_policy: Política de privacidad
+ see_whats_happening: Ver lo que está pasando
+ server_stats: 'Datos del servidor:'
source_code: Código fuente
status_count_after:
one: estado
other: estados
status_count_before: Qué han escrito
+ tagline: Seguir a amigos existentes y descubre nuevos
terms: Condiciones de servicio
user_count_after:
one: usuario
@@ -39,7 +46,7 @@ es:
joined: Se unió el %{date}
last_active: última conexión
link_verified_on: La propiedad de este vínculo fue verificada el %{date}
- media: Media
+ media: Multimedia
moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
network_hidden: Esta información no está disponible
nothing_here: "¡No hay nada aquí!"
@@ -57,9 +64,11 @@ es:
admin: Administrador
bot: Bot
moderator: Moderador
+ unavailable: Perfil no disponible
unfollow: Dejar de seguir
admin:
account_actions:
+ action: Realizar acción
title: Moderar %{acct}
account_moderation_notes:
create: Crear
@@ -67,6 +76,8 @@ es:
delete: Borrar
destroyed_msg: "¡Nota de moderación destruida con éxito!"
accounts:
+ approve: Aprobar
+ approve_all: Aprobar todos
are_you_sure: "¿Estás seguro?"
avatar: Avatar
by_domain: Dominio
@@ -111,15 +122,18 @@ es:
moderation:
active: Activo
all: Todos
+ pending: Pendiente
silenced: Silenciados
suspended: Suspendidos
title: Moderación
moderation_notes: Notas de moderación
most_recent_activity: Actividad más reciente
most_recent_ip: IP más reciente
+ no_account_selected: Ninguna cuenta se cambió como ninguna fue seleccionada
no_limits_imposed: Sin límites impuestos
not_subscribed: No se está suscrito
outbox_url: URL de bandeja de salida
+ pending: Revisión pendiente
perform_full_suspension: Suspender
profile_url: URL del perfil
promote: Promocionar
@@ -127,7 +141,10 @@ es:
public: Público
push_subscription_expires: Expiración de la suscripción PuSH
redownload: Refrescar avatar
+ reject: Rechazar
+ reject_all: Rechazar todos
remove_avatar: Eliminar el avatar
+ remove_header: Eliminar cabecera
resend_confirmation:
already_confirmed: Este usuario ya está confirmado
send: Reenviar el correo electrónico de confirmación
@@ -152,18 +169,21 @@ es:
statuses: Estados
subscribe: Suscribir
suspended: Susependido
+ time_in_queue: Esperando en cola %{time}
title: Cuentas
unconfirmed_email: Correo electrónico sin confirmar
undo_silenced: Des-silenciar
undo_suspension: Des-suspender
unsubscribe: Desuscribir
username: Nombre de usuario
+ warn: Adevertir
web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} se ha asignado la denuncia %{target} a sí mismo"
change_email_user: "%{name} ha cambiado la dirección de correo del usuario %{target}"
confirm_user: "%{name} confirmó la dirección de correo del usuario %{target}"
+ create_account_warning: "%{name} envió una advertencia a %{target}"
create_custom_emoji: "%{name} subió un nuevo emoji %{target}"
create_domain_block: "%{name} bloqueó el dominio %{target}"
create_email_domain_block: "%{name} puso en lista negra el dominio de correos %{target}"
@@ -222,6 +242,7 @@ es:
config: Configuración
feature_deletions: Borrados de cuenta
feature_invites: Enlaces de invitación
+ feature_profile_directory: Directorio de perfil
feature_registrations: Registros
feature_relay: Relés de federación
features: Características
@@ -243,6 +264,7 @@ es:
created_msg: El bloque de dominio está siendo procesado
destroyed_msg: El bloque de dominio se deshizo
domain: Dominio
+ existing_domain_block_html: Ya ha impuesto límites más estrictos a %{name}, necesita desbloquearlo primero.
new:
create: Crear bloque
hint: El bloque de dominio no prevendrá la creación de entradas de cuenta en la base de datos, pero aplicará retroactiva y automáticamente métodos de moderación específica en dichas cuentas.
@@ -256,6 +278,10 @@ es:
reject_media_hint: Remueve localmente archivos multimedia almacenados para descargar cualquiera en el futuro. Irrelevante para suspensiones
reject_reports: Rechazar informes
reject_reports_hint: Ignore todos los reportes de este dominio. Irrelevante para suspensiones
+ rejecting_media: rechazar archivos multimedia
+ severity:
+ silence: silenciado
+ suspend: susependido
show:
affected_accounts:
one: Una cuenta en la base de datos afectada
@@ -276,8 +302,19 @@ es:
create: Añadir dominio
title: Nueva entrada en la lista negra de correo
title: Lista negra de correo
+ followers:
+ back_to_account: Volver a la cuenta
instances:
+ by_domain: Dominio
+ moderation:
+ all: Todos
+ limited: Limitado
+ title: Moderación
title: Instancias conocidas
+ total_blocked_by_us: Bloqueado por nosotros
+ total_followed_by_them: Seguidos por ellos
+ total_followed_by_us: Seguido por nosotros
+ total_storage: Archivos multimedia
invites:
deactivate_all: Desactivar todos
filter:
@@ -369,6 +406,10 @@ es:
min_invite_role:
disabled: Nadie
title: Permitir invitaciones de
+ registrations_mode:
+ modes:
+ none: Nadie puede registrarse
+ open: Cualquiera puede registrarse
show_known_fediverse_at_about_page:
desc_html: Cuando esté activado, se mostrarán toots de todo el fediverso conocido en la vista previa. En otro caso, se mostrarán solamente toots locales.
title: Mostrar fediverso conocido en la vista previa de la historia
@@ -413,17 +454,21 @@ es:
confirmed: Confirmado
expires_in: Expira en
last_delivery: Última entrega
- title: WebSub
topic: Tópico
title: Administración
+ warning_presets:
+ add_new: Añadir nuevo
+ delete: Borrar
+ edit: Editar
admin_mailer:
+ new_pending_account:
+ body: Los detalles de la nueva cuenta están abajos. Puedes aprobar o rechazar esta aplicación.
new_report:
body: "%{reporter} ha reportado a %{target}"
body_remote: Alguien de %{domain} a reportado a %{target}
subject: Nuevo reporte para la %{instance} (#%{id})
application_mailer:
notification_preferences: Cambiar preferencias de correo electrónico
- salutation: "%{name},"
settings: 'Cambiar preferencias de correo: %{link}'
view: 'Vista:'
view_profile: Ver perfil
@@ -438,6 +483,7 @@ es:
your_token: Tu token de acceso
auth:
change_password: Contraseña
+ checkbox_agreement_html: Acepto las reglas del servidor y términos de servicio
confirm_email: Confirmar email
delete_account: Borrar cuenta
delete_account_html: Si desea eliminar su cuenta, puede proceder aquí. Será pedido de una confirmación.
@@ -449,10 +495,8 @@ es:
migrate_account: Mudarse a otra cuenta
migrate_account_html: Si deseas redireccionar esta cuenta a otra distinta, puedes configurarlo aquí.
or_log_in_with: O inicia sesión con
- providers:
- cas: CAS
- saml: SAML
register: Registrarse
+ registration_closed: "%{instance} no está aceptando nuevos miembros"
resend_confirmation: Volver a enviar el correo de confirmación
reset_password: Restablecer contraseña
security: Cambiar contraseña
@@ -470,18 +514,10 @@ es:
title: Seguir a %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
about_x_months: "%{count}m"
- about_x_years: "%{count}y"
- almost_x_years: "%{count}y"
half_a_minute: Justo ahora
- less_than_x_minutes: "%{count}m"
less_than_x_seconds: Justo ahora
- over_x_years: "%{count}y"
- x_days: "%{count}d"
- x_minutes: "%{count}m"
x_months: "%{count}m"
- x_seconds: "%{count}s"
deletes:
bad_password_msg: "¡Buen intento, hackers! Contraseña incorrecta"
confirm_password: Ingresa tu contraseña actual para demostrar tu identidad
@@ -490,6 +526,12 @@ es:
success_msg: Tu cuenta se eliminó con éxito
warning_html: Se garantiza únicamente la eliminación del contenido de esta instancia. El contenido que se haya compartido extensamente dejará sus huellas. Los servidores fuera de línea y los que se hayan desuscrito de tus actualizaciones ya no actualizarán sus bases de datos.
warning_title: Disponibilidad diseminada del contenido
+ directories:
+ explore_mastodon: Explorar %{title}
+ how_to_enable: Usted no está registrado por el directorio. Puede registrar por abajo. ¡Utilice hashtags en su bio para aparecer bajo hashtags específicos!
+ people:
+ one: "%{count} persona"
+ other: "%{count} personas"
errors:
'403': No tienes permiso para acceder a esta página.
'404': La página que estabas buscando no existe.
@@ -502,6 +544,9 @@ es:
content: Lo sentimos, algo ha funcionado mal por nuestra parte.
title: Esta página no es correcta
noscript_html: Para usar la aplicación web de Mastodon, por favor activa Javascript. Alternativamente, prueba alguna de las aplicaciones nativas para Mastodon para tu plataforma.
+ existing_username_validator:
+ not_found: no pudo encontrar un usuario local con ese nombre de usuario
+ not_found_multiple: no pudo encontrar %{usernames}
exports:
archive_takeout:
date: Fecha
@@ -513,8 +558,13 @@ es:
blocks: Personas que has bloqueado
csv: CSV
follows: Personas que sigues
+ lists: Listas
mutes: Tienes en silencio
storage: Almacenamiento
+ featured_tags:
+ add_new: Añadir nuevo
+ errors:
+ limit: Ya has alcanzado la cantidad máxima de hashtags
filters:
contexts:
home: Timeline propio
@@ -536,13 +586,31 @@ es:
more: Mas…
resources: Recursos
generic:
+ all: Todos
changes_saved_msg: "¡Cambios guardados con éxito!"
copy: Copiar
+ order_by: Ordenar por
save_changes: Guardar cambios
validation_errors:
one: "¡Algo no está bien! Por favor, revisa el error"
other: "¡Algo no está bien! Por favor, revise %{count} errores más abajo"
+ identity_proofs:
+ active: Activo
+ authorize: Sí, autorizar
+ authorize_connection_prompt: "¿Autorizar esta conexión criptográfica?"
+ errors:
+ failed: La conexión criptográfica falló. Por favor, inténtalo de nuevo desde %{provider}.
+ keybase:
+ invalid_token: Los tokens de Keybase son hashes de firmas y deben tener 66 caracteres hex
+ verification_failed: Keybase no reconoce este token como una firma del usuario de Keybase %{kb_username}. Por favor, inténtelo de nuevo desde Keybase.
+ identity: Identidad
+ inactive: Inactivo
+ status: Estado de la verificación
+ view_proof: Ver prueba
imports:
+ modes:
+ merge: Unir
+ overwrite: Sobrescribir
preface: Puedes importar ciertos datos, como todas las personas que estás siguiendo o bloqueando en tu cuenta en esta instancia, desde archivos exportados de otra instancia.
success: Sus datos se han cargado correctamente y serán procesados en brevedad
types:
@@ -621,28 +689,16 @@ es:
body: "%{name} ha retooteado tu estado:"
subject: "%{name} ha retooteado tu estado"
title: Nueva difusión
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: " "
pagination:
newer: Más nuevo
next: Próximo
older: Más antiguo
prev: Anterior
- truncate: "…"
preferences:
- languages: Idiomas
other: Otros
- publishing: Publicación
- web: Web
+ relationships:
+ last_active: Última actividad
+ most_recent: Más reciente
remote_follow:
acct: Ingesa tu usuario@dominio desde el que quieres seguir
missing_resource: No se pudo encontrar la URL de redirección requerida para tu cuenta
@@ -666,11 +722,11 @@ es:
generic: Desconocido
ie: Internet Explorer
micro_messenger: MicroMessenger
- nokia: Nokia S40 Ovi Browser
+ nokia: Navegador de Nokia S40 Ovi
opera: Opera
otter: Otter
phantom_js: PhantomJS
- qq: QQ Browser
+ qq: Navegador QQ
safari: Safari
uc_browser: UCBrowser
weibo: Weibo
@@ -695,12 +751,16 @@ es:
revoke_success: Sesión revocada exitosamente
title: Sesiones
settings:
+ account: Cuenta
+ account_settings: Ajustes de la cuenta
+ appearance: Apariencia
authorized_apps: Aplicaciones autorizadas
back: Volver al inicio
delete: Borrar cuenta
development: Desarrollo
edit_profile: Editar perfil
export: Exportar información
+ featured_tags: Hashtags destacados
import: Importar
migrate: Migración de cuenta
notifications: Notificaciones
@@ -730,7 +790,6 @@ es:
reblog: Un boost no puede fijarse
show_more: Mostrar más
sign_in_to_participate: Regístrate para participar en la conversación
- title: '%{name}: "%{quote}"'
visibilities:
private: Sólo mostrar a seguidores
private_long: Solo mostrar a tus seguidores
@@ -751,7 +810,6 @@ es:
time:
formats:
default: "%d de %b del %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: Ingresa el código generado por tu aplicación de autenticación para confirmar
description_html: Si habilitas la autenticación de dos factores, se requerirá estar en posesión de su teléfono, lo que generará tokens para que usted pueda iniciar sesión.
@@ -788,7 +846,6 @@ es:
tip_following: Sigues a tus administradores de servidor por defecto. Para encontrar más gente interesante, revisa las lineas de tiempo local y federada.
tip_local_timeline: La linea de tiempo local is una vista de la gente en %{instance}. Estos son tus vecinos inmediatos!
tip_mobile_webapp: Si el navegador de tu dispositivo móvil ofrece agregar Mastodon a tu página de inicio, puedes recibir notificaciones. Actúa como una aplicación nativa en muchas formas!
- tips: Tips
title: Te damos la bienvenida a bordo, %{name}!
users:
follow_limit_reached: No puedes seguir a más de %{limit} personas
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 5ae664cad..9b9c2c027 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -4,25 +4,36 @@ eu:
about_hashtag_html: Hauek #%{hashtag} traola duten toot publikoak dira. Fedibertsoko edozein kontu baduzu harremanetan jarri zaitezke.
about_mastodon_html: Mastodon web protokolo ireki eta libreak darabiltzan gizarte sare bat da. E-mail sarea bezala deszentralizatua da.
about_this: Honi buruz
+ active_count_after: aktiboa
+ active_footnote: Hilabeteko erabiltzaile aktiboak (HEA)
administered_by: 'Administratzailea(k):'
api: APIa
apps: Aplikazio mugikorrak
+ apps_platforms: Erabili Mastodon, iOS, Android eta beste plataformetatik
+ browse_directory: Arakatu profilen direktorio bat eta iragazi interesen arabera
+ browse_public_posts: Arakatu Mastodoneko mezu publikoen zuzeneko jario bat
contact: Kontaktua
contact_missing: Ezarri gabe
contact_unavailable: E/E
+ discover_users: Aurkitu erabiltzaileak
documentation: Dokumentazioa
extended_description_html: |
Arauentzako toki egoki bat
Azalpen luzea ez da ezarri oraindik.
+ federation_hint_html: "%{instance} instantzian kontu bat izanda edozein Mastodon zerbitzariko jendea jarraitu ahal izango duzu, eta harago ere."
generic_description: "%{domain} sareko zerbitzari bat da"
+ get_apps: Probatu mugikorrerako aplikazio bat
hosted_on: Mastodon %{domain} domeinuan ostatatua
learn_more: Ikasi gehiago
privacy_policy: Pribatutasun politika
+ see_whats_happening: Ikusi zer gertatzen ari den
+ server_stats: 'Zerbitzariaren estatistikak:'
source_code: Iturburu kodea
status_count_after:
one: mezu
other: mezu
status_count_before: Hauek
+ tagline: Jarraitu lagunak eta egin berriak
terms: Erabilera baldintzak
user_count_after:
one: erabiltzaile
@@ -50,13 +61,14 @@ eu:
posts:
one: Toot
other: Toot
- posts_tab_heading: Tootak
+ posts_tab_heading: Toot
posts_with_replies: Toot eta erantzunak
reserved_username: Erabiltzaile-izena erreserbatuta dago
roles:
admin: Administratzailea
bot: Bot-a
moderator: Moderatzailea
+ unavailable: Profila ez dago eskuragarri
unfollow: Utzi jarraitzeari
admin:
account_actions:
@@ -68,6 +80,8 @@ eu:
delete: Ezabatu
destroyed_msg: Moderazio ohara ongi suntsitu da!
accounts:
+ approve: Onartu
+ approve_all: Onartu denak
are_you_sure: Ziur zaude?
avatar: Abatarra
by_domain: Domeinua
@@ -100,7 +114,7 @@ eu:
header: Goiburua
inbox_url: Sarrera ontziaren URL-a
invited_by: 'Honek gonbidatua:'
- ip: IP
+ ip: IP-a
joined: Elkartuta
location:
all: Denak
@@ -113,15 +127,18 @@ eu:
moderation:
active: Aktiboa
all: Denak
+ pending: Zain
silenced: Isilarazita
suspended: Kanporatua
title: Moderazioa
moderation_notes: Moderazio oharrak
most_recent_activity: Azken jarduera
most_recent_ip: Azken IP-a
+ no_account_selected: Ez da konturik aldatu ez delako bata bera hautatu
no_limits_imposed: Ez da mugarik ezarri
not_subscribed: Harpidetu gabe
outbox_url: Irteera ontziaren URL-a
+ pending: Berrikusketa egiteke
perform_full_suspension: Kanporatu
profile_url: Profilaren URL-a
promote: Sustatu
@@ -129,6 +146,8 @@ eu:
public: Publikoa
push_subscription_expires: Push harpidetzaren iraugitzea
redownload: Freskatu profila
+ reject: Ukatu
+ reject_all: Ukatu denak
remove_avatar: Kendu abatarra
remove_header: Kendu goiburua
resend_confirmation:
@@ -155,6 +174,7 @@ eu:
statuses: Mezuak
subscribe: Harpidetu
suspended: Kanporatuta
+ time_in_queue: Kolan zain %{time}
title: Kontuak
unconfirmed_email: Baieztatu gabeko e-mail helbidea
undo_silenced: Utzi isilarazteari
@@ -162,7 +182,7 @@ eu:
unsubscribe: Kendu harpidetza
username: Erabiltzaile-izena
warn: Abisatu
- web: Web
+ web: Weba
action_logs:
actions:
assigned_to_self_report: "%{name}(e)k %{target} salaketa bere buruari esleitu dio"
@@ -207,7 +227,7 @@ eu:
destroyed_msg: Emoji-a ongi suntsitu da!
disable: Desgaitu
disabled_msg: Emoji-a ongi desgaitu da
- emoji: Emoji
+ emoji: Emojia
enable: Gaitu
enabled_msg: Emoji hori ongi gaitu da
image_hint: PNG gehienez 50KB
@@ -230,13 +250,14 @@ eu:
feature_profile_directory: Profil-direktorioa
feature_registrations: Izen emateak
feature_relay: Federazio haria
+ feature_timeline_preview: Denbora-lerroaren aurrebista
features: Ezaugarriak
hidden_service: Federazioa ezkutuko zerbitzuekin
open_reports: salaketa irekiak
recent_users: Azken erabiltzaileak
search: Testu osoko bilaketa
single_user_mode: Erabiltzaile bakarreko modua
- software: Software
+ software: Softwarea
space: Espazio erabilera
title: Kontrol panela
total_users: erabiltzaile guztira
@@ -249,6 +270,7 @@ eu:
created_msg: Domeinuaren blokeoa orain prozesatzen ari da
destroyed_msg: Domeinuaren blokeoa desegin da
domain: Domeinua
+ existing_domain_block_html: '%{name} domeinuan muga zorrotzagoak ezarri dituzu jada, aurretik desblokeatu beharko duzu.'
new:
create: Sortu blokeoa
hint: Domeinuaren blokeoak ez du eragotziko kontuen sarrerak sortzea datu-basean, baina automatikoki ezarriko zaizkie moderazio metodo bereziak iraganeko mezuetan ere.
@@ -291,6 +313,7 @@ eu:
back_to_account: Itzuli kontura
title: "%{acct} kontuaren jarraitzaileak"
instances:
+ by_domain: Domeinua
delivery_available: Bidalketa eskuragarri dago
known_accounts:
one: Kontu ezagun %{count}
@@ -313,6 +336,8 @@ eu:
expired: Iraungitua
title: Iragazi
title: Gonbidapenak
+ pending_accounts:
+ title: Zain dauden kontuak (%{count})
relays:
add_new: Gehitu hari berria
delete: Ezabatu
@@ -399,6 +424,12 @@ eu:
min_invite_role:
disabled: Inor ez
title: Baimendu hauen gobidapenak
+ registrations_mode:
+ modes:
+ approved: Izena emateko onarpena behar da
+ none: Ezin du inork izena eman
+ open: Edonork eman dezake izena
+ title: Erregistratzeko modua
show_known_fediverse_at_about_page:
desc_html: Txandakatzean, fedibertsu ezagun osoko toot-ak bistaratuko ditu aurrebistan. Bestela, toot lokalak besterik ez ditu erakutsiko.
title: Erakutsi fedibertsu ezagun osoko denbora-lerroa aurrebistan
@@ -461,10 +492,19 @@ eu:
edit_preset: Editatu abisu aurre-ezarpena
title: Kudeatu abisu aurre-ezarpenak
admin_mailer:
+ new_pending_account:
+ body: Kontu berriaren xehetasunak azpian daude. Eskaera hau onartu edo ukatu dezakezu.
+ subject: Kontu berria berrikusteko %{instance} instantzian (%{username})
new_report:
body: "%{reporter}(e)k %{target} salatu du"
body_remote: "%{domain} domeinuko norbaitek %{target} salatu du"
subject: Salaketa berria %{instance} instantzian (#%{id})
+ appearance:
+ advanced_web_interface: Web interfaze aurreratua
+ advanced_web_interface_hint: 'Pantaila bere zabalera osoan erabili nahi baduzu, web interfaze aurreratuak hainbat zutabe desberdin konfiguratzea ahalbidetzen dizu, aldi berean nahi beste informazio ikusteko: Hasiera, jakinarazpenak, federatutako denbora-lerroa, edo nahi beste zerrenda eta traola.'
+ animations_and_accessibility: Animazioak eta irisgarritasuna
+ confirmation_dialogs: Berrespen dialogoak
+ sensitive_content: Eduki hunkigarria
application_mailer:
notification_preferences: Aldatu e-mail hobespenak
salutation: "%{name},"
@@ -481,7 +521,9 @@ eu:
warning: Kontuz datu hauekin, ez partekatu inoiz inorekin!
your_token: Zure sarbide token-a
auth:
+ apply_for_account: Eskatu gonbidapen bat
change_password: Pasahitza
+ checkbox_agreement_html: Zerbitzariaren arauak eta erabilera baldintzak onartzen ditut
confirm_email: Berretsi e-mail helbidea
delete_account: Ezabatu kontua
delete_account_html: Kontua ezabatu nahi baduzu, jarraitu hemen. Berrestea eskatuko zaizu.
@@ -497,10 +539,12 @@ eu:
cas: CAS
saml: SAML
register: Eman izena
+ registration_closed: "%{instance} instantziak ez ditu kide berriak onartzen"
resend_confirmation: Birbidali berresteko argibideak
reset_password: Berrezarri pasahitza
security: Segurtasuna
set_new_password: Ezarri pasahitza berria
+ trouble_logging_in: Arazoak saioa hasteko?
authorize_follow:
already_following: Kontu hau aurretik jarraitzen duzu
error: Zoritxarrez, urruneko kontua bilatzean errore bat gertatu da
@@ -514,7 +558,7 @@ eu:
title: Jarraitu %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
+ about_x_hours: "%{count}o"
about_x_months: "%{count} hilabete"
about_x_years: "%{count} urte"
almost_x_years: "%{count} urte"
@@ -556,6 +600,9 @@ eu:
content: Sentitzen dugu, zerbait okerra gertatu da gure aldean.
title: Orri hau ez da zuzena
noscript_html: Mastodon web aplikazioa erabiltzeko, gaitu JavaScript. Bestela, probatu Mastodon plataformarako aplikazio natiboren bat.
+ existing_username_validator:
+ not_found: ezin izan da izen hori duen kide lokalik aurkitu
+ not_found_multiple: ezin izan dira aurkitu %{usernames}
exports:
archive_takeout:
date: Data
@@ -596,12 +643,34 @@ eu:
more: Gehiago…
resources: Baliabideak
generic:
+ all: Denak
changes_saved_msg: Aldaketak ongi gorde dira!
copy: Kopiatu
+ order_by: Ordenatze-irizpidea
save_changes: Gorde aldaketak
validation_errors:
one: Zerbait ez dabil ongi! Egiaztatu beheko errorea mesedez
other: Zerbait ez dabil ongi! Egiaztatu beheko %{count} erroreak mesedez
+ html_validator:
+ invalid_markup: 'HTML markaketa baliogabea du: %{error}'
+ identity_proofs:
+ active: Aktiboa
+ authorize: Bai, baimendu
+ authorize_connection_prompt: Baimendu zifratutako konexio hau?
+ errors:
+ failed: Zifratutako konexioak huts egin du. Saiatu berriro %{provider} hornitzailetik.
+ keybase:
+ invalid_token: Keybase-ko token-ak sinaduren hash-ak dira eta 66 hex karakterekoak izan beha dira
+ verification_failed: Keybase-k ez du token hau Keybase-ko %{kb_username} erabiltzailearen sinaduratzat onartzen. Saiatu berriro Keybase-tik.
+ wrong_user: Ezin izan da %{proving} erabiltzailearentzat froga sortu %{current} gisa saioa hasita. Hasi saioa %{proving} erabilita eta saiatu berriro.
+ explanation_html: Hemen modu zifratuan konektatu ditzakezu zure beste identitateak, esaterako Keybase profila. Honek beste jendeak zuri zifratutako mezuak bidaltzea ahalbidetzen du, eta zuk beraiei bidalitako edukia fidagarritzat jotzea.
+ i_am_html: "%{username} erabiltzailea naiz %{service} zerbitzuan."
+ identity: Identitatea
+ inactive: Ez aktiboa
+ publicize_checkbox: 'Eta bidali toot hau:'
+ publicize_toot: 'Frogatua dago! %{username} erabiltzailea naiz %{service} zerbitzuan: %{url}'
+ status: Egiaztatze egoera
+ view_proof: Ikusi froga
imports:
modes:
merge: Bateratu
@@ -697,18 +766,39 @@ eu:
quadrillion: Q
thousand: K
trillion: T
- unit: "."
pagination:
newer: Berriagoa
next: Hurrengoa
older: Zaharragoa
prev: Aurrekoa
truncate: "…"
+ polls:
+ errors:
+ already_voted: Inkesta honetan dagoeneko bozkatu duzu
+ duplicate_options: bikoiztutako elementuak ditu
+ duration_too_long: etorkizunean urrunegi dago
+ duration_too_short: goizegi da
+ expired: Inkesta amaitu da jada
+ over_character_limit: bakoitzak gehienez %{max} karaktere izan ditzake
+ too_few_options: elementu bat baino gehiago izan behar du
+ too_many_options: ezin ditu %{max} elementu baino gehiago izan
preferences:
- languages: Hizkuntzak
other: Beste bat
- publishing: Argitaratzea
- web: Web
+ posting_defaults: Bidalketarako lehenetsitakoak
+ public_timelines: Denbora-lerro publikoak
+ relationships:
+ activity: Kontuaren aktibitatea
+ dormant: Ez aktiboa
+ last_active: Azkenekoz aktiboa
+ most_recent: Azkenak
+ moved: Lekuz aldatua
+ mutual: Alde bikoa
+ primary: Primarioa
+ relationship: Erlazioa
+ remove_selected_domains: Kendu hautatutako domeinuetako jarraitzaile guztiak
+ remove_selected_followers: Kendu hautatutako jarraitzaileak
+ remove_selected_follows: Utzi hautatutako erabiltzaileak jarraitzeari
+ status: Kontuaren egoera
remote_follow:
acct: Sartu jarraitzeko erabili nahi duzun erabiltzaile@domeinua
missing_resource: Ezin izan da zure konturako behar den birbideratze URL-a
@@ -758,7 +848,7 @@ eu:
current_session: Uneko saioa
description: "%{browser} - %{platform}"
explanation: Zure Mastodon kontuan saioa hasita duten nabigatzaileak daude.
- ip: IP
+ ip: IP-a
platforms:
adobe_air: Adobe Air
android: Android
@@ -776,6 +866,9 @@ eu:
revoke_success: Saioa ongi indargabetu da
title: Saioak
settings:
+ account: Kontua
+ account_settings: Kontuaren ezarpenak
+ appearance: Itxura
authorized_apps: Baimendutako aplikazioak
back: Itzuli Mastodon-era
delete: Kontuaren ezabaketa
@@ -783,10 +876,14 @@ eu:
edit_profile: Aldatu profila
export: Datuen esportazioa
featured_tags: Nabarmendutako traolak
+ identity_proofs: Identitate frogak
import: Inportazioa
+ import_and_export: Inportatu eta esportatu
migrate: Kontuaren migrazioa
notifications: Jakinarazpenak
preferences: Hobespenak
+ profile: Profila
+ relationships: Jarraitutakoak eta jarraitzaileak
two_factor_authentication: Bi faktoreetako autentifikazioa
statuses:
attached:
@@ -810,6 +907,11 @@ eu:
ownership: Ezin duzu beste norbaiten toot bat finkatu
private: Ezin dira publikoak ez diren toot-ak finkatu
reblog: Bultzada bat ezin da finkatu
+ poll:
+ total_votes:
+ one: Boto %{count}
+ other: "%{count} boto"
+ vote: Bozkatu
show_more: Erakutsi gehiago
sign_in_to_participate: Eman izena elkarrizketan parte hartzeko
title: '%{name}: "%{quote}"'
@@ -830,10 +932,10 @@ eu:
Zer informazio biltzen dugu?
-
Kontuaren oinarrizko informazioa: Zerbitzari honetan izena ematen baduzu, erabiltzaile-izena, e-mail helbidea eta pasahitza sartzea galdetu dakizuke. Profilean bestelako informazioa sartu dezakezu esaterako pantaila.-izena eta biografia, eta profileko eta goiburuko irudiak igo ditzakezu. Erabiltzaile-izena, pantaiula-izena, biografia, profileko irudia eta goiburuko irudia beti dira publikoak.
-
Mezuak, jarraitzea eta beste informazioa: Jarraitzen duzun jendearen zerrenda publikoa da, baita zure jarraitzaileena. Mezu bat bidaltzean, data eta ordua eta mezua bidaltzeko erabilitako aplikazioa gordetzen dira. Mezuen eranskinak izan ditzakete, esaterako irudiak eta bideoak. Mezu publikoak eta zerrendatu gabeak publikoki ikusi daitezke. Zure profilean mezu bat sustatzen duzunean, informazio hori ere publikoki eskuragarri dago. Zure mezuak zure jarraitzaileei bidaltzen zaie, kasu batzuetan honek esan nahi du beste zerbitzari batzuetara bidaltzen dela eta han kopiak gordetzen dituzte. Mezuak ezabatzen dituzunean, hau zure jarraitzaileei bidaltzen zaie ere, beste mezu batzuk zabaltzea edo gogoko izatea beti da informazio publikoa.
-
Mezu zuzenak eta soilik jarraitzaileentzako mezuak: Mezu guztiak zerbitzarian gorde eta prozesatzen dira. Soilik jarraitzaileentzako diren mezuak zure jarraitzaileei bidaltzen zaie eta bertan aipatutako erabiltzaileei, mezu zuzenak soilik aipatutako erabiltzaileei bidaltzen zaie. Honek esan nahi du kasu batzuetan beste zerbitzari batzuetara bidaltzen dela mezua eta han kopiak gordetzen direla. Borondate oneko ahalegin bat egiten dugu mezuok soilik baimena duten pertsonek ikus ditzaten, baina beste zerbitzariek agian ez. Hortaz, zure jarraitzaileen zerbitzaria zein den egiaztatzea garrantzitsua da. Jarraitzaileak eskuz onartu eta ukatzeko aukera aldatu dezakezu. Kontuan izan zerbitzariaren operadoreak eta mezua jasotzen duen edozein zerbitzarik operadoreek mezuok ikus ditzaketela eta edonork atera dezakeela pantaila argazki bat, kopiatu edo beste modu batean partekatu.Ez partekatu informazio arriskutsua Mastodon bidez.
-
IP-ak eta bestelako meta-datuak: Saioa hasten duzunean, zure IP helbidea gordetzen dugu, eta erabiltzen duzun nabigatzaile edo aplikazioa. Hasitako saio guztiak zuk ikusteko mopduan daude eta ezarpenetan indargabetu ditzakezu. Erabilitako azken IP helbidea 12 hilabetez gordetzen da. Gure zerbitzariak jasotako eskari guztiak eta IP-a duten zerbitzariko egunkariak gorde genitzake.
+
Kontuaren oinarrizko informazioa: Zerbitzari honetan izena ematen baduzu, erabiltzaile-izena, e-mail helbidea eta pasahitza sartzea galdetu dakizuke. Profilean bestelako informazioa sartu dezakezu esaterako pantaila.-izena eta biografia, eta profileko eta goiburuko irudiak igo ditzakezu. Erabiltzaile-izena, pantaila-izena, biografia, profileko irudia eta goiburuko irudia beti dira publikoak.
+
Mezuak, jarraitzea eta beste informazioa: Jarraitzen duzun jendearen zerrenda publikoa da, baita zure jarraitzaileena. Mezu bat bidaltzean, data eta ordua eta mezua bidaltzeko erabilitako aplikazioa gordetzen dira. Mezuen eranskinak izan ditzakete, esaterako irudiak eta bideoak. Mezu publikoak eta zerrendatu gabeak publikoki ikusi daitezke. Zure profilean mezu bat sustatzen duzunean, informazio hori ere publikoki eskuragarri dago. Zure mezuak zure jarraitzaileei bidaltzen zaie, kasu batzuetan honek esan nahi du beste zerbitzari batzuetara bidaltzen dela eta han kopiak gordetzen dituzte. Mezuak ezabatzen dituzunean, hau zure jarraitzaileei bidaltzen zaie ere, beste mezu batzuk zabaltzea edo gogoko izatea beti da informazio publikoa.
+
Mezu zuzenak eta soilik jarraitzaileentzako mezuak: Mezu guztiak zerbitzarian gorde eta prozesatzen dira. Soilik jarraitzaileentzako diren mezuak zure jarraitzaileei bidaltzen zaie eta bertan aipatutako erabiltzaileei, mezu zuzenak soilik aipatutako erabiltzaileei bidaltzen zaie. Honek esan nahi du kasu batzuetan beste zerbitzari batzuetara bidaltzen dela mezua eta han kopiak gordetzen direla. Borondate oneko ahalegin bat egiten dugu mezuok soilik baimena duten pertsonek ikus ditzaten, baina beste zerbitzariek agian ez. Hortaz, zure jarraitzaileen zerbitzaria zein den egiaztatzea garrantzitsua da. Jarraitzaileak eskuz onartu eta ukatzeko aukera aldatu dezakezu. Kontuan izan zerbitzariaren operadoreak eta mezua jasotzen duen edozein zerbitzarik operadoreek mezuok ikus ditzaketela eta edonork atera dezakeela pantaila argazki bat, kopiatu edo beste modu batean partekatu.Ez partekatu informazio arriskutsua Mastodon bidez.
+
IP-ak eta bestelako meta-datuak: Saioa hasten duzunean, zure IP helbidea gordetzen dugu, eta erabiltzen duzun nabigatzaile edo aplikazioa. Hasitako saio guztiak zuk ikusteko moduan daude eta ezarpenetan indargabetu ditzakezu. Erabilitako azken IP helbidea 12 hilabetez gordetzen da. Gure zerbitzariak jasotako eskari guztiak eta IP-a duten zerbitzariko egunkariak gorde genitzake.
@@ -843,9 +945,9 @@ eu:
Biltzen dugun informazio guztia honela erabiltzen da:
-
Mastodon zerbitzuko funtzio nagusietarako. Beste pertsonen edukiarekin harremanetan sartzeko edo zure edukia argitaratzeko saioa hasi behar duzu. Adibidez, beste pertsona batzuk jarraitu ditzakezu zure denbora-lerro pertsonalizatu bat izateko.
-
Komunitatearen moderazioari laguntzeko, esaterako zure IP-a ezagutzen ditugun beste batzuekin alderatu dezakegu, debekuak ekiditea edo bestelako arau-urraketak eragozteko.
-
Emandako e-mail helbidea informazioa bidaltzeko erabili genezake, beste pertsonek zure edukiekin harremanetan jartzean jakinarazteko, edo mezu bat bidaltzen dizutenean, galderak erantzutean eta bestelako eskari eta galderetarako.
+
Mastodon zerbitzuko funtzio nagusietarako. Beste pertsonen edukiarekin harremanetan sartzeko edo zure edukia argitaratzeko saioa hasi behar duzu. Adibidez, beste pertsona batzuk jarraitu ditzakezu zure denbora-lerro pertsonalizatu bat izateko.
+
Komunitatearen moderazioari laguntzeko, esaterako zure IP-a ezagutzen ditugun beste batzuekin alderatu dezakegu, debekuak ekiditea edo bestelako arau-urraketak eragozteko.
+
Emandako e-mail helbidea informazioa bidaltzeko erabili genezake, beste pertsonek zure edukiekin harremanetan jartzean jakinarazteko, edo mezu bat bidaltzen dizutenean, galderak erantzutean eta bestelako eskari eta galderetarako.
@@ -861,8 +963,8 @@ eu:
Borondate oneko ahalegina egingo dugu honetarako:
-
Zerbitzari honetara egindako eskari guztien egunkaria IP helbidearekin, 90 egunez gehienez.
-
Izena eman duten erabiltzaileen eskariekin lotutako IP helbideak, 12 hilabetez gehienez..
+
Zerbitzari honetara egindako eskari guztien egunkaria IP helbidearekin, 90 egunez gehienez.
+
Izena eman duten erabiltzaileen eskariekin lotutako IP helbideak, 12 hilabetez gehienez..
Zure edukiaren kopia duen artxibo bat eskatu eta deskargatu dezakezu, bertan mezuak multimedia eranskinak, profileko irudia eta goiburuko irudia daude.
@@ -881,7 +983,7 @@ eu:
Informazioa kanpoko inorekin partekatzen dugu?
-
Ez dugu identifikatu zaitzakeen informazio pertsonala, saltzen, trukatzen edo kanpora bidaltzen. Salbuespena konfidatzako hiirugarrengoak dira, gunea martxan izaten laguntzen digutenak, negozioa aurrera eramateko aholkua ematen digutenak edo zuri zerbitzua ematen laguntzen digutenak, hauek informazioaren konfidentzialtasuna errespetatzea onartzen dutenean., Agian legearekin betetzeko beharrezkoa den informazioa ere eman genezake, gunearen politika indarrean jartzeko behar dena, edo gure eskubideak, jabetzak, edo segurtasuna babesteko beharrezkoa dena.
+
Ez dugu identifikatu zaitzakeen informazio pertsonala saltzen, trukatzen edo kanpora bidaltzen. Salbuespena konfiantzako hirugarrengoak dira, gunea martxan izaten laguntzen digutenak, negozioa aurrera eramateko aholkua ematen digutenak edo zuri zerbitzua ematen laguntzen digutenak, hauek informazioaren konfidentzialtasuna errespetatzea onartzen dutenean. Agian legearekin betetzeko beharrezkoa den informazioa ere eman genezake, gunearen politika indarrean jartzeko behar dena, edo gure eskubideak, jabetzak, edo segurtasuna babesteko beharrezkoa dena.
Zure eduki publikoak sareko beste zerbitzariek deskargatu dezakete. Zure mezu publikoak eta soilik jarraitzaileentzat diren mezuak zure jarraitzaileen zerbitzarietara bidaltzen dira, jarraitzaile edo hartzaile horiek beste zerbitzari batean badute kontua.
@@ -893,7 +995,7 @@ eu:
Zerbitzari hau Europar Batasunean edo Europako Ekonomia-Eremuan badago: Gure gunea, produktua eta zerbitzuak 16 urte edo gehiago dituztenei zuzenduta daude. 16 urte baino gazteagoa bazara, GDPR legearen arabera ezin duzu gune hau erabili (General Data Protection Regulation)
-
Zerbitzari hau Amerikako Estatu Batuetan badago: Gure gunea, produktua eta zerbitzuak 13 urte edo gehiago dituztenei zuzenduta daude. 13 urte baino gazteagoa bazara, COPPA legearen arabera ezin duzu gune hau erabili (Children's Online Privacy Protection Act).
+
Zerbitzari hau Amerikako Estatu Batuetan badago: Gure gunea, produktua eta zerbitzuak 13 urte edo gehiago dituztenei zuzenduta daude. 13 urte baino gazteagoa bazara, COPPA legearen arabera ezin duzu gune hau erabili (Children's Online Privacy Protection Act).
Zerbitzari hau beste eremu legal batean badago, legearen eskariak desberdinak izan daitezke.
@@ -901,7 +1003,7 @@ eu:
Aldaketak gure pribatutasun politikan
-
Guire pribatutasun politika aldatzea erabakitzen badugu, aldaketak orri honetan argitaratuko ditugu.
+
Gure pribatutasun politika aldatzea erabakitzen badugu, aldaketak orri honetan argitaratuko ditugu.
Dokumentu honek CC-BY-SA lizentzia du. Eta azkenekoz 2019ko martxoak 7an eguneratu zen
@@ -914,7 +1016,7 @@ eu:
time:
formats:
default: "%Y(e)ko %b %d, %H:%M"
- month: "%b %Y"
+ month: "%Y(e)ko %b"
two_factor_authentication:
code_hint: Sartu zure autentifikazio aplikazioak sortutako kodea berresteko
description_html: "Bi faktoreetako autentifikazioa gaitzen baduzu, saioa hasteko telefonoa eskura izan beharko duzu, honek zuk sartu behar dituzun kodeak sortuko dituelako."
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 3a3455c6d..d37dbdeb4 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -68,6 +68,7 @@ fa:
admin: مدیر
bot: ربات
moderator: ناظم
+ unavailable: نمایهٔ ناموجود
unfollow: پایان پیگیری
admin:
account_actions:
@@ -80,6 +81,7 @@ fa:
destroyed_msg: یادداشت مدیر با موفقیت پاک شد!
accounts:
approve: پذیرفتن
+ approve_all: پذیرفتن همه
are_you_sure: آیا مطمئن هستید؟
avatar: تصویر نمایه
by_domain: دامین
@@ -132,6 +134,7 @@ fa:
moderation_notes: یادداشت مدیر
most_recent_activity: آخرین فعالیتها
most_recent_ip: آخرین IP ها
+ no_account_selected: هیچ حسابی تغییر نکرد زیرا حسابی انتخاب نشده بود
no_limits_imposed: بدون محدودیت
not_subscribed: عضو نیست
outbox_url: نشانی صندوق خروجی
@@ -144,6 +147,7 @@ fa:
push_subscription_expires: عضویت از راه PuSH منقضی شد
redownload: بهروزرسانی نمایه
reject: نپذیرفتن
+ reject_all: نپذیرفتن هیچکدام
remove_avatar: حذف تصویر نمایه
remove_header: برداشتن تصویر زمینه
resend_confirmation:
@@ -170,6 +174,7 @@ fa:
statuses: نوشتهها
subscribe: اشتراک
suspended: تعلیقشده
+ time_in_queue: در حال انتظار %{time}
title: حسابها
unconfirmed_email: ایمیل تأییدنشده
undo_silenced: واگردانی بیصداکردن
@@ -245,6 +250,7 @@ fa:
feature_profile_directory: فهرست گزیدهٔ کاربران
feature_registrations: ثبتنامها
feature_relay: رله
+ feature_timeline_preview: پیشنمایش نوشتهها
features: ویژگیها
hidden_service: ارتباط میانسروری با سرویسهای نهفته
open_reports: گزارشهای فعال
@@ -264,6 +270,7 @@ fa:
created_msg: مسدودکردن دامین در حال انجام است
destroyed_msg: مسدودکردن دامین واگردانده شد
domain: دامین
+ existing_domain_block_html: شما پیشتر محدودیتهای سختتری روی %{name} اعمال کردهاید، و باید نخست مسدودسازی را لغو کنید.
new:
create: مسدودسازی
hint: مسدودسازی دامین جلوی فهرستشدن حسابها در پایگاه داده را نمیگیرد، بلکه به طور خودکار روشهای مدیریتی را روی فعالیتهای فعلی و گذشتهٔ آن حسابها اعمال میکند.
@@ -295,7 +302,7 @@ fa:
email_domain_blocks:
add_new: افزودن تازه
created_msg: مسدودسازی دامین ایمیل با موفقیت ساخته شد
- delete: Delete
+ delete: پاککردن
destroyed_msg: مسدودسازی دامین ایمیل با موفقیت پاک شد
domain: دامین
new:
@@ -329,6 +336,8 @@ fa:
expired: منقضیشده
title: فیلتر
title: دعوتها
+ pending_accounts:
+ title: حسابهای منتظر (%{count})
relays:
add_new: افزودن رلهٔ تازه
delete: حذف
@@ -490,6 +499,12 @@ fa:
body: کاربر %{reporter} کاربر %{target} را گزارش داد
body_remote: کسی از %{domain} گزارش %{target} را فرستاده
subject: گزارش تازهای برای %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: رابط کاربری پیشرفته
+ advanced_web_interface_hint: 'اگر میخواهید همهٔ فضای نمایشگر خود را به کار ببرید، میتوانید به کمک رابط کاربری پیشرفته ستونهای گوناگونی داشته باشید تا در یک نگاه همهٔ اطلاعاتی را که میخواهید ببینید: نوشتههای دیگران، اعلانها، فهرست نوشتههای همهجا، و هر تعداد فهرست و برچسب که بخواهید.'
+ animations_and_accessibility: پویانماییهای و دسترسیپذیری
+ confirmation_dialogs: پیغامهای تأیید
+ sensitive_content: محتوای حساس
application_mailer:
notification_preferences: تغییر ترجیحات ایمیل
salutation: "%{name}،"
@@ -631,6 +646,7 @@ fa:
all: همه
changes_saved_msg: تغییرات با موفقیت ذخیره شدند!
copy: رونوشت
+ order_by: مرتبسازی
save_changes: ذخیرهٔ تغییرات
validation_errors:
one: یک چیزی هنوز درست نیست! لطفاً خطاهای زیر را ببینید
@@ -646,10 +662,13 @@ fa:
keybase:
invalid_token: کدهای Keybase چکیده (هش) امضاهای دیجیتال هستند و دستکم ۶۶ نویسه در مبنای ۱۶ دارند
verification_failed: این کد را Keybase به عنوان امضای دیجیتال کاربر %{kb_username} تأیید نمیکند. لطفاً دوباره از Keybase تلاش کنید.
+ wrong_user: نمیتوان تأییدی برای %{proving} در حالی که به عنوان %{current} وارد شدهاید. به عنوان %{proving} وارد شوید و دوباره تلاش کنید.
explanation_html: اینجا میتوانید به شناسههای دیگر خود مانند نمایهٔ Keybase خودتان به طور رمزنگارانه متصل شوید. با این کار دیگران میتوانند به شما پیغامهای رمزشده بفرستند و به چیزی که شما به آنها میفرستید اعتماد کنند.
i_am_html: من %{username} روی %{service} هستم.
identity: شناسه
inactive: غیرفعال
+ publicize_checkbox: 'این را ببوقید:'
+ publicize_toot: 'تأیید شد! من %{username} روی %{service} هستم: %{url}'
status: وضعیت تأیید
view_proof: دیدن مدرک
imports:
@@ -747,7 +766,6 @@ fa:
quadrillion: Q
thousand: K
trillion: T
- unit: ''
pagination:
newer: تازهتر
next: بعدی
@@ -765,13 +783,14 @@ fa:
too_few_options: حتماً باید بیش از یک گزینه داشته باشد
too_many_options: نمیتواند بیشتر از %{max} گزینه داشته باشد
preferences:
- languages: تنظیمات زبان
other: سایر تنظیمات
- publishing: تنظیمات انتشار مطالب
- web: وب
+ posting_defaults: تنظیمات پیشفرض انتشار
+ public_timelines: فهرست عمومی نوشتهها
relationships:
activity: فعالیت حساب
dormant: غیرفعال
+ last_active: آخرین فعالیت
+ most_recent: تازهترین
moved: منتقلشده
mutual: دوطرفه
primary: اصلی
@@ -810,20 +829,20 @@ fa:
browser: مرورگر
browsers:
alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
+ blackberry: بلکبری
+ chrome: کروم
+ edge: مایکروسافت اج
+ electron: الکترون
+ firefox: فایرفاکس
generic: مرورگر ناشناخته
- ie: Internet Explorer
- micro_messenger: MicroMessenger
+ ie: اینترنت اکسپلورر
+ micro_messenger: مایکرومسنجر
nokia: Nokia S40 Ovi Browser
- opera: Opera
+ opera: اپرا
otter: Otter
phantom_js: PhantomJS
qq: QQ Browser
- safari: Safari
+ safari: سافاری
uc_browser: UCBrowser
weibo: Weibo
current_session: نشست فعلی
@@ -832,21 +851,24 @@ fa:
ip: IP
platforms:
adobe_air: Adobe Air
- android: Android
- blackberry: Blackberry
+ android: اندروید
+ blackberry: بلکبری
chrome_os: ChromeOS
firefox_os: Firefox OS
ios: iOS
- linux: Linux
- mac: Mac
+ linux: لینوکس
+ mac: مک
other: سیستم ناشناخته
- windows: Windows
+ windows: ویندوز
windows_mobile: Windows Mobile
windows_phone: Windows Phone
revoke: لغو کردن
revoke_success: نشست با موفقیت لغو شد
title: نشستها
settings:
+ account: حساب
+ account_settings: تنظیمات حساب
+ appearance: نما
authorized_apps: برنامههای مجاز
back: بازگشت به ماستدون
delete: پاککردن حساب
@@ -856,9 +878,11 @@ fa:
featured_tags: برچسبهای منتخب
identity_proofs: مدرک شناسهها
import: درونریزی
+ import_and_export: درونریزی و برونبری
migrate: انتقال حساب
notifications: اعلانها
preferences: ترجیحات
+ profile: نمایه
relationships: پیگیریها و پیگیران
two_factor_authentication: ورود دومرحلهای
statuses:
@@ -903,6 +927,87 @@ fa:
reblogged: بازبوقید
sensitive_content: محتوای حساس
terms:
+ body_html: |
+
سیاست رازداری
+
What information do we collect?
+
+
+
Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
+
Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
+
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
+
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. 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 the following ways:
+
+
+
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
+
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
+
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to 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. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.
+
+
+
+
What is our data retention policy?
+
+
We will make a good faith effort to:
+
+
+
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
+
Retain the IP addresses associated with registered users no more than 12 months.
+
+
+
You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
+
+
You may irreversibly delete your account at any time.
+
+
+
+
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.
+
+
+
+
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.
+
+
Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.
+
+
When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.
+
+
+
+
Site usage by children
+
+
If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site.
+
+
If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.
+
+
Law requirements can be different if this server is in another jurisdiction.
+
+
+
+
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 March 7, 2018.
title: شرایط استفاده و سیاست رازداری %{instance}
themes:
contrast: ماستدون (کنتراست بالا)
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index e4a0ed22c..e0dc0f756 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -5,7 +5,6 @@ fi:
about_mastodon_html: Mastodon on sosiaalinen verkosto. Se on toteutettu avoimilla verkkoprotokollilla ja vapailla, avoimen lähdekoodin ohjelmistoilla, ja se toimii hajautetusti samaan tapaan kuin sähköposti.
about_this: Tietoja tästä palvelimesta
administered_by: 'Ylläpitäjä:'
- api: API
apps: Mobiili sovellukset
contact: Ota yhteyttä
contact_missing: Ei asetettu
@@ -39,7 +38,6 @@ fi:
joined: Liittynyt %{date}
last_active: viimeksi aktiivinen
link_verified_on: Tämän linkin omistus on tarkastettu %{date}
- media: Media
moved_html: "%{name} on muuttanut osoitteeseen %{new_profile_link}:"
network_hidden: Nämä tiedot eivät ole käytettävissä
nothing_here: Täällä ei ole mitään!
@@ -47,10 +45,6 @@ fi:
people_who_follow: Käyttäjän %{name} seuraajat
pin_errors:
following: Sinun täytyy seurata henkilöä jota haluat tukea
- posts:
- one: Toot
- other: Toots
- posts_tab_heading: Toots
posts_with_replies: Tuuttaukset ja vastaukset
reserved_username: Käyttäjänimi on varattu
roles:
@@ -93,7 +87,6 @@ fi:
followers_url: Seuraajien osoite
follows: Seuraa
inbox_url: Saapuvan postilaatikon osoite
- ip: IP
location:
all: Kaikki
local: Paikalliset
@@ -148,7 +141,6 @@ fi:
undo_suspension: Peru jäähy
unsubscribe: Lopeta tilaus
username: Käyttäjänimi
- web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} otti raportin %{target} tehtäväkseen"
@@ -189,7 +181,6 @@ fi:
destroyed_msg: Emojon poisto onnistui!
disable: Poista käytöstä
disabled_msg: Emojin poisto käytöstä onnistui
- emoji: Emoji
enable: Ota käyttöön
enabled_msg: Emojin käyttöönotto onnistui
image_hint: PNG enintään 50 kt
@@ -336,8 +327,6 @@ fi:
nsfw_off: NSFW POIS
nsfw_on: NSFW PÄÄLLÄ
failed_to_execute: Suoritus epäonnistui
- media:
- title: Media
no_media: Ei mediaa
title: Tilin tilat
with_media: Sisältää mediaa
@@ -346,7 +335,6 @@ fi:
confirmed: Vahvistettu
expires_in: Vanhenee
last_delivery: Viimeisin toimitus
- title: WebSub
topic: Aihe
title: Ylläpito
admin_mailer:
@@ -356,7 +344,6 @@ fi:
subject: Uusi raportti instanssista %{instance} (nro %{id})
application_mailer:
notification_preferences: Muuta sähköpostiasetuksia
- salutation: "%{name},"
settings: 'Muuta sähköpostiasetuksia: %{link}'
view: 'Näytä:'
view_profile: Näytä profiili
@@ -382,9 +369,6 @@ fi:
migrate_account: Muuta toiseen tiliin
migrate_account_html: Jos haluat ohjata tämän tilin toiseen tiliin, voit asettaa toisen tilin tästä.
or_log_in_with: Tai käytä kirjautumiseen
- providers:
- cas: CAS
- saml: SAML
register: Rekisteröidy
resend_confirmation: Lähetä vahvistusohjeet uudestaan
reset_password: Palauta salasana
@@ -444,7 +428,6 @@ fi:
request: Pyydä arkisto
size: Koko
blocks: Estot
- csv: CSV
follows: Seurattavat
mutes: Mykistetyt
storage: Media-arkisto
@@ -538,22 +521,16 @@ fi:
format: "%n %u"
units:
billion: Mrd
- million: M
quadrillion: Brd
thousand: k
trillion: B
- unit: ''
pagination:
newer: Uudemmat
next: Seuraava
older: Vanhemmat
prev: Edellinen
- truncate: "…"
preferences:
- languages: Kielet
other: Muut
- publishing: Julkaiseminen
- web: Web
remote_follow:
acct: Syötä se käyttäjätunnus@verkkotunnus, josta haluat seurata
missing_resource: Vaadittavaa uudelleenohjaus-URL:ää tiliisi ei löytynyt
@@ -565,40 +542,13 @@ fi:
activity: Viimeisin toiminta
browser: Selain
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Tuntematon selain
- ie: Internet Explorer
- micro_messenger: MicroMessenger
nokia: Nokia S40 Ovi -selain
- opera: Opera
- otter: Otter
- phantom_js: PhantomJS
- qq: QQ Browser
- safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Nykyinen istunto
description: "%{browser}, %{platform}"
explanation: Nämä verkkoselaimet ovat tällä hetkellä kirjautuneet Mastodon-tilillesi.
- 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: tuntematon järjestelmä
- windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Hylkää
revoke_success: Istunnon hylkäys onnistui
title: Istunnot
@@ -620,9 +570,6 @@ fi:
image:
one: "%{count} kuva"
other: "%{count} kuvaa"
- video:
- one: "%{count} video"
- other: "%{count} videota"
content_warning: 'Sisältövaroitus: %{warning}'
disallowed_hashtags:
one: 'sisälsi aihetunnisteen jota ei sallita: %{tags}'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d588b239f..5c15ab6a4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -4,26 +4,37 @@ fr:
about_hashtag_html: Figurent ci-dessous les pouets tagués avec #%{hashtag}. Vous pouvez interagir avec eux si vous avez un compte n’importe où dans le Fediverse.
about_mastodon_html: Mastodon est un réseau social utilisant des formats ouverts et des logiciels libres. Comme le courriel, il est décentralisé.
about_this: À propos
+ active_count_after: actif·ve·s
+ active_footnote: Utilisateur·rice·s actif·ve·s mensuels (MAU)
administered_by: 'Administrée par :'
api: API
apps: Applications mobiles
+ apps_platforms: Utilisez Mastodon depuis iOS, Android et d’autres plates-formes
+ browse_directory: Parcourir l’annuaire des profils et filtrer par centres d’intérêt
+ browse_public_posts: Parcourir un flux en direct de messages publics sur Mastodon
contact: Contact
contact_missing: Manquant
contact_unavailable: Non disponible
+ discover_users: Découvrez des utilisateur·rice·s
documentation: Documentation
extended_description_html: |
Un bon endroit pour les règles
La description étendue n’a pas été remplie.
+ federation_hint_html: Avec un compte sur %{instance}, vous pourrez suivre les gens sur n’importe quel serveur Mastodon et au-delà.
generic_description: "%{domain} est seulement un serveur du réseau"
+ get_apps: Essayez une application mobile
hosted_on: Serveur Mastodon hébergée par %{domain}
learn_more: En savoir plus
privacy_policy: Politique de vie privée
+ see_whats_happening: Voir ce qui se passe
+ server_stats: 'Statistiques du serveur :'
source_code: Code source
status_count_after:
one: Statut
other: Statuts
status_count_before: Ayant publié
- terms: Conditions d'utilisation
+ tagline: Suivez vos ami·e·s et découvrez en de nouveaux·elles
+ terms: Conditions d’utilisation
user_count_after:
one: utilisateur
other: utilisateurs
@@ -57,6 +68,7 @@ fr:
admin: Admin
bot: Robot
moderator: Modérateur·trice
+ unavailable: Profil non disponible
unfollow: Ne plus suivre
admin:
account_actions:
@@ -68,6 +80,8 @@ fr:
delete: Supprimer
destroyed_msg: Note de modération supprimée avec succès !
accounts:
+ approve: Approuver
+ approve_all: Tout approuver
are_you_sure: Êtes-vous certain⋅e ?
avatar: Avatar
by_domain: Domaine
@@ -113,15 +127,18 @@ fr:
moderation:
active: Actif
all: Tous
+ pending: En cours de traitement
silenced: Masqués
suspended: Suspendus
title: Modération
moderation_notes: Notes de modération
most_recent_activity: Dernière activité
most_recent_ip: Adresse IP la plus récente
+ no_account_selected: Aucun compte n’a été modifié, car aucun n’a été sélectionné
no_limits_imposed: Aucune limite imposée
not_subscribed: Non abonné
outbox_url: URL de sortie
+ pending: En attente d’approbation
perform_full_suspension: Suspendre
profile_url: URL du profil
promote: Promouvoir
@@ -129,8 +146,10 @@ fr:
public: Publique
push_subscription_expires: Expiration de l’abonnement PuSH
redownload: Rafraîchir le profil
+ reject: Rejeter
+ reject_all: Tout rejeter
remove_avatar: Supprimer l’avatar
- remove_header: Supprimer l'entête
+ remove_header: Supprimer l’entête
resend_confirmation:
already_confirmed: Cet·te utilisateur·ice est déjà confirmé·e
send: Renvoyer un courriel de confirmation
@@ -149,12 +168,13 @@ fr:
shared_inbox_url: URL de la boite de réception partagée
show:
created_reports: Signalements faits
- targeted_reports: Signalés par d'autres
+ targeted_reports: Signalés par d’autres
silence: Masquer
silenced: Silencié
statuses: Statuts
subscribe: S’abonner
suspended: Suspendu
+ time_in_queue: En file d’attente %{time}
title: Comptes
unconfirmed_email: Courriel non-confirmé
undo_silenced: Démasquer
@@ -173,7 +193,7 @@ fr:
create_domain_block: "%{name} a bloqué le domaine %{target}"
create_email_domain_block: "%{name} a mis le domaine du courriel %{target} sur liste noire"
demote_user: "%{name} a rétrogradé l’utilisateur·ice %{target}"
- destroy_custom_emoji: "%{name} a détruit l'émoticône %{target}"
+ destroy_custom_emoji: "%{name} a détruit l’émoticône %{target}"
destroy_domain_block: "%{name} a débloqué le domaine %{target}"
destroy_email_domain_block: "%{name} a mis le domaine du courriel %{target} sur liste blanche"
destroy_status: "%{name} a enlevé le statut de %{target}"
@@ -230,6 +250,7 @@ fr:
feature_profile_directory: Annuaire des profils
feature_registrations: Inscriptions
feature_relay: Relais de fédération
+ feature_timeline_preview: Aperçu du fil public
features: Fonctionnalités
hidden_service: Fédération avec des services cachés
open_reports: signalements non résolus
@@ -249,6 +270,7 @@ fr:
created_msg: Le blocage de domaine est désormais activé
destroyed_msg: Le blocage de domaine a été désactivé
domain: Domaine
+ existing_domain_block_html: Vous avez déjà imposé des limites plus strictes à %{name}, vous devez d’abord le débloquer.
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.
@@ -314,6 +336,8 @@ fr:
expired: Expiré
title: Filtre
title: Invitations
+ pending_accounts:
+ title: Comptes en attente (%{count})
relays:
add_new: Ajouter un nouveau relais
delete: Effacer
@@ -324,7 +348,7 @@ fr:
enable_hint: Une fois activé, votre serveur souscrira à tous les pouets publics présents sur ce relais et y enverra ses propres pouets publics.
enabled: Activé
inbox_url: URL de relais
- pending: En attente de l'approbation du relai
+ pending: En attente de l’approbation du relai
save_and_enable: Sauvegarder et activer
setup: Paramétrer une connexion de relais
status: Statut
@@ -373,13 +397,13 @@ fr:
email: Entrez une adresse courriel publique
username: Entrez un nom d’utilisateur⋅ice
custom_css:
- desc_html: Modifier l'apparence avec une CSS chargée sur chaque page
+ desc_html: Modifier l’apparence avec une CSS chargée sur chaque page
title: CSS personnalisé
hero:
desc_html: Affichée sur la page d’accueil. Au moins 600x100px recommandé. Lorsqu’elle n’est pas définie, se rabat sur la vignette du serveur
title: Image d’en-tête
mascot:
- desc_html: Affiché sur plusieurs pages. Au moins 293×205px recommandé. Lorsqu'il n'est pas défini, retombe à la mascotte par défaut
+ desc_html: Affiché sur plusieurs pages. Au moins 293×205px recommandé. Lorsqu’il n’est pas défini, retombe à la mascotte par défaut
title: Image de la mascotte
peers_api_enabled:
desc_html: Noms des domaines que ce serveur a découvert dans le fediverse
@@ -388,8 +412,8 @@ fr:
desc_html: Les liens de prévisualisation sur les autres sites web afficheront une vignette même si le média est sensible
title: Afficher les médias sensibles dans les prévisualisations OpenGraph
profile_directory:
- desc_html: Permettre aux utilisateurs d'être découverts
- title: Activer l'annuaire des profils
+ desc_html: Permettre aux utilisateurs d’être découverts
+ title: Activer l’annuaire des profils
registrations:
closed_message:
desc_html: Affiché sur la page d’accueil lorsque les inscriptions sont fermées Vous pouvez utiliser des balises HTML
@@ -400,6 +424,12 @@ fr:
min_invite_role:
disabled: Personne
title: Autoriser les invitations par
+ registrations_mode:
+ modes:
+ approved: Approbation requise pour s’inscrire
+ none: Personne ne peut s’inscrire
+ open: N’importe qui peut s’inscrire
+ title: Mode d’enregistrement
show_known_fediverse_at_about_page:
desc_html: Lorsque l’option est activée, les pouets provenant de toutes les serveurs connues sont affichés dans la prévisualisation. Sinon, seuls les pouets locaux sont affichés.
title: Afficher le fediverse connu dans la prévisualisation du fil
@@ -410,7 +440,7 @@ fr:
desc_html: Paragraphe introductif sur la page d’accueil. Décrivez ce qui rend spécifique ce serveur Mastodon et toute autre chose importante. Vous pouvez utiliser des balises HTML, en particulier <a> et <em>.
title: Description du serveur
site_description_extended:
- desc_html: L'endroit idéal pour afficher votre code de conduite, les règles, les guides et autres choses qui rendent votre serveur différent. Vous pouvez utiliser des balises HTML
+ desc_html: L’endroit idéal pour afficher votre code de conduite, les règles, les guides et autres choses qui rendent votre serveur différent. Vous pouvez utiliser des balises HTML
title: Description étendue du serveur
site_short_description:
desc_html: Affichée dans la barre latérale et dans les méta-tags. Décrivez ce qui rend spécifique ce serveur Mastodon en un seul paragraphe. Si laissée vide, la description du serveur sera affiché par défaut.
@@ -449,23 +479,32 @@ fr:
tags:
accounts: Comptes
hidden: Masqué
- hide: Masquer dans l'annuaire
+ hide: Masquer dans l’annuaire
name: Hashtag
title: Hashtags
- unhide: Afficher dans l'annuaire
+ unhide: Afficher dans l’annuaire
visible: Visible
title: Administration
warning_presets:
add_new: Ajouter un nouveau
delete: Effacer
edit: Éditer
- edit_preset: Éditer la présélection d'attention
- title: Gérer les présélections d'attention
+ edit_preset: Éditer la présélection d’avertissement
+ title: Gérer les présélections d’avertissement
admin_mailer:
+ new_pending_account:
+ body: Les détails du nouveau compte se trouvent ci-dessous. Vous pouvez approuver ou rejeter cette demande.
+ subject: Nouveau compte à examiner sur %{instance} (%{username})
new_report:
body: "%{reporter} a signalé %{target}"
body_remote: Quelqu’un de %{domain} a signalé %{target}
subject: Nouveau signalement sur %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Interface web avancée
+ advanced_web_interface_hint: 'Si vous voulez utiliser toute la largeur de votre écran, l’interface web avancée vous permet de configurer plusieurs colonnes différentes pour voir autant d’informations que vous le souhaitez en même temps : Accueil, notifications, fil public fédéré, un nombre illimité de listes et hashtags.'
+ animations_and_accessibility: Animations et accessibilité
+ confirmation_dialogs: Dialogues de confirmation
+ sensitive_content: Contenu sensible
application_mailer:
notification_preferences: Modifier les préférences de courriel
salutation: "%{name},"
@@ -482,7 +521,9 @@ fr:
warning: Soyez prudent⋅e avec ces données. Ne les partagez pas !
your_token: Votre jeton d’accès
auth:
+ apply_for_account: Demander une invitation
change_password: Mot de passe
+ checkbox_agreement_html: J’accepte les règles du serveur et les conditions de service
confirm_email: Confirmer mon adresse mail
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.
@@ -498,10 +539,12 @@ fr:
cas: CAS
saml: SAML
register: S’inscrire
+ registration_closed: "%{instance} n’accepte pas de nouveaux membres"
resend_confirmation: Envoyer à nouveau les consignes de confirmation
reset_password: Réinitialiser le mot de passe
security: Sécurité
set_new_password: Définir le nouveau mot de passe
+ trouble_logging_in: Vous avez un problème pour vous connecter ?
authorize_follow:
already_following: Vous suivez déjà ce compte
error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant
@@ -537,11 +580,11 @@ fr:
warning_title: Disponibilité du contenu disséminé
directories:
directory: Annuaire des profils
- enabled: Vous êtes actuellement listé dans l'annuaire.
- enabled_but_waiting: Vous avez choisi d'être listé dans l'annuaire, mais vous n'avez pas encore le nombre minimum de suiveurs (%{min_followers}) pour y être inscrit.
- explanation: Découvrir des utilisateurs en se basant sur leurs centres d'intérêt
+ enabled: Vous êtes actuellement listé dans l’annuaire.
+ enabled_but_waiting: Vous avez choisi d’être listé dans l’annuaire, mais vous n’avez pas encore le nombre minimum de suiveurs (%{min_followers}) pour y être inscrit.
+ explanation: Découvrir des utilisateurs en se basant sur leurs centres d’intérêt
explore_mastodon: Explorer %{title}
- how_to_enable: Vous n'êtes pas encore inscrit dans l'annuaire. Vous pouvez vous inscrire ci-dessous. Utilisez des hashtags dans votre texte biographique pour être listé sous des hashtags spécifiques !
+ how_to_enable: Vous n’êtes pas encore inscrit dans l’annuaire. Vous pouvez vous inscrire ci-dessous. Utilisez des hashtags dans votre texte biographique pour être listé sous des hashtags spécifiques !
people:
one: "%{count} personne"
other: "%{count} personne"
@@ -557,6 +600,9 @@ fr:
content: Nous sommes désolé·e·s, mais quelque chose s’est mal passé de notre côté.
title: Cette page n’est pas correcte
noscript_html: Pour utiliser Mastodon, veuillez activer JavaScript. Sinon, essayez l’une des applications natives pour Mastodon pour votre plate-forme.
+ existing_username_validator:
+ not_found: n’a pas trouvé d’utilisateur·rice local·e avec ce nom
+ not_found_multiple: n’a pas trouvé %{usernames}
exports:
archive_takeout:
date: Date
@@ -597,19 +643,41 @@ fr:
more: Davantage…
resources: Ressources
generic:
+ all: Tous
changes_saved_msg: Les modifications ont été enregistrées avec succès !
copy: Copier
+ order_by: Classer par
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 %{count} erreurs ci-dessous
+ html_validator:
+ invalid_markup: 'contient un balisage HTML invalide: %{error}'
+ identity_proofs:
+ active: Actif
+ authorize: Oui, autoriser
+ authorize_connection_prompt: Autoriser cette connexion chiffrée ?
+ errors:
+ failed: La connexion chiffrée a échoué. Veuillez réessayer à partir de %{provider}.
+ keybase:
+ invalid_token: Les jetons Keybase sont des hachages de signatures et doivent comporter 66 caractères hexadécimaux
+ verification_failed: Keybase ne reconnaît pas ce jeton comme une signature de l’utilisateur Keybase %{kb_username}. Veuillez réessayer à partir de Keybase.
+ wrong_user: Impossible de créer une preuve pour %{proving} lorsque vous êtes connecté en tant que %{current}. Connectez-vous en tant que %{proving} et réessayez.
+ explanation_html: Ici, vous pouvez connecter de manière chiffrée vos autres identités, par exemple un profil Keybase. Cela permet à d’autres personnes de vous envoyer des messages chiffrés et de faire confiance au contenu que vous leur envoyez.
+ i_am_html: Je suis %{username} sur %{service}.
+ identity: Identité
+ inactive: Inactif
+ publicize_checkbox: 'Et le poueter:'
+ publicize_toot: 'C’est prouvé ! Je suis %{username} sur %{service}: %{url}'
+ status: Statut de vérification
+ view_proof: Voir la preuve
imports:
modes:
merge: Fusionner
merge_long: Garder les enregistrements existants et ajouter les nouveaux
overwrite: Réécrire
overwrite_long: Remplacer les enregistrements actuels par les nouveaux
- preface: Vous pouvez importer certaines données que vous avez exporté d'un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte.
+ preface: Vous pouvez importer certaines données que vous avez exporté d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte.
success: Vos données ont été importées avec succès et seront traitées en temps et en heure
types:
blocking: Liste d’utilisateur⋅ice⋅s bloqué⋅e⋅s
@@ -698,7 +766,6 @@ fr:
quadrillion: P
thousand: K
trillion: T
- unit: ''
pagination:
newer: Plus récent
next: Suivant
@@ -713,13 +780,25 @@ fr:
duration_too_short: est trop tôt
expired: Ce sondage est déjà terminé
over_character_limit: ne peuvent être plus long que %{max} caractères chacun
- too_few_options: doit avoir plus qu'une proposition
+ too_few_options: doit avoir plus qu’une proposition
too_many_options: ne peut contenir plus que %{max} propositions
preferences:
- languages: Langues
other: Autre
- publishing: Publication
- web: Web
+ posting_defaults: Paramètres par défaut des pouets
+ public_timelines: Fils publics
+ relationships:
+ activity: Activité du compte
+ dormant: Dormant
+ last_active: Dernière activité
+ most_recent: Plus récent
+ moved: Déménagé
+ mutual: Mutuel
+ primary: Primaire
+ relationship: Relation
+ remove_selected_domains: Supprimer tous les abonné·e·s des domaines sélectionnés
+ remove_selected_followers: Supprimer les abonné·e·s sélectionnés
+ remove_selected_follows: Cesser de suivre les utilisateur·rice·s sélectionné·e·s
+ status: Statut du compte
remote_follow:
acct: Entrez l’adresse profil@serveur depuis laquelle vous voulez vous abonner
missing_resource: L’URL de redirection n’a pas pu être trouvée
@@ -729,7 +808,7 @@ fr:
reason_html: "Pourquoi cette étape est-elle nécessaire?%{instance} pourrait ne pas être le serveur où vous vous êtes inscrit, et nous devons donc vous rediriger vers votre serveur de base en premier."
remote_interaction:
favourite:
- proceed: Confirmer l'ajout aux favoris
+ proceed: Confirmer l’ajout aux favoris
prompt: 'Vous souhaitez mettre ce pouet en favori :'
reblog:
proceed: Confirmer le repartage
@@ -787,6 +866,9 @@ fr:
revoke_success: Session révoquée avec succès
title: Sessions
settings:
+ account: Compte
+ account_settings: Paramètres du compte
+ appearance: Apparence
authorized_apps: Applications autorisées
back: Retour vers Mastodon
delete: Suppression de compte
@@ -794,10 +876,14 @@ fr:
edit_profile: Modifier le profil
export: Export de données
featured_tags: Hashtags mis en avant
+ identity_proofs: Preuves d’identité
import: Import de données
+ import_and_export: Import et export
migrate: Migration de compte
notifications: Notifications
preferences: Préférences
+ profile: Profil
+ relationships: Abonnements et abonné·e·s
two_factor_authentication: Identification à deux facteurs
statuses:
attached:
@@ -846,10 +932,10 @@ fr:
Quelles informations collectons-nous ?
-
Informations de base sur votre compte : Si vous vous inscrivez sur ce serveur, il vous sera demandé de rentrer un identifiant, une adresse électronique et un mot de passe. Vous pourrez également ajouter des informations additionnelles sur votre profil, telles qu’un nom public et une biographie, ainsi que téléverser une image de profil et une image d’en-tête. Vos identifiant, nom public, biographie, image de profil et image d’en-tête seront toujours affichés publiquement.
+
Informations de base sur votre compte : Si vous vous inscrivez sur ce serveur, il vous sera demandé de rentrer un identifiant, une adresse électronique et un mot de passe. Vous pourrez également ajouter des informations additionnelles sur votre profil, telles qu’un nom public et une biographie, ainsi que téléverser une image de profil et une image d’en-tête. Vos identifiant, nom public, biographie, image de profil et image d’en-tête seront toujours affichés publiquement.
Posts, liste d’abonnements et autres informations publiques : La liste de vos abonnements ainsi que la liste de vos abonné·e·s sont publiques. Quand vous postez un message, la date et l’heure d’envoi ainsi que le nom de l’application utilisée pour sa transmission sont enregistré·e·s. Des médias, tels que des images ou des vidéos, peuvent être joints aux messages. Les posts publics et non listés sont affichés publiquement. Quand vous mettez en avant un post sur votre profil, ce post est également affiché publiquement. Vos messages sont délivrés à vos abonné·e·s, ce qui, dans certains cas, signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Quand vous supprimer un post, il est probable que vos abonné·e·s en soient informé·e·s. Partager un message ou le marquer comme favori est toujours une action publique.
-
Posts directs et abonné·e·s uniquement : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne fois pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. Gardez s’il-vous-plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. Ne partager aucune information sensible à l’aide de Mastodon.
-
IP et autres métadonnées : Quand vous vous connectez, nous enregistrons votre adresse IP ainsi que le nom de votre navigateur web. Toutes les sessions enregistrées peuvent être consultées dans les paramètres, afin que vous puissiez les surveiller et éventuellement les révoquer. La dernière adresse IP utilisée est conservée pour une durée de 12 mois. Nous sommes également susceptibles de conserver les journaux du serveur, ce qui inclut l’adresse IP de chaque requête reçue.
+
Posts directs et abonné·e·s uniquement : Tous les posts sont stockés et traités par le serveur. Les messages abonné·e·s uniquement ne sont transmis qu’à vos abonné·e·s et aux personnes mentionnées dans le corps du message, tandis que les messages directs ne sont transmis qu’aux personnes mentionnées. Dans certains cas, cela signifie qu’ils sont délivrés à des serveurs tiers et que ces derniers en stockent une copie. Nous faisons un effort de bonne fois pour en limiter l’accès uniquement aux personnes autorisées, mais ce n’est pas nécessairement le cas des autres serveurs. Il est donc très important que vous vérifiiez les serveurs auxquels appartiennent vos abonné·e·s. Il vous est possible d’activer une option dans les paramètres afin d’approuver et de rejeter manuellement les nouveaux·lles abonné·e·s. Gardez s’il-vous-plaît en mémoire que les opérateur·rice·s du serveur ainsi que celles et ceux de n’importe quel serveur récepteur peuvent voir ces messages et qu’il est possible pour les destinataires de faire des captures d’écran, de copier et plus généralement de repartager ces messages. Ne partager aucune information sensible à l’aide de Mastodon.
+
IP et autres métadonnées : Quand vous vous connectez, nous enregistrons votre adresse IP ainsi que le nom de votre navigateur web. Toutes les sessions enregistrées peuvent être consultées dans les paramètres, afin que vous puissiez les surveiller et éventuellement les révoquer. La dernière adresse IP utilisée est conservée pour une durée de 12 mois. Nous sommes également susceptibles de conserver les journaux du serveur, ce qui inclut l’adresse IP de chaque requête reçue.
@@ -859,9 +945,9 @@ fr:
Toutes les informations que nous collectons sur vous peuvent être utilisées d’une des manières suivantes :
-
Pour vous fournir les fonctionnalités de base de Mastodon. Vous ne pouvez interagir avec le contenu des autres et poster votre propre contenu que lorsque vous êtes connecté·e. Par exemple, vous pouvez vous abonner à plusieurs autres comptes pour voir l’ensemble de leurs posts dans votre fil d’accueil personnalisé.
-
Pour aider à la modération de la communauté, par exemple, comparer votre adresse IP à d’autres afin de déterminer si un bannissement a été contourné ou si une autre violation aux règles a été commise.
-
L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyez des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour tout autres requêtes ou questions.
+
Pour vous fournir les fonctionnalités de base de Mastodon. Vous ne pouvez interagir avec le contenu des autres et poster votre propre contenu que lorsque vous êtes connecté·e. Par exemple, vous pouvez vous abonner à plusieurs autres comptes pour voir l’ensemble de leurs posts dans votre fil d’accueil personnalisé.
+
Pour aider à la modération de la communauté, par exemple, comparer votre adresse IP à d’autres afin de déterminer si un bannissement a été contourné ou si une autre violation aux règles a été commise.
+
L’adresse électronique que vous nous avez fournie peut être utilisée pour vous envoyez des informations, des notifications lorsque d’autres personnes interagissent avec votre contenu ou vous envoient des messages, pour répondre à des demandes de votre part ainsi que pour tout autres requêtes ou questions.
@@ -877,8 +963,8 @@ fr:
Nous ferons un effort de bonne foi :
-
Pour ne pas conserver plus de 90 jours les journaux systèmes contenant les adresses IP de toutes les requêtes reçues par ce serveur.
-
Pour ne pas conserver plus de 12 mois les adresses IP associées aux utilisateur·ice·s enregistré·e·s.
+
Pour ne pas conserver plus de 90 jours les journaux systèmes contenant les adresses IP de toutes les requêtes reçues par ce serveur.
+
Pour ne pas conserver plus de 12 mois les adresses IP associées aux utilisateur·ice·s enregistré·e·s.
Vous pouvez demander une archive de votre contenu, incluant vos posts, vos médias joints, votre image de profil et votre image d’en-tête.
@@ -954,8 +1040,8 @@ fr:
title: Récupération de l’archive
warning:
explanation:
- disable: Lorsque votre compte est gelé, les données de votre compte demeurent intactes, mais vous ne pouvez effectuer aucune action jusqu'à ce qu'il soit débloqué.
- silence: Lorsque votre compte est limité, seulement les utilisateurs qui vous suivent déjà verront vos pouets sur ce serveur, et vous pourriez être exclu de plusieurs listes publiques. Néanmoins, d'autres utilisateurs peuvent vous suivre manuellement.
+ disable: Lorsque votre compte est gelé, les données de votre compte demeurent intactes, mais vous ne pouvez effectuer aucune action jusqu’à ce qu’il soit débloqué.
+ silence: Lorsque votre compte est limité, seulement les utilisateurs qui vous suivent déjà verront vos pouets sur ce serveur, et vous pourriez être exclu de plusieurs listes publiques. Néanmoins, d’autres utilisateurs peuvent vous suivre manuellement.
suspend: Votre compte a été suspendu, et tous vos pouets et vos fichiers multimédia téléversés ont été supprimés irréversiblement de ce serveur, et des serveurs où vous aviez des abonné⋅e⋅s.
review_server_policies: Passer en revue les politiques du serveur
subject:
@@ -993,5 +1079,5 @@ fr:
seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
signed_in_as: 'Connecté·e en tant que :'
verification:
- explanation_html: 'Vous pouvez vérifier vous-même que vous êtes le propriétaire des liens dans les métadonnées de votre profil. Pour cela, le site Web lié doit contenir un lien vers votre profil Mastodon. Le lien de retour doitavoir un attribut rel="me". Le contenu textuel du lien n''a pas d''importance. En voici un exemple :'
+ explanation_html: 'Vous pouvez vérifier vous-même que vous êtes le propriétaire des liens dans les métadonnées de votre profil. Pour cela, le site Web lié doit contenir un lien vers votre profil Mastodon. Le lien de retour doitavoir un attribut rel="me". Le contenu textuel du lien n’a pas d’importance. En voici un exemple :'
verification: Vérification
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 9c4673186..79ef993e2 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -68,6 +68,7 @@ gl:
admin: Admin
bot: Bot
moderator: Mod
+ unavailable: Perfil non dispoñible
unfollow: Deixar de seguir
admin:
account_actions:
@@ -80,6 +81,7 @@ gl:
destroyed_msg: Nota a moderación destruída con éxito!
accounts:
approve: Aprobar
+ approve_all: Aprobar todo
are_you_sure: Está segura?
avatar: Avatar
by_domain: Dominio
@@ -101,7 +103,7 @@ gl:
display_name: Mostrar nome
domain: Dominio
edit: Editar
- email: Email
+ email: Correo-e
email_status: Estado do correo
enable: Habilitar
enabled: Habilitado
@@ -132,6 +134,7 @@ gl:
moderation_notes: Notas de moderación
most_recent_activity: Actividade máis recente
most_recent_ip: IP máis recente
+ no_account_selected: Non cambiou nada xa que non tiña nada seleccionado
no_limits_imposed: Sen límites impostos
not_subscribed: Non suscrita
outbox_url: URL caixa de saída
@@ -144,6 +147,7 @@ gl:
push_subscription_expires: A suscrición PuSH caduca
redownload: Actualizar perfil
reject: Rexeitar
+ reject_all: Rexeitar todo
remove_avatar: Eliminar avatar
remove_header: Eliminar cabeceira
resend_confirmation:
@@ -170,6 +174,7 @@ gl:
statuses: Estados
subscribe: Subscribir
suspended: Suspendida
+ time_in_queue: Agardando en cola %{time}
title: Contas
unconfirmed_email: Correo non confirmado
undo_silenced: Desfacer acalar
@@ -245,6 +250,7 @@ gl:
feature_profile_directory: Directorio do perfil
feature_registrations: Rexistros
feature_relay: Repetidores de federación
+ feature_timeline_preview: Vista previa da TL
features: Características
hidden_service: Federación con servizos ocultos
open_reports: informes abertos
@@ -264,6 +270,7 @@ gl:
created_msg: Estase a procesar o bloqueo do dominio
destroyed_msg: Desfixose a acción de bloqueo de dominio
domain: Dominio
+ existing_domain_block_html: Xa estableceu límites estrictos para %{name}, precisa desbloqueala primeiro.
new:
create: Crear bloque
hint: O bloqueo do dominio non previrá a creación de entradas de contas na base de datos, pero aplicará de xeito retroactivo e automático regras específicas de moderación sobre esas contas.
@@ -329,6 +336,8 @@ gl:
expired: Cadudado
title: Filtro
title: Convida
+ pending_accounts:
+ title: Contas pendentes (%{count})
relays:
add_new: Engadir un novo repetidor
delete: Eliminar
@@ -490,6 +499,12 @@ gl:
body: "%{reporter} informou sobre %{target}"
body_remote: Alguén desde %{domain} informou sobre %{target}
subject: Novo informe sobre %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Interface web avanzada
+ advanced_web_interface_hint: Se quere utilizar todo o ancho da súa pantalla, a interface web avanzada permítelle configurar diferentes columnas para ver tanta información como desexe. Inicio, notificacións, liña temporal federada, calquera número de listas e etiquetas.
+ animations_and_accessibility: Animacións e accesibilidade
+ confirmation_dialogs: Diálogos de confirmación
+ sensitive_content: Contido sensible
application_mailer:
notification_preferences: Cambiar os axustes de correo-e
salutation: "%{name},"
@@ -585,6 +600,9 @@ gl:
content: Sentímolo, pero algo do noso lado falloou.
title: Esta páxina non é correcta
noscript_html: Para utilizar a aplicación web de Mastodon debe habilitar JavaScript. De xeito alternativo, intente unha das apps nativas para Mastodon da súa plataforma.
+ existing_username_validator:
+ not_found: non se atopou unha usuaria local con ese alcume
+ not_found_multiple: non se atopou a %{usernames}
exports:
archive_takeout:
date: Data
@@ -628,10 +646,13 @@ gl:
all: Todo
changes_saved_msg: Cambios gardados correctamente!!
copy: Copiar
+ order_by: Ordenar por
save_changes: Gardar cambios
validation_errors:
one: Algo non está ben de todo! Por favor revise abaixo o erro
other: Algo aínda non está ben! Por favor revise os %{count} erros abaixo
+ html_validator:
+ invalid_markup: 'contén etiquetas HTML non válidas: %{error}'
identity_proofs:
active: Activo
authorize: Si, autorizar
@@ -641,10 +662,13 @@ gl:
keybase:
invalid_token: Os testemuños Keybase son hashes de firma e deben ter 66 caracteres hexadecimais
verification_failed: Keybase non recoñece este testemuño como firma da usuaria de Keybase %{kb_username}. Por favor inténteo desde Keybase.
+ wrong_user: Non se puido crear a proba para %{proving} mentras está conectada como %{current}. Conéctese como %{proving} e inténteo de novo.
explanation_html: Aquí pódese conectar criptográficamente as suas outras identidades, como a un perfil Keybase. Esto permitelle a outras persoas enviarlle mensaxes cifradas e confiar no contido que vostede lle envía.
i_am_html: Eu son %{username} en %{service}.
identity: Identidade
inactive: Inactiva
+ publicize_checkbox: 'E tootee esto:'
+ publicize_toot: 'Comprobado! Eu son %{username} en %{service}: %{url}'
status: Estado da validación
view_proof: Ver proba
imports:
@@ -742,7 +766,6 @@ gl:
quadrillion: Q
thousand: K
trillion: T
- unit: " "
pagination:
newer: Máis novo
next: Seguinte
@@ -760,13 +783,14 @@ gl:
too_few_options: debe ter máis de unha opción
too_many_options: non pode haber máis de %{max} opcións
preferences:
- languages: Idiomas
other: Outro
- publishing: Publicando
- web: Web
+ posting_defaults: Valores por omisión
+ public_timelines: Liñas temporais públicas
relationships:
activity: Actividade da conta
dormant: En repouso
+ last_active: Último activo
+ most_recent: Máis recente
moved: Movida
mutual: Mutuo
primary: Principal
@@ -842,6 +866,9 @@ gl:
revoke_success: A sesión revocouse con éxito
title: Sesións
settings:
+ account: Conta
+ account_settings: Axustes da conta
+ appearance: Aparencia
authorized_apps: Apps autorizadas
back: Voltar a Mastodon
delete: Eliminación da conta
@@ -851,9 +878,11 @@ gl:
featured_tags: Etiquetas destacadas
identity_proofs: Probas de identidade
import: Importar
+ import_and_export: Importar e exportar
migrate: Migrar conta
notifications: Notificacións
preferences: Preferencias
+ profile: Perfil
relationships: Seguindo e seguidoras
two_factor_authentication: Validar Doble Factor
statuses:
@@ -903,10 +932,10 @@ gl:
Qué información recollemos?
-
Información básica da conta: Si se rexistra en este servidor, pediráselle un nome de usuaria, un enderezo de correo electrónico e un contrasinal. De xeito adicional tamén poderá introducir información como un nome público e biografía, tamén subir unha fotografía de perfil e unha imaxe para a cabeceira. O nome de usuaria, o nome público, a biografía e as imaxes de perfil e cabeceira sempre se mostran publicamente.
-
Publicacións, seguimento e outra información pública: O listado das persoas que segue é un listado público, o mesmo acontece coas súas seguidoras. Cando evía unha mensaxe, a data e hora gárdanse así como o aplicativo que utilizou para enviar a mensaxe. As publicacións poderían conter ficheiros de medios anexos, como fotografías e vídeos. As publicacións públicas e as non listadas están dispoñibles de xeito público. Cando destaca unha publicación no seu perfil tamén é pública. As publicacións son enviadas as súas seguidoras, en algúns casos pode acontecer que estén en diferentes servidores e gárdanse copias neles. Cando elemina unha publicación tamén se envía as súas seguidoras. A acción de voltar a publicar ou marcar como favorita outra publicación sempre é pública.
-
Mensaxes directas e só para seguidoras: Todas as mensaxes gárdanse e procésanse no servidor. As mensaxes só para seguidoras son entregadas as súas seguidoras e as usuarias que son mencionadas en elas, e as mensaxes directas entréganse só as usuarias mencionadas en elas. En algúns casos esto implica que son entregadas a diferentes servidores e gárdanse copias alí. Facemos un esforzo sincero para limitar o acceso a esas publicacións só as persoas autorizadas, pero outros servidores poderían non ser tan escrupulosos. Polo tanto, é importante revisar os servidores onde se hospedan as súas seguidoras. Nos axustes pode activar a opción de aprovar ou rexeitar novas seguidoras de xeito manual. Teña en conta que a administración do servidor e todos os outros servidores implicados poden ver as mensaxes., e as destinatarias poderían facer capturas de pantalla, copiar e voltar a compartir as mensaxes. Non comparta información comprometida en Mastodon.
-
IPs e outros metadatos: Cando se conecta, gravamos o IP desde onde se conecta, así como o nome do aplicativo desde onde o fai. Todas as sesións conectadas están dispoñibles para revisar e revogar nos axustes. O último enderezo IP utilizado gárdase ate por 12 meses. Tamén poderiamos gardar informes do servidor que inclúan o enderezo IP de cada petición ao servidor.
+
Información básica da conta: Si se rexistra en este servidor, pediráselle un nome de usuaria, un enderezo de correo electrónico e un contrasinal. De xeito adicional tamén poderá introducir información como un nome público e biografía, tamén subir unha fotografía de perfil e unha imaxe para a cabeceira. O nome de usuaria, o nome público, a biografía e as imaxes de perfil e cabeceira sempre se mostran publicamente.
+
Publicacións, seguimento e outra información pública: O listado das persoas que segue é un listado público, o mesmo acontece coas súas seguidoras. Cando evía unha mensaxe, a data e hora gárdanse así como o aplicativo que utilizou para enviar a mensaxe. As publicacións poderían conter ficheiros de medios anexos, como fotografías e vídeos. As publicacións públicas e as non listadas están dispoñibles de xeito público. Cando destaca unha publicación no seu perfil tamén é pública. As publicacións son enviadas as súas seguidoras, en algúns casos pode acontecer que estén en diferentes servidores e gárdanse copias neles. Cando elemina unha publicación tamén se envía as súas seguidoras. A acción de voltar a publicar ou marcar como favorita outra publicación sempre é pública.
+
Mensaxes directas e só para seguidoras: Todas as mensaxes gárdanse e procésanse no servidor. As mensaxes só para seguidoras son entregadas as súas seguidoras e as usuarias que son mencionadas en elas, e as mensaxes directas entréganse só as usuarias mencionadas en elas. En algúns casos esto implica que son entregadas a diferentes servidores e gárdanse copias alí. Facemos un esforzo sincero para limitar o acceso a esas publicacións só as persoas autorizadas, pero outros servidores poderían non ser tan escrupulosos. Polo tanto, é importante revisar os servidores onde se hospedan as súas seguidoras. Nos axustes pode activar a opción de aprovar ou rexeitar novas seguidoras de xeito manual. Teña en conta que a administración do servidor e todos os outros servidores implicados poden ver as mensaxes., e as destinatarias poderían facer capturas de pantalla, copiar e voltar a compartir as mensaxes. Non comparta información comprometida en Mastodon.
+
IPs e outros metadatos: Cando se conecta, gravamos o IP desde onde se conecta, así como o nome do aplicativo desde onde o fai. Todas as sesións conectadas están dispoñibles para revisar e revogar nos axustes. O último enderezo IP utilizado gárdase ate por 12 meses. Tamén poderiamos gardar informes do servidor que inclúan o enderezo IP de cada petición ao servidor.
@@ -916,9 +945,9 @@ gl:
Toda a información que recollemos podería ser utilizada dos seguintes xeitos:
-
Para proporcionar a funcionabiliade básica de Mastodon. Só pode interactuar co contido de outra xente e publicar o seu propio contido si está conectada. Por exemplo, podería seguir outra xente e ver as súas publicacións combinadas nunha liña temporal inicial persoalizada.
-
Para axudar a moderar a comunidade, por exemplo comparando o seu enderezo IP con outros coñecidos para evitar esquivar os rexeitamentos ou outras infraccións.
-
O endero de correo electrónico que nos proporciona podería ser utilizado para enviarlle información, notificacións sobre outra xente que interactúa cos seus contidos ou lle envía mensaxes, e para respostar a consultas, e/ou outras cuestións ou peticións.
+
Para proporcionar a funcionabiliade básica de Mastodon. Só pode interactuar co contido de outra xente e publicar o seu propio contido si está conectada. Por exemplo, podería seguir outra xente e ver as súas publicacións combinadas nunha liña temporal inicial persoalizada.
+
Para axudar a moderar a comunidade, por exemplo comparando o seu enderezo IP con outros coñecidos para evitar esquivar os rexeitamentos ou outras infraccións.
+
O endero de correo electrónico que nos proporciona podería ser utilizado para enviarlle información, notificacións sobre outra xente que interactúa cos seus contidos ou lle envía mensaxes, e para respostar a consultas, e/ou outras cuestións ou peticións.
@@ -934,8 +963,8 @@ gl:
Faremos un sincero esforzo en:
-
Protexer informes do servidor que conteñan direccións IP das peticións ao servidor, ate a data estos informes gárdanse por non máis de 90 días.
-
Reter os enderezos IP asociados con usuarias rexistradas non máis de 12 meses.
+
Protexer informes do servidor que conteñan direccións IP das peticións ao servidor, ate a data estos informes gárdanse por non máis de 90 días.
+
Reter os enderezos IP asociados con usuarias rexistradas non máis de 12 meses.
Pode solicitar e descargar un ficheiro cos seus contidos, incluíndo publicacións, anexos de medios, imaxes de perfil e imaxe da cabeceira.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index e471c4d02..5e50f738d 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -4,7 +4,6 @@ he:
about_hashtag_html: אלו סטטוסים פומביים המתוייגים בתור#%{hashtag}. ניתן להגיב, להדהד או לחבב אותם אם יש לך חשבון בכל מקום בפדרציה.
about_mastodon_html: מסטודון היא רשת חברתית חופשית, מבוססת תוכנה חופשית ("קוד פתוח"). כאלטרנטיבה בלתי ריכוזית לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד — לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ברשת החברתית באופן חלק.
about_this: אודות שרת זה
- api: API
apps: יישומונים לנייד
contact: יצירת קשר
contact_missing: ללא הגדרה
@@ -17,21 +16,17 @@ he:
hosted_on: מסטודון שיושב בכתובת %{domain}
learn_more: מידע נוסף
source_code: קוד מקור
- status_count_after: הודעות
status_count_before: שכתבו
- user_count_after: משתמשים
user_count_before: ביתם של
what_is_mastodon: מה זה מסטודון?
accounts:
follow: לעקוב
- followers: עוקבים
following: נעקבים
media: מדיה
moved_html: "%{name} עבר(ה) אל %{new_profile_link}:"
nothing_here: אין פה שום דבר!
people_followed_by: הנעקבים של %{name}
people_who_follow: העוקבים של %{name}
- posts: הודעות
posts_with_replies: חצרוצים ותגובות
reserved_username: שם המשתמש שמור
roles:
@@ -146,9 +141,6 @@ he:
reject_media: חסימת קבצי מדיה
reject_media_hint: מסירה קבצי מדיה השמורים מקומית ומונעת מהורדת קבצים נוספים בעתיד. לא רלוונטי להשעיות
show:
- affected_accounts:
- one: חשבון אחד במסד הנתונים מושפע
- other: "%{count} חשהבונות במסד הנתונים מושפעים"
retroactive:
silence: הסרת השתקה מכל החשבונות על שרת זה
suspend: הסרת השעייה מכל החשבונות על שרת זה
@@ -234,18 +226,15 @@ he:
content: בדיקת אבטחה נכשלה. החסמת עוגיותיך מפנינו?
title: בדיקת בטיחות נכשלה
'429': הוחנק
+ '500':
exports:
blocks: רשימת חסימות
- csv: CSV
follows: רשימת נעקבים
mutes: רשימת השתקות
storage: אחסון מדיה
generic:
changes_saved_msg: השינויים נשמרו בהצלחה!
save_changes: שמור שינויים
- validation_errors:
- one: משהו לא לגמרי בסדר עדיין! אנא הציצו על השגיאה מטה
- other: משהו לא לגמרי בסדר עדיין! אנא הציצו על %{count} השגיאות מטה
imports:
preface: ניתן ליבא מידע מסויים כגון כל הנעקבים או המשתמשים החסומים לתוך חשבונך על שרת זה, מתוך קבצים שנוצרו על ידי יצוא משרת אחר כגון רשימת הנעקבים והחסומים שלך.
success: כל המידע יובא בהצלחה, ויעובד בזמן הקרוב
@@ -254,6 +243,14 @@ he:
following: רשימת נעקבים
muting: רשימת השתקות
upload: יבוא
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
media_attachments:
validations:
images_and_video: לא ניתן להוסיף וידאו לחצרוץ שכבר מכיל תמונות
@@ -262,12 +259,6 @@ he:
digest:
body: להלן סיכום זריז של הדברים שקרו על מאז ביקורך האחרון ב-%{since}
mention: "%{name} פנה אליך ב:"
- new_followers_summary:
- one: נוסף לך עוקב! סחתיין!
- other: נוספו לך %{count} עוקבים חדשים! מעולה!
- subject:
- one: "התראה חדשה אחת מאז ביקורך האחרון \U0001F418"
- other: "%{count} התראות חדשות \U0001F418"
favourite:
body: 'חצרוצך חובב על ידי %{name}:'
subject: חצרוצך חובב על ידי %{name}
@@ -283,21 +274,9 @@ he:
reblog:
body: 'חצרוצך הודהד על ידי %{name}:'
subject: חצרוצך הודהד על ידי%{name}
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
next: הבא
prev: הקודם
- truncate: "…"
remote_follow:
acct: נא להקליד שם_משתמש@קהילה מהם ברצונך לעקוב
missing_resource: לא ניתן למצוא קישורית להפניה לחשבונך
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f9c552bce..a4fe62055 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -5,18 +5,13 @@ hr:
about_this: O ovoj instanci
contact: Kontakt
source_code: Izvorni kod
- status_count_after: statusi
status_count_before: Tko je autor
- user_count_after: korisnici
- user_count_before: Home to
accounts:
follow: Slijedi
- followers: Sljedbenici
following: Slijedim
nothing_here: Ovdje nema ničeg!
people_followed_by: Ljudi koje %{name} slijedi
people_who_follow: Ljudi koji slijede %{name}
- posts: Postovi
unfollow: Prestani slijediti
application_mailer:
settings: 'Promijeni e-mail postavke: %{link}'
@@ -44,22 +39,24 @@ hr:
about_x_years: "%{count}g"
almost_x_years: "%{count}g"
half_a_minute: upravo
- less_than_x_minutes: "%{count}m"
less_than_x_seconds: upravo
over_x_years: "%{count}g"
- x_days: "%{count}d"
- x_minutes: "%{count}m"
x_months: "%{count}mj"
x_seconds: "%{count}sek"
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
exports:
blocks: Blokirao si
- csv: CSV
follows: Slijediš
storage: Pohrana media zapisa
generic:
changes_saved_msg: Izmjene su uspješno sačuvane!
save_changes: Sačuvaj izmjene
- validation_errors: Nešto još uvijek ne štima! Vidi %{count} greške ispod
imports:
preface: Možeš uvesti određene podatke kao što su svi ljudi koje slijediš ili blokiraš u svoj račun na ovoj instanci, sa fajlova kreiranih izvozom sa druge instance.
success: Tvoji podaci su uspješno uploadani i bit će obrađeni u dogledno vrijeme
@@ -67,13 +64,18 @@ hr:
blocking: Lista blokiranih
following: Lista onih koje slijedim
muting: Lista utišanih
- upload: Upload
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
notification_mailer:
digest:
body: Ovo je kratak sažetak propuštenog od tvog prošlog posjeta %{since}
mention: "%{name} te je spomenuo:"
- new_followers_summary: Imaš %{count} novih sljedbenika! Prekrašno!
- subject: "%{count} novih notifikacija od tvog prošlog posjeta \U0001F418"
favourite:
body: 'Tvoj status je %{name} označio kao omiljen:'
subject: "%{name} je označio kao omiljen tvoj status"
@@ -89,17 +91,6 @@ hr:
reblog:
body: 'Tvoj status je potaknut od %{name}:'
subject: "%{name} je potakao tvoj status"
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
next: Sljedeći
prev: Prošli
@@ -127,9 +118,6 @@ hr:
stream_entries:
reblogged: potaknut
sensitive_content: Osjetljivi sadržaj
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
two_factor_authentication:
description_html: Ako omogućiš dvo-faktorsku autentifikaciju, prijavljivanje će zahtjevati da kod sebe imaš svoj mobitel, koji će generirati tokene koje ćeš unijeti.
disable: Onemogući
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index b6029eeca..d771b9683 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1,52 +1,101 @@
---
hu:
about:
- about_hashtag_html: Ezek a #%{hashtag} címkével ellátott publikus tülkök. Reagálhatsz rájuk, ha már van felhasználói fiókod valahol a föderációban.
- about_mastodon_html: Mastodon egy szabad, nyílt forráskódú szociális hálózati kiszolgálo. Egy központosítatlan alternatíva a kereskedelmi platformokra, elkerüli a kommunikációd monopolizációját veszélyét. Bárki futtathatja a Mastodon-t és részt vehet a szociális hálózatban.
+ about_hashtag_html: Ezek a #%{hashtag} hashtag-gel ellátott publikus tülkök. Reagálhatsz rájuk, ha már van felhasználói fiókod valahol a föderációban.
+ about_mastodon_html: A Mastodon egy szabad webes protokollokat használó, nyílt forráskódú szociális háló. Decentralizált, akár az e-mail.
about_this: Rólunk
+ active_count_after: aktív
+ active_footnote: Havonta aktív felhasználók
+ administered_by: 'Adminisztrátor:'
+ api: API
+ apps: Mobil appok
+ apps_platforms: Használd a Mastodont iOS-ről, Androidról vagy más platformról
+ browse_directory: Böngészd a profil adatbázist és szűrj érdeklődési kör szerint
+ browse_public_posts: Nézz bele a Mastodon élő adatfolyamába
contact: Kapcsolat
contact_missing: Nincs megadva
contact_unavailable: N/A
+ discover_users: Találj meg másokat
+ documentation: Dokumentáció
extended_description_html: |
Ez itt a szabályzat helye
Még nem állítottál be bővebb leírást.
+ federation_hint_html: Egy %{instance} fiókkal bármely más Mastodon szerveren vagy a föderációban lévő felhasználót követni tudsz.
generic_description: "%{domain} csak egy a számtalan szerver közül a föderációban"
- hosted_on: "%{domain} Mastodon instancia"
+ get_apps: Próbálj ki egy mobil appot
+ hosted_on: "%{domain} Mastodon szerver"
learn_more: Tudj meg többet
+ privacy_policy: Adatvédelmi szabályzat
+ see_whats_happening: Nézd, mi történik
+ server_stats: 'Szerver statisztika:'
source_code: Forráskód
- status_count_after: tülköt küldött
+ status_count_after:
+ one: tülköt küldött
+ other: tülköt küldött
status_count_before: eddig
- user_count_after: felhasználónk
+ tagline: Kövess barátokat és találj újakat
+ terms: Felhasználási feltételek
+ user_count_after:
+ one: felhasználónk
+ other: felhasználónk
user_count_before: Összesen
what_is_mastodon: Mi a Mastodon?
accounts:
+ choices_html: "%{name} választásai:"
follow: Követés
- followers: Követők
- following: Követed őket
+ followers:
+ one: Követő
+ other: Követő
+ following: Követett
+ joined: Csatlakozott %{date}
+ last_active: utoljára aktív
+ link_verified_on: A link tulajdonosát %{date} -n ellenőriztük
media: Média
moved_html: "%{name} ide költözött: %{new_profile_link}"
+ network_hidden: Ez az információ nem elérhető
nothing_here: Nincs itt semmi!
- people_followed_by: "%{name} követett személyei"
+ people_followed_by: "%{name} követettjei"
people_who_follow: "%{name} követői"
- posts: Tülkök
- posts_with_replies: Tülkök és válaszok
- reserved_username: Ez egy már lefoglalt felhasználónév
+ pin_errors:
+ following: Ehhez szükséges, hogy kövesd már a felhasználót
+ posts:
+ one: Tülk
+ other: Tülk
+ posts_tab_heading: Tülkölés
+ posts_with_replies: Tülkölés válaszokkal
+ reserved_username: Ez már foglalt felhasználónév
roles:
admin: Adminisztrátor
+ bot: Bot
moderator: Moderátor
- unfollow: Követés abbahagyása
+ unavailable: Nincs ilyen profil
+ unfollow: Követés vége
admin:
+ account_actions:
+ action: Művelet végrehajtása
+ title: "%{acct} moderálása"
account_moderation_notes:
- create: Új bejegyzés
+ create: Új moderációs bejegyzés
created_msg: Moderációs bejegyzés létrehozva!
delete: Törlés
destroyed_msg: Moderációs bejegyzés törölve!
accounts:
+ approve: Jóváhagyás
+ approve_all: Mindet jóváhagy
are_you_sure: Biztos vagy benne?
+ avatar: Profilkép
by_domain: Domain
+ change_email:
+ changed_msg: A fiókhoz tartozó e-mailt megváltoztattuk!
+ current_email: Jelenlegi e-mail
+ label: E-mail megváltoztatása
+ new_email: Új e-mail
+ submit: E-mail megváltoztatása
+ title: "%{username} felhasználó e-mail változás"
confirm: Megerősítés
confirmed: Megerősítve
- confirming: Megerősítve
+ confirming: Megerősítés alatt
+ deleted: Törölve
demote: Lefokozás
disable: Kikapcsolás
disable_two_factor_authentication: Kétlépcsős azonosítás kikapcsolása
@@ -56,42 +105,54 @@ hu:
edit: Szerkesztés
email: E-mail
email_status: E-mail állapot
- enable: Engedélyezés
- enabled: Engedélyezve
+ enable: Bekapcsolás
+ enabled: Bekapcsolva
feed_url: Hírcsatorna URL
- followers: Követők
- followers_url: Követők URL
- follows: Követettek
+ followers: Követő
+ followers_url: Követő URL
+ follows: Követett
+ header: Fejléc
inbox_url: Beérkezett üzenetek URL
+ invited_by: Meghívta
ip: IP
+ joined: Csatlakozott
location:
all: Összes
local: Helyi
remote: Távoli
title: Hely
- login_status: Bejelentkezve
+ login_status: Bejelentkezési állapot
media_attachments: Média-csatolmányok
memorialize: Emlékállítás
moderation:
+ active: Aktív
all: Összes
+ pending: Függőben
silenced: Némítva
suspended: Felfüggesztve
title: Moderáció
moderation_notes: Moderációs bejegyzés
most_recent_activity: Legutóbbi tevékenységek
most_recent_ip: Legutóbbi IP-cím
+ no_account_selected: Nem változott meg egy fiók sem, mert semmi sem volt kiválasztva
+ no_limits_imposed: Nem állítottunk be határértéket
not_subscribed: Nincs feliratkozás
outbox_url: Kimenő üzenetek URL
- perform_full_suspension: Teljes felfüggesztés
+ pending: Engedélyezés alatt
+ perform_full_suspension: Felfüggesztés
profile_url: Profil URL
promote: Előléptetés
protocol: Protokoll
public: Nyilvános
push_subscription_expires: A PuSH feliratkozás elévül
redownload: Profilkép frissítése
+ reject: Elutasítás
+ reject_all: Összes elutasítása
+ remove_avatar: Profilkép eltávolítása
+ remove_header: Fejléc törlése
resend_confirmation:
already_confirmed: Ezt a felhasználót már megerősítették
- send: Küldd újra a megerősítő email-t
+ send: Küldd újra a megerősítő e-mailt
success: A megerősítő e-mail sikeresen elküldve!
reset: Visszaállítás
reset_password: Jelszó visszaállítása
@@ -104,86 +165,130 @@ hu:
user: Felhasználó
salmon_url: Salmon URL
search: Keresés
- shared_inbox_url: Bejövő üzenetek URL keresése
+ shared_inbox_url: Megosztott bejövő üzenetek URL
show:
- created_reports: Ezen fiók által létrehozott jelentések
- targeted_reports: Jelentések ezzel a fiókkal kapcsolatban
+ created_reports: Létrehozott jelentések
+ targeted_reports: Jelentések ezzel kapcsolatban
silence: Némítás
+ silenced: Némított
statuses: Tülkök
subscribe: Feliratkozás
+ suspended: Felfüggesztett
+ time_in_queue: Várakozás a sorban %{time}
title: Fiókok
+ unconfirmed_email: Nem megerősített e-mail
undo_silenced: Némítás visszavonása
undo_suspension: Felfüggesztés visszavonása
unsubscribe: Leiratkozás
username: Felhasználónév
- web: Weboldal
+ warn: Figyelmeztetés
+ web: Web
action_logs:
actions:
+ assigned_to_self_report: "%{name} a %{target} bejelentést magához rendelte"
+ change_email_user: "%{name} megváltoztatta %{target} felhasználó e-mail címét"
confirm_user: "%{name} megerősítette e-mail címét: %{target}"
- create_custom_emoji: "%{name} új hangulatjelet töltött fel: %{target}"
+ create_account_warning: "%{name} figyelmeztetést küldött %{target} felhasználónak"
+ create_custom_emoji: "%{name} új emojit töltött fel: %{target}"
create_domain_block: "%{name} letiltotta az alábbi domaint: %{target}"
create_email_domain_block: "%{name} feketelistára tette az alábbi e-mail domaint: %{target}"
demote_user: "%{name} lefokozta az alábbi felhasználót: %{target}"
+ destroy_custom_emoji: "%{name} törölte az emojit: %{target}"
destroy_domain_block: "%{name} engedélyezte az alábbi domaint: %{target}"
destroy_email_domain_block: "%{name} fehérlistára tette az alábbi e-mail domaint: %{target}"
destroy_status: "%{name} eltávolította az alábbi felhasználó tülkjét: %{target}"
disable_2fa_user: "%{name} kikapcsolta a kétlépcsős azonosítást %{target} felhasználó fiókján"
- disable_custom_emoji: "%{name} letiltotta az alábbi hangulatjelet: %{target}"
+ disable_custom_emoji: "%{name} letiltotta az alábbi emojit: %{target}"
disable_user: "%{name} letiltotta az alábbi felhasználó bejelentkezését: %{target}"
- enable_custom_emoji: "%{name} engedélyezte az alábbi hangulatjelet: %{target}"
+ enable_custom_emoji: "%{name} engedélyezte az alábbi emojit: %{target}"
enable_user: "%{name} engedélyezte az alábbi felhasználó bejelentkezését: %{target}"
memorialize_account: "%{name} emléket állított az alábbi felhasználónak: %{target}"
promote_user: "%{name} előléptette az alábbi felhasználót: %{target}"
+ remove_avatar_user: "%{name} törölte %{target} profilképét"
+ reopen_report: "%{name} újranyitotta a bejelentést: %{target}"
reset_password_user: "%{name} visszaállította az alábbi felhasználó jelszavát: %{target}"
- resolve_report: "%{name} mellőzte az alábbi jelentést: %{target}"
+ resolve_report: "%{name} megoldotta alábbi bejelentést: %{target}"
silence_account: "%{name} lenémította %{target} felhasználói fiókját"
suspend_account: "%{name} felfüggesztette %{target} felhasználói fiókját"
+ unassigned_report: "%{name} törölte a %{target} bejelentés hozzárendelését"
unsilence_account: "%{name} feloldotta a némítást %{target} felhasználói fiókján"
unsuspend_account: "%{name} feloldotta %{target} felhasználói fiókjának felfüggesztését"
- update_custom_emoji: "%{name} frissítette az alábbi hangulatjelet: %{target}"
+ update_custom_emoji: "%{name} frissítette az alábbi emojit: %{target}"
update_status: "%{name} frissítette %{target} felhasználó tülkjét"
+ deleted_status: "(törölt tülk)"
title: Audit napló
custom_emojis:
by_domain: Domain
- copied_msg: Sikeresen létrehoztuk a hangulatjel helyi másolatát
+ copied_msg: Sikeresen létrehoztuk az emoji helyi másolatát
copy: Másolás
- copy_failed_msg: Hangulatjel helyi másolatának létrehozása sikertelen
- created_msg: Hangulatjel létrehozva!
+ copy_failed_msg: Emoji helyi másolatának létrehozása sikertelen
+ created_msg: Emoji létrehozva!
delete: Törlés
- destroyed_msg: A hangulatjel törlése sikeres!
+ destroyed_msg: Emoji törlése sikeres!
disable: Letiltás
- disabled_msg: Hangulatjel letiltva
- emoji: Hangulatjel
+ disabled_msg: Emoji letiltva
+ emoji: Emoji
enable: Engedélyezés
- enabled_msg: Hangulatjel engedélyezve
+ enabled_msg: Emoji engedélyezve
image_hint: PNG (maximális méret 50KB)
listed: Listázva
new:
- title: Új egyedi hangulatjel hozzáadása
+ title: Új egyedi emoji hozzáadása
overwrite: Felülírás
- shortcode: Shortcode
+ shortcode: Rövidítés
shortcode_hint: Legalább két karakter, csak betűk, számok és alsóvonás
- title: Egyedi hangulatjelek
+ title: Egyedi emojik
unlisted: Nincs listázva
- update_failed_msg: Nem sikerült frissíteni a hangulatjelet
- updated_msg: Hangulatjel sikeresen frissítve!
+ update_failed_msg: Nem sikerült frissíteni az emojit
+ updated_msg: Emoji sikeresen frissítve!
upload: Feltöltés
+ dashboard:
+ backlog: hátralévő feladatok
+ config: Beállítások
+ feature_deletions: Fióktörlések
+ feature_invites: Meghívó linkek
+ feature_profile_directory: Profil adatbázis
+ feature_registrations: Regisztráció
+ feature_relay: Föderációs relé
+ feature_timeline_preview: Idővonal betekintő
+ features: Funkciók
+ hidden_service: Föderáció rejtett szolgáltatásokkal
+ open_reports: nyitott bejelentések
+ recent_users: Legutóbbi felhasználók
+ search: Keresés teljes szövegben
+ single_user_mode: Egyfelhasználós mód
+ software: Szoftver
+ space: Tárhely használat
+ title: Műszerfal
+ total_users: felhasználó összesen
+ trends: Trendek
+ week_interactions: interakció ezen a héten
+ week_users_active: aktív ezen a héten
+ week_users_new: felhasználó ezen a héten
domain_blocks:
- add_new: Új hozzáadása
+ add_new: Új tiltott domain hozzáadása
created_msg: A domain-tiltás feldolgozása folyamatban
destroyed_msg: A domain tiltása feloldva
domain: Domain
+ existing_domain_block_html: A %{name} domainen már szorosabb korlátokat állítottál be, először oldd fel a tiltást.
new:
create: Tiltás létrehozása
- hint: A domain-tiltás nem gátolja meg az új fiókok hozzáadását az abatbázishoz, de visszamenőlegesen és automatikusan aktivál bizonyos moderációs szabályokat ezen fiókok esetében.
+ hint: A domain tiltása nem gátolja meg az új fiókok hozzáadását az abatbázishoz, de visszamenőlegesen és automatikusan aktivál bizonyos moderációs szabályokat ezen fiókok esetében.
severity:
desc_html: A Némítás elrejti az adott felhasználó tülkjeit mindenki elől, aki nem követi az adott felhasználót. A Felfüggesztés eltávolítja az adott felhasználó által létrehozott minden tartalmat, ide értve a médiafájlokat és a fiókadatokat is. Válaszd az Egyik sem opciót, ha csupán a médiafájlokat szeretnéd elutasítani.
noop: Egyik sem
silence: Némítás
suspend: Felfüggesztés
- title: Új domain-tiltás
+ title: Új domain tiltása
reject_media: Médiafájlok elutasítása
reject_media_hint: Eltávolítja a helyben tárolt médiafájlokat és a továbbiakban letiltja az új médiafájlok letöltését. Felfüggesztett fiókok esetében irreleváns opció
+ reject_reports: Bejelentések elutasítása
+ reject_reports_hint: Erről a domainről származó minden bejelentés elutasítása. Felfüggesztett fiókok esetén irreleváns opció
+ rejecting_media: médiafájlok elutasítása
+ rejecting_reports: bejelentések elutasítása
+ severity:
+ silence: némítva
+ suspend: felfüggesztve
show:
affected_accounts:
one: Összesen egy fiók érintett az adatbázisban
@@ -193,7 +298,7 @@ hu:
suspend: Minden felhasználó felfüggesztésének feloldása ezen a domainen
title: "%{domain} domain tiltásának feloldása"
undo: Visszavonás
- undo: Visszavonás
+ undo: Domain tiltásának visszavonása
email_domain_blocks:
add_new: Új hozzáadása
created_msg: E-mail domain sikeresen hozzáadva a feketelistához
@@ -204,41 +309,111 @@ hu:
create: Domain hozzáadása
title: Új e-mail feketelista bejegyzés
title: E-mail feketelista
+ followers:
+ back_to_account: Vissza a fiókhoz
+ title: "%{acct} követői"
instances:
- title: Nyilvántartott instanciák
+ by_domain: Domain
+ delivery_available: Kézbesítés elérhető
+ known_accounts:
+ one: "%{count} ismert fiók"
+ other: "%{count} ismert fiók"
+ moderation:
+ all: Mind
+ limited: Korlátozott
+ title: Moderáció
+ title: Föderáció
+ total_blocked_by_us: Általunk letiltott
+ total_followed_by_them: Általuk követett
+ total_followed_by_us: Általunk követett
+ total_reported: Bejelentés róluk
+ total_storage: Média csatolmány
invites:
+ deactivate_all: Összes deaktiválása
filter:
all: Összes
available: Elérhető
expired: Elévült
title: Szűrő
title: Meghívások
+ pending_accounts:
+ title: Függőben lévő fiókok (%{count})
+ relays:
+ add_new: Új relé hozzáadása
+ delete: Törlés
+ description_html: A föderációs relé egy olyan köztes szerver, mely nagy mennyiségű publikus tülköt cserél az erre feliratkozó vagy publikáló szerverek között. Ezzel segíthet kis és közepes szervereknek tartalmat megtalálni a föderációban, mely egyébként csak akkor válna lehetővé, ha a saját felhasználóink más szervereken lévő fiókokat követnének.
+ disable: Kikapcsolás
+ disabled: Kikapcsolva
+ enable: Bekapcsolás
+ enable_hint: Ha bekapcsolod, a szerver minden nyilvános tülkre feliratkozik ezen a relén, valamint az összes nyilvános tülköt elküldi ennek.
+ enabled: Bekapcsolva
+ inbox_url: Relé URL
+ pending: Várakozás a relé jóváhagyására
+ save_and_enable: Mentés és engedélyezés
+ setup: Relé kapcsolat felállítása
+ status: Állapot
+ title: Relék
+ report_notes:
+ created_msg: Bejelentési feljegyzés létrehozva!
+ destroyed_msg: Bejelentési feljegyzés törölve!
reports:
+ account:
+ note: feljegyzés
+ report: bejelentés
action_taken_by: 'Kezelte:'
are_you_sure: Biztos vagy benne?
+ assign_to_self: Magamhoz rendelés
+ assigned: Hozzárendelt moderátor
comment:
none: Egyik sem
+ created_at: Jelentve
mark_as_resolved: Megjelölés megoldottként
+ mark_as_unresolved: Megjelölés megoldatlanként
+ notes:
+ create: Feljegyzés hozzáadása
+ create_and_resolve: Megoldás feljegyzéssel
+ create_and_unresolve: Újranyitás feljegyzéssel
+ delete: Törlés
+ placeholder: Jegyezd le, mi tettünk az ügy érdekében, vagy bármilyen változást...
+ reopen: Bejelentés újranyitása
report: "#%{id} számú jelentés"
reported_account: Bejelentett fiók
reported_by: 'Jelentette:'
resolved: Megoldott
+ resolved_msg: A bejelentést sikeresen megoldottuk!
status: Állapot
- title: Jelentések
+ title: Bejelentések
+ unassign: Hozzárendelés törlése
unresolved: Megoldatlan
+ updated_at: Frissítve
settings:
activity_api_enabled:
desc_html: Helyi tülkök, aktív felhasználók és új regisztrációk száma heti bontásban
title: Felhasználói aktivitás összesített statisztikájának publikussá tétele
bootstrap_timeline_accounts:
- desc_html: Az egyes felhasználónevek vesszővel elválasztva. Csak helyi és aktivált fiókok esetében működik. Üresen (alapértelmezettként) minden helyi adminisztrátorra érvényes.
+ desc_html: Az egyes felhasználóneveket vesszővel válaszd el! Csak helyi és aktivált fiókok esetében működik. Üresen (alapértelmezettként) minden helyi adminisztrátorra érvényes.
title: Alapértelmezett követések új felhasználók esetében
contact_information:
email: Kapcsolattartói e-mail cím
username: Kapcsolattartó felhasználóneve
+ custom_css:
+ desc_html: Változtasd meg a kinézetet ebben a CSS-ben, mely minden oldalon be fog töltődni
+ title: Egyedi CSS
+ hero:
+ desc_html: A kezdőoldalon látszik. Legalább 600x100px méret javasolt. Ha nincs beállítva, a szerver bélyegképet használjuk
+ title: Hősi kép
+ mascot:
+ desc_html: Több oldalon is látszik. Legalább 293×205px méret javasolt. Ha nincs beállítva, az alapértelmezett kabalát használjuk
+ title: Kabala kép
peers_api_enabled:
- desc_html: Domainek, amelyekkel ez az instancia kapcsolatban áll
- title: Instanciák listájának közzététele, melyekkel ez a szerver kapcsolatban áll
+ desc_html: Domainek, amelyekkel ez a szerver kapcsolatban áll
+ title: Szerverek listájának közzététele, melyekkel ez a szerver kapcsolatban áll
+ preview_sensitive_media:
+ desc_html: Más weboldalakon linkelt tartalmaink előnézetében mindenképp benne lesz egy bélyegkép még akkor is, ha a médiát szenzitívnek jelölték meg
+ title: Szenzitív média mutatása OpenGraph előnézetben
+ profile_directory:
+ desc_html: Lehetővé teszi, hogy a felhasználóinkat megtalálják
+ title: Profil adatbázis engedélyezése
registrations:
closed_message:
desc_html: Ez az üzenet jelenik meg a főoldalon, ha a regisztráció nem engedélyezett. HTML-tageket is használhatsz
@@ -247,38 +422,51 @@ hu:
desc_html: Engedélyezed a felhasználóknak, hogy töröljék fiókjukat
title: Fiók törlésének engedélyezése
min_invite_role:
- disabled: Senkinek
+ disabled: Senki
title: Meghívások engedélyezése
+ registrations_mode:
+ modes:
+ approved: A regisztráció engedélyhez kötött
+ none: Senki sem regisztrálhat
+ open: Bárki regisztrálhat
+ title: Regisztrációs mód
+ show_known_fediverse_at_about_page:
+ desc_html: Ha aktív, az előnézetben minden tülk megjelenik a velünk kapcsolatban álló szerverekről, egyébként csak helyi tülköket mutatunk.
+ title: Mutassuk az általunk ismert föderációt az idővonal előnézetben
show_staff_badge:
desc_html: Stáb-jelvény megjelenítése a felhasználó oldalán
title: Stáb-jelvény megjelenítése
site_description:
- desc_html: 'Rövid bemutatkozás a főoldalon és a meta fejlécekben. Az alábbi HTML-tageket használhatod: <a> és <em>.'
- title: Az instancia bemutatása
+ desc_html: Rövid bemutatkozás a főoldalon és a meta fejlécekben. Írd le, mi teszi ezt a szervert különlegessé! Használhatod a <a> és <em> HTML tageket.
+ title: A szerver bemutatása
site_description_extended:
- desc_html: Ide teheted például a közösségi és egyéb szabályzatot, útmutatókat és mindent, ami egyedivé teszi instanciádat. HTML-tageket is használhatsz
+ desc_html: Ide teheted például a közösségi és egyéb szabályzatot, útmutatókat és mindent, ami egyedivé teszi szerveredet. HTML-tageket is használhatsz
title: További egyedi információ
+ site_short_description:
+ desc_html: Oldalsávban és meta tag-ekben jelenik meg. Írd le, mi teszi ezt a szervert különlegessé egyetlen bekezdésben.
+ title: Rövid leírás
site_terms:
desc_html: Megírhatod saját adatkezelési szabályzatodat, felhasználási feltételeidet vagy más hasonló jellegű dokumentumodat. HTML-tageket is használhatsz
title: Egyedi felhasználási feltételek
- site_title: Az instancia neve
+ site_title: A szerver neve
thumbnail:
- desc_html: Az OpenGraph és API előnézetekhez használjuk. Ajánlott mérete 1200x560 pixel
- title: Az instancia bélyegképe
+ desc_html: OpenGraph-os és API-s előnézetekben használjuk. Ajánlott mérete 1200x630 pixel
+ title: A szerver bélyegképe
timeline_preview:
- desc_html: Publikus időfolyam megjelenítése a főoldalon
- title: Időfolyam előnézete
- title: Oldal beállításai
+ desc_html: Nyilvános idővonal megjelenítése a főoldalon
+ title: Idővonal előnézete
+ title: Webhely beállításai
statuses:
back_to_account: Vissza a fiók oldalára
batch:
delete: Törlés
- nsfw_off: Szenzitív tartalom kikapcsolva
- nsfw_on: Szenzitív tartalom bekapcsolva
+ nsfw_off: Szenzitív megjelölés törlése
+ nsfw_on: Megjelölés szenzitív tartalomként
failed_to_execute: Végrehajtás sikertelen
media:
title: Média
no_media: Nem található médiafájl
+ no_status_selected: Nem változtattunk meg semmit, mert semmi sem volt kiválasztva
title: Felhasználó tülkjei
with_media: Médiafájlokkal
subscriptions:
@@ -288,14 +476,38 @@ hu:
last_delivery: Utolsó kézbesítés
title: WebSub
topic: Téma
+ tags:
+ accounts: Fiókok
+ hidden: Rejtett
+ hide: Ne jelenjen meg a profilok adatbázisában
+ name: Hashtag
+ title: Hashtagek
+ unhide: Jelenjen meg a profilok adatbázisában
+ visible: Látható
title: Karbantartás
+ warning_presets:
+ add_new: Új hozzáadása
+ delete: Törlés
+ edit: Szerkesztés
+ edit_preset: Figyelmeztetés szerkesztése
+ title: Figyelmeztetések
admin_mailer:
+ new_pending_account:
+ body: Az új fiók részletesen alább látható. Ezt a jelentkezést engedélyezheted vagy elutasíthatod.
+ subject: Új fiók (%{username}) engedélyezésre vár a %{instance} szerveren
new_report:
body: "%{reporter} jelentette: %{target}"
- subject: 'Új jelentés az alábbi instancián: %{instance} (#%{id})'
+ body_remote: Valaki a %{domain} domainről jelentette %{target}
+ subject: 'Új jelentés az alábbi szerveren: %{instance} (#%{id})'
+ appearance:
+ advanced_web_interface: Haladó webes felület
+ advanced_web_interface_hint: 'Ha szeretnéd, a teljes képernyőszélességet felhasználhatod. A haladó webes felülettel különböző oszlopokat állíthatsz be, hogy egyszerre annyi infót láthass, amennyit csak akarsz: Saját idővonal, értesítések, föderációs idővonal, bármennyi lista vagy hashtag.'
+ animations_and_accessibility: Animáció és akadálymentesítés
+ confirmation_dialogs: Megerősítő párbeszédablakok
+ sensitive_content: Szenzitív tartalom
application_mailer:
notification_preferences: E-mail beállítások módosítása
- salutation: "%{name},"
+ salutation: "%{name}!"
settings: 'E-mail beállítások módosítása: %{link}'
view: 'Megtekintés:'
view_profile: Profil megtekintése
@@ -309,6 +521,10 @@ hu:
warning: Ez érzékeny adat. Soha ne oszd meg másokkal!
your_token: Hozzáférési kulcsod
auth:
+ apply_for_account: Meghívó kérése
+ change_password: Jelszó
+ checkbox_agreement_html: Egyetértek a szerver szabályaival és a felhasználási feltételekkel
+ confirm_email: E-mail megerősítése
delete_account: Felhasználói fiók törlése
delete_account_html: Felhasználói fiókod törléséhez kattints ide. A rendszer újbóli megerősítést fog kérni.
didnt_get_confirmation: Nem kaptad meg a megerősítési lépéseket?
@@ -318,12 +534,19 @@ hu:
logout: Kijelentkezés
migrate_account: Felhasználói fiók költöztetése
migrate_account_html: Ha szeretnéd átirányítani ezt a fiókodat egy másikra, a beállításokat itt találod meg.
+ or_log_in_with: Vagy jelentkezz be ezzel
+ providers:
+ cas: CAS
+ saml: SAML
register: Regisztráció
+ registration_closed: "%{instance} nem fogad új tagokat"
resend_confirmation: Megerősítési lépések újraküldése
reset_password: Jelszó visszaállítása
security: Biztonság
set_new_password: Új jelszó beállítása
+ trouble_logging_in: Problémád van a bejelentkezéssel?
authorize_follow:
+ already_following: Már követed ezt a felhasználót
error: Hiba történt a távoli felhasználó keresésekor
follow: Követés
follow_request: 'Engedélyt kértél az alábbi felhasználó követésére:'
@@ -352,9 +575,19 @@ hu:
confirm_password: Személyazonosságod megerősítéséhez írd be a jelenlegi jelszavad
description_html: Ezzel véglegesen és visszafordíthatatlanul törlöd minden tartalmadat és deaktiválod a fiókodat. A felhasználónevedet megtartjuk, hogy megakadályozzuk a neveddel történő jövőbeni visszaélések lehetőségét.
proceed: Felhasználói fiók törlése
- success_msg: Felhasználói fiókod sikeresen törölve lett
- warning_html: Csak azt tudjuk garantálni, hogy az általad létrehozott tartalmat erről az instanciáról töröljük. Ha egyes tartalmaidat sokan megosztották, valószínűleg marad nyomuk a megosztások miatt. Nam fogjuk tudni frissíteni azon instanciák adatbázisát, amelyek nem kapcsolódnak a föderációhoz vagy amelyek leiratkoztak a tülkjeidről.
+ success_msg: Felhasználói fiókod sikeresen töröltük
+ warning_html: Csak azt tudjuk garantálni, hogy az általad létrehozott tartalmat erről a szerverről töröljük. Ha egyes tartalmaidat sokan megosztották, valószínűleg marad nyomuk a megosztások miatt. Nem fogjuk tudni frissíteni azon szerverek adatbázisát, amelyek nem kapcsolódnak a föderációhoz vagy amelyek leiratkoztak a tülkjeidről.
warning_title: Szórt tartalmak elérése
+ directories:
+ directory: Profilok
+ enabled: Szerepelsz a profil adatbázisban.
+ enabled_but_waiting: Engedélyezted, hogy szerepelj a profil adatbázisban, de még nincs elegendő követőd (%{min_followers}) ehhez.
+ explanation: Találj másokra érdeklődésük alapján
+ explore_mastodon: "%{title} felfedezése"
+ how_to_enable: Nem engedélyezted a profil adatbázisban való megjelenésed. Engedélyezheted alább. Használj hashtageket az életrajzodban, hogy az ezekhez tartozó listákba bekerülj!
+ people:
+ one: "%{count} ember"
+ other: "%{count} ember"
errors:
'403': Nincs jogosultságod az oldal megtekintéséhez.
'404': Az általad keresett oldal nem található.
@@ -362,28 +595,93 @@ hu:
'422':
content: Megerősítés sikertelen. Nem tiltottad le esetleg a sütiket?
title: Megerősítés sikertelen
- '429': Kampec
+ '429': Korlátozva
'500':
content: Sajnáljuk, valami hiba történt a mi oldalunkon.
title: Az oldal nem megfelelő
- noscript_html: A Mastodon webalkalmazás használatához engedélyezned kell a JavaScriptet. A másik megoldás, hogy kipróbálod az egyik, a platformodnak megfelelő alkalmazást.
+ noscript_html: A Mastodon webalkalmazás használatához engedélyezned kell a JavaScriptet. A másik megoldás, hogy kipróbálsz egy platformodnak megfelelő alkalmazást.
+ existing_username_validator:
+ not_found: ezzel a névvel nem találtunk helyi felhasználót
+ not_found_multiple: nem találtuk %{usernames} felhasználó(ka)t
exports:
+ archive_takeout:
+ date: Dátum
+ download: Archív letöltése
+ hint_html: Itt kérhető egy archív az összes feltöltött tülködről és médiádról. Az exportált adatok ActivityPub formátumban lesznek, melyet bármilyen szabványos program tud olvasni. 7 naponként kérhetsz ilyen archívot.
+ in_progress: Archív összeállítása...
+ request: Archív kérése
+ size: Méret
blocks: Tiltólistádon
csv: CSV
+ domain_blocks: Tiltott domainjeid
follows: Követettjeid
+ lists: Listáid
mutes: Némításaid
storage: Médiatároló
+ featured_tags:
+ add_new: Új hozzáadása
+ errors:
+ limit: Már kiemelted a maximálisan engedélyezett számú hashtaget
+ filters:
+ contexts:
+ home: Saját idővonal
+ notifications: Értesítések
+ public: Nyilvános idővonalak
+ thread: Beszélgetések
+ edit:
+ title: Szűrő szerkesztése
+ errors:
+ invalid_context: A megadott kontextus hamis vagy hiányzik
+ invalid_irreversible: Visszafordíthatatlan szűrést csak saját idővonalon vagy értesítéseken lehet végezni
+ index:
+ delete: Törlés
+ title: Szűrők
+ new:
+ title: Új szűrő hozzáadása
+ footer:
+ developers: Fejlesztőknek
+ more: Többet…
+ resources: Segédanyagok
generic:
- changes_saved_msg: Változások sikeresen elmentve!
+ all: Mind
+ changes_saved_msg: A változásokat elmentettük!
+ copy: Másolás
+ order_by: Rendezés
save_changes: Változások mentése
validation_errors:
one: Valami nincs rendjén! Kérlek tekintsd meg a hibát alant
other: Valami nincs rendjén! Kérlek tekintsd meg a %{count} darab hibát alant
+ html_validator:
+ invalid_markup: 'hibás HTML leíró: %{error}'
+ identity_proofs:
+ active: Aktív
+ authorize: Igen, engedélyezés
+ authorize_connection_prompt: Engedélyezed ezt a kriptografikus kapcsolatot?
+ errors:
+ failed: A kriptografikus kapcsolat sikertelen. Próbáld inkább innen %{provider}.
+ keybase:
+ invalid_token: A Keybase tokenek hashelt aláírások és pont 66 hexa karakterből állnak
+ verification_failed: A Keybase ezt a tokent nem ismerte fel a %{kb_username} Keybase felhasználó aláírásaként. Próbáld újra Keybase-ből.
+ wrong_user: Nem tudjuk tanúsítani %{proving} felhasználót amíg %{current} felhasználóként vagy bejelentkezve. Jelentkezz be %{proving} felhasználóként és próbáld újra.
+ explanation_html: Itt más személyazonosságaiddal tudsz kriptografikus kapcsolatot létesíteni, pl. Keybase profillal. Így mások titkosított üzenetet küldhetnek neked, valamint megbízhatnak az általad küldött tartalomban is.
+ i_am_html: "%{username} vagyok %{service} szerveren."
+ identity: Személyazonosság
+ inactive: Inaktív
+ publicize_checkbox: 'És ezt tülköld ki:'
+ publicize_toot: 'Tanúsítva! %{username} vagyok %{service}: %{url} szerveren'
+ status: Ellenőrzés állapota
+ view_proof: Tanúsítás megtekintése
imports:
- preface: Itt importálhatod egy másik instanciáról lementett adataidat, például követettjeid és letiltott felhasználóid listáját.
+ modes:
+ merge: Összefésülés
+ merge_long: Megtartjuk a meglévő bejegyzéseket és hozzávesszük az újakat
+ overwrite: Felülírás
+ overwrite_long: Lecseréljük újakkal a jelenlegi bejegyzéseket
+ preface: Itt importálhatod egy másik szerverről lementett adataidat, például követettjeid és letiltott felhasználóid listáját.
success: Adataidat sikeresen feltöltöttük és feldolgozásukat megkezdtük
types:
blocking: Letiltottak listája
+ domain_blocking: Letiltott domainek listája
following: Követettjeid listája
muting: Némított felhasználók listája
upload: Feltöltés
@@ -396,14 +694,16 @@ hu:
'21600': 6 óra
'3600': 1 óra
'43200': 12 óra
+ '604800': 1 hét
'86400': 1 nap
expires_in_prompt: Soha
generate: Generálás
+ invited_by: 'Téged meghívott:'
max_uses:
one: 1 felhasználás
other: "%{count} felhasználás"
max_uses_prompt: Nincs korlát
- prompt: Az itt generált linkek megosztásával hívhatod meg ismerőseidet az instanciára
+ prompt: Az itt generált linkek megosztásával hívhatod meg ismerőseidet erre a szerverre
table:
expires_at: Lejárat
uses: Használat
@@ -419,7 +719,7 @@ hu:
acct: Az új fiók felhasznalonev@domain formátumban
currently_redirecting: 'A profilod az alábbi fiókra van átirányítva:'
proceed: Mentés
- updated_msg: Fiókod átirányítási beállítasait sikeresen mentettük!
+ updated_msg: Fiókod átirányítási beállításait sikeresen mentettük!
moderation:
title: Moderáció
notification_mailer:
@@ -435,52 +735,95 @@ hu:
other: "%{count} új értesítésed érkezett legutóbbi látogatásod óta \U0001F418"
title: Amíg távol voltál…
favourite:
- body: 'Az állapotodat kedvencnek jelölte %{name}:'
- subject: "%{name} kedvencnek jelölte az állapotod"
+ body: 'A tülködet kedvencnek jelölte %{name}:'
+ subject: "%{name} kedvencnek jelölte a tülködet"
title: Új kedvencnek jelölés
follow:
body: "%{name} mostantól követ téged!"
subject: "%{name} mostantól követ téged"
title: Új követő
follow_request:
- action: Követési kérések kezelése
+ action: Követési kérelmek kezelése
body: "%{name} követni szeretne téged"
subject: 'Jóváhagyásra vár: %{name}'
- title: Új követési kérés
+ title: Új követési kérelem
mention:
action: Válasz
body: "%{name} megemlített téged:"
subject: "%{name} megemlített téged"
title: Új említés
reblog:
- body: 'Az állapotod reblogolta %{name}:'
- subject: "%{name} reblogolta az állapotod"
- title: Új reblog
+ body: 'A tülködet %{name} megtolta:'
+ subject: "%{name} megtolta a tülködet"
+ title: Új megtolás
number:
human:
decimal_units:
format: "%n%u"
units:
- billion: B
+ billion: Mrd
million: M
quadrillion: Q
thousand: K
trillion: T
- unit: " "
pagination:
+ newer: Újabb
next: Következő
+ older: Régebbi
prev: Előző
truncate: "…"
+ polls:
+ errors:
+ already_voted: Ezen a szavazáson már voksoltál
+ duplicate_options: duplázott elemeket tartalmaz
+ duration_too_long: túl távoli időpont
+ duration_too_short: túl közeli időpont
+ expired: A szavazásnak már vége
+ over_character_limit: egyik sem lehet %{max} karakternél hosszabb
+ too_few_options: több, mint egy opciónak kell lennie
+ too_many_options: nem lehet több, mint %{max} opció
preferences:
- languages: Nyelvek
other: Egyéb
- publishing: Közzététel
- web: Web
+ posting_defaults: Tülkölés alapértelmezései
+ public_timelines: Nyilvános idővonalak
+ relationships:
+ activity: Fiók aktivitás
+ dormant: Elhagyott
+ last_active: Utoljára aktív
+ most_recent: Legutóbbi
+ moved: Átköltöztetve
+ mutual: Kölcsönös
+ primary: Elsődleges
+ relationship: Kapcsolat
+ remove_selected_domains: A választott domainekről minden követő eltávolítása
+ remove_selected_followers: Kiválasztott követők eltávolítása
+ remove_selected_follows: Kiválasztottak követésének abbahagyása
+ status: Fiók állapota
remote_follow:
acct: Írd be a felhasználódat, amelyről követni szeretnéd felhasznalonev@domain formátumban
missing_resource: A fiókodnál nem található a szükséges átirányítási URL
+ no_account_html: Nincs fiókod? Regisztrálj itt
proceed: Tovább a követéshez
prompt: 'Őt tervezed követni:'
+ reason_html: "Miért van erre szükség?%{instance} nem feltétlenül az a szerver, ahol regisztrálva vagy, ezért először a saját szerveredre irányítunk."
+ remote_interaction:
+ favourite:
+ proceed: Jelöljük kedvencnek
+ prompt: 'Ezt a tülköt szeretnéd kedvencnek jelölni:'
+ reblog:
+ proceed: Megtolás
+ prompt: 'Ezt a tülköt szeretnéd megtolni:'
+ reply:
+ proceed: Válaszadás
+ prompt: 'Erre a tülkre szeretnél válaszolni:'
+ remote_unfollow:
+ error: Hiba
+ title: Cím
+ unfollowed: Nem követett
+ scheduled_statuses:
+ over_daily_limit: Túllépted az időzített tülkökre vonatkozó napi limitet (%{limit})
+ over_total_limit: Túllépted az időzített tülkökre vonatkozó limitet (%{limit})
+ too_soon: Az időzítéshez jövőbeni időpont kell
sessions:
activity: Legutóbbi tevékenység
browser: Böngésző
@@ -523,26 +866,54 @@ hu:
revoke_success: Munkamenet sikeresen visszavonva
title: Munkamenetek
settings:
+ account: Fiók
+ account_settings: Fiók beállítások
+ appearance: Megjelenés
authorized_apps: Jóváhagyott alkalmazások
back: Vissza a Mastodonhoz
delete: Fiók törlése
development: Fejlesztőknek
edit_profile: Profil szerkesztése
export: Adatok exportálása
+ featured_tags: Kiemelt hashtagek
+ identity_proofs: Személyazonosság tanúsítások
import: Importálás
+ import_and_export: Import és export
migrate: Fiók átirányítása
notifications: Értesítések
- preferences: Általános beállítások
+ preferences: Beállítások
+ profile: Profil
+ relationships: Követések és követők
two_factor_authentication: Kétlépcsős azonosítás
statuses:
+ attached:
+ description: 'Csatolva: %{attached}'
+ image:
+ one: "%{count} kép"
+ other: "%{count} kép"
+ video:
+ one: "%{count} videó"
+ other: "%{count} videó"
+ boosted_from_html: Megtolva innen %{acct_link}
+ content_warning: 'Tartalom figyelmeztetés: %{warning}'
+ disallowed_hashtags:
+ one: 'tiltott hashtaget tartalmaz: %{tags}'
+ other: 'tiltott hashtageket tartalmaz: %{tags}'
+ language_detection: Nyelv automatikus felismerése
open_in_web: Megnyitás a weben
over_character_limit: Túllépted a maximális %{max} karakteres keretet
pin_errors:
limit: Elérted a kitűzhető tülkök maximális számát
ownership: Nem tűzheted ki valaki más tülkjét
- private: Csak publikus tülköt tűzhetsz ki
- reblog: Reblogolt tülköt nem tudsz kitűzni
+ private: Csak nyilvános tülköt tűzhetsz ki
+ reblog: Megtolt tülköt nem tudsz kitűzni
+ poll:
+ total_votes:
+ one: "%{count} szavazat"
+ other: "%{count} szavazat"
+ vote: Szavazás
show_more: Mutass többet
+ sign_in_to_participate: Jelentkezz be, hogy részt vehess a beszélgetésben
title: '%{name}: "%{quote}"'
visibilities:
private: Csak követőknek
@@ -550,53 +921,163 @@ hu:
public: Nyilvános
public_long: Bárki láthatja a tülköt
unlisted: Listázatlan
- unlisted_long: Mindenki látja, de a nyilvános időfolyamokban nem jelenik meg
+ unlisted_long: Mindenki látja, de a nyilvános idővonalakon nem jelenik meg
stream_entries:
pinned: Kitűzött tülk
- reblogged: reblogolt
+ reblogged: megtolt
sensitive_content: Szenzitív tartalom
terms:
+ body_html: |
+
Adatvédelmi nyilatkozat
+
Milyen adatokat gyűjtünk?
+
+
+
Alapvető fiókadatok: Ha regisztrálsz ezen a szerveren, kérhetünk tőled felhasználói nevet, e-mail címet és jelszót is. Megadhatsz magadról egyéb profil információt, mint megjelenítendő név, bemutatkozás, feltölthetsz profilképet, háttérképet. A felhasználói neved, megjelenítendő neved, bemutatkozásod, profil képed és háttér képed mindig nyilvánosak mindenki számára.
+
Tülkök (posztok), követések, más nyilvános adatok: Az általad követett emberek listája nyilvános. Ugyanez igaz a te követőidre is. Ha küldesz egy üzenetet, ennek az idejét eltároljuk azzal az alkalmazással együtt, melyből az üzenetet küldted. Az üzenetek tartalmazhatnak média csatolmányt, képeket, videókat. A nyilvános tülkök (posztok) bárki számára elérhetőek. Ha egy tülköt kiemelsz a profilodon, az is nyilvánossá válik. Amikor a tülkjeidet a követőidnek továbbítjuk, a poszt más szerverekre is kerülhet, melyeken így másolatok képződhetnek. Ha törölsz tülköket, ez is továbbítódik a követőid felé. A megtolás (reblog) és kedvencnek jelölés művelete is mindig nyilvános.
+
Közvetlen üzenetek és csak követőknek szánt tülkök: Minden tülk a szerveren tárolódik. A csak követőknek szánt tülköket a követőidnek és az ezekben megemlítetteknek továbbítjuk, míg a közvetlen üzeneteket kizárólag az ebben megemlítettek kapják. Néhány esetben ez azt jelenti, hogy ezek más szerverekre is továbbítódnak, így ott másolatok keletkezhetnek. Jóhiszeműen feltételezzük, hogy más szerverek is hasonlóan járnak el, mikor ezeket az üzeneteket csak az arra jogosultaknak mutatják meg. Ugyanakkor ez nem feltétlenül igaz. Ezért érdemes megnézni azokat a szervereket, melyeken követőid vannak. Be tudod állítani, hogy minden követési kérelmet jóvá kelljen hagynod. Tartsd észben, hogy a szerver üzemeltetői láthatják az üzeneteket, illetve a fogadók képernyőképet, másolatot készíthetnek belőlük, vagy újraoszthatják őket.Ne ossz meg veszélyes információt a Mastodon hálózaton!
+
IP címek és egyéb metaadatok: Bejelentkezéskor letároljuk a használt böngésződet és IP címedet. Mindent rögzített munkamenet elérhető és visszavonható a beállítások között. A legutolsó IP címet maximum 12 hónapig tárolunk. Egyéb szerver logokat is megtarthatunk, melyek HTTP kérésenként is tárolhatják az IP címedet.
+
+
+
+
+
Mire használjuk az adataidat?
+
+
Bármely tőled begyűjtött adatot a következő célokra használhatjuk:
+
+
+
Mastodon alapfunkcióinak biztosítása: Csak akkor léphetsz kapcsolatba másokkal, ha be vagy jelentkezve. Pl. követhetsz másokat a saját, személyre szabott idővonaladon.
+
Közösségi moderáció elősegítése: Pl. IP címek összehasonlítása másokéval, hogy kiszűrjük a kitiltások megkerülését.
+
Kapcsolattartás veled: Az általad megadott e-mail címen infókat, értesítéseket küldünk mások interakcióiról, kérésekről, kérdésekről.
+
+
+
+
+
Hogyan védjük az adataidat?
+
+
Üzemben tartunk néhány biztonsági rendszert, hogy megvédjük a személyes adataidat, amikor eléred vagy karbantartod ezeket. Többek között a böngésződ munkamenete, a szerver oldal, valamint a böngésző közötti teljes kommunikáció SSL-lel van titkosítva, a jelszavadat pedig erős, egyirányú algoritmussal hash-eljük. Kétlépcsős azonosítást is bekapcsolhatsz, hogy még biztonságosabbá tedd a fiókodhoz való hozzáférést.
+
+
+
+
Mik az adatmegőrzési szabályaink?
+
+
Jóhiszeműen járunk el, hogy:
+
+
+
A szerver logokat, melyek kérésenként tartalmazzák a felhasználó IP címét maximum 90 napig tartjuk meg.
+
A regisztrált felhasználók IP címeikkel összekötő adatokat maximum 12 hónapig tartjuk meg.
+
+
+
Kérhetsz archívot minden tárolt adatodról, tülkjeidről, média fájljaidról, profil- és háttér képedről.
+
+
Bármikor visszaállíthatatlanul le is törölheted a fiókodat.
+
+
+
+
Használunk sütiket?
+
+
Igen. A sütik pici állományok, melyeket az oldalunk a böngésződön keresztül a háttértáradra rak, ha engedélyezed ezt. Ezek a sütik teszik lehetővé, hogy az oldalunk felismerje a böngésződet, és ha regisztráltál, hozzá tudjon kötni a fiókodhoz.
+
+
Arra is használjuk a sütiket, hogy elmenthessük a beállításaidat egy következő látogatás céljából.
+
+
+
+
Átadunk bármilyen adatot harmadik személynek?
+
+
Az azonosításodra alkalmazható adatokat nem adjuk el, nem kereskedünk vele, nem adjuk át külső szereplőnek. Ez nem foglalja magába azon harmadik személyeket, aki az üzemeltetésben, felhasználók kiszolgálásban és a tevékenységünkben segítenek, de csak addig, amíg ők is elfogadják, hogy ezeket az adatokat bizalmasan kezelik. Akkor is átadhatjuk ezeket az adatokat, ha erre hitünk szerint törvény kötelez minket, ha betartatjuk az oldalunk szabályzatát vagy megvédjük a saját vagy mások személyiségi jogait, tulajdonát, biztonságát.
+
+
A nyilvános tartalmaidat más hálózatban lévő szerverek letölthetik. A nyilvános és csak követőknek szánt tülkjeid olyan szerverekre is elküldődnek, melyeken követőid vannak. A közvetlen üzenetek is átkerülnek a címzettek szervereire, ha ők más szerveren regisztráltak.
+
+
Ha felhatalmazol egy alkalmazást, hogy használja a fiókodat, a jóváhagyott hatásköröktől függően ez elérheti a nyilvános profiladataidat, a követettjeid listáját, a követőidet, listáidat, tülkjeidet és kedvenceidet is. Ezek az alkalmazások ugyanakkor sosem érhetik el a jelszavadat és e-mail címedet.
+
+
+
+
Az oldal gyerekek általi használata
+
+
Ha ez a szerver az EU-ban vagy EEA-ban van: Az oldalunk, szolgáltatásaink és termékeink mind 16 éven felülieket céloznak. Ha 16 évnél fiatalabb vagy, a GDPR (General Data Protection Regulation) értelmében kérlek ne használd ezt az oldalt!
+
+
Ha ez a szerver az USA-ban van: Az oldalunk, szolgáltatásaink és termékeink mind 13 éven felülieket céloznak. Ha 13 évnél fiatalabb vagy, a COPPA (Children's Online Privacy Protection Act) értelmében kérlek ne használd ezt az oldalt!
+
+
A jogi előírások különbözhetnek ettől a világ egyéb tájain.
+
+
+
+
Adatvédelmi nyilatkozat változásai
+
+
Ha úgy döntünk, hogy megváltoztatjuk az adatvédelmi nyilatkozatot, ezt ezen az oldalon közzé fogjuk tenni.
+
+
Ez a dokumentum CC-BY-SA. Utoljára 2018.03.07 frissült.
title: "%{instance} Felhasználási feltételek és Adatkezelési nyilatkozat"
themes:
- default: Mastodon
+ contrast: Mastodon (Nagy kontrasztú)
+ default: Mastodon (Sötét)
+ mastodon-light: Mastodon (Világos)
time:
formats:
default: "%Y %b %d, %H:%M"
+ month: "%Y %b"
two_factor_authentication:
code_hint: Megerősítéshez írd be az alkalmazás által generált kódot
- description_html: He engedélyezed a kétlépcsős azonosítást, a bejelentkezéshez szükséged lesz a teefonodre és egy alkalmazásra, amely hozzáférési kódot generál számodra.
+ description_html: He engedélyezed a kétlépcsős azonosítást, a bejelentkezéshez szükséged lesz a telefonodra és egy alkalmazásra, amely hozzáférési kódot generál számodra.
disable: Kikapcsolás
enable: Engedélyezés
enabled: Kétlépcsős azonosítás engedélyezve
enabled_success: A kétlépcsős azonosítást sikeresen engedélyezted
generate_recovery_codes: Visszaállítási kódok generálása
- instructions_html: "Olvasd be ez a QR-kódot a telefonodon futó Google Authenticator (vagy egyéb TOTP) alkalmazással. A jövőben ez az alkalmazás fog számodra hozzáférési kódot generálni a belépéshez."
+ instructions_html: "Olvasd be ezt a QR-kódot a telefonodon futó Google Authenticator vagy egyéb TOTP alkalmazással. A jövőben ez az alkalmazás fog számodra hozzáférési kódot generálni a belépéshez."
lost_recovery_codes: A visszaállítási kódok segítségével tudsz belépni, ha elveszítenéd a telefonod. Ha a visszaállítási kódjaidat hagytad el, itt generálhatsz újakat. A régi kódokat ebben az esetben érvénytelenítjük.
manual_instructions: 'Ha nem sikerült a QR-kód beolvasása, itt a szöveges kulcs, amelyet manuálisan kell begépelned:'
recovery_codes: Visszaállítási kódok biztonsági mentése
- recovery_codes_regenerated: Visszaállítási kódok sikeresen újragenerálva
+ recovery_codes_regenerated: A visszaállítási kódokat sikeresen újrageneráltuk
recovery_instructions_html: A visszaállítási kódok egyikének segítségével tudsz majd belépni, ha elveszítenéd a telefonod. Tartsd biztos helyen a visszaállítási kódjaid! Például nyomtasd ki őket és tárold a többi fontos iratoddal együtt.
setup: Beállítás
wrong_code: A beírt kód nem érvényes! A szerver órája és az eszközöd órája szinkronban jár?
user_mailer:
+ backup_ready:
+ explanation: A Mastodon fiókod teljes mentését kérted. A mentés kész ás letölthető!
+ subject: Az adataidról készült archív letöltésre kész
+ title: Archiválás
+ warning:
+ explanation:
+ disable: A fiókod befagyasztott állapotban megtartja minden adatát, de feloldásig nem csinálhatsz vele semmit.
+ silence: A fiókod korlátozott állapotában csak a követőid láthatják a tülkjeidet, valamint nem kerülsz rá nyilvános idővonalakra. Ugyanakkor mások manuálisan még követhetnek.
+ suspend: A fiókodat felfüggesztették, így minden tülköd és feltöltött fájlod menthetetlenül elveszett erről a szerverről és minden olyanról is, ahol voltak követőid.
+ review_server_policies: Szerver szabályzat átnézése
+ subject:
+ disable: A fiókodat %{acct} befagyasztották
+ none: Figyelmeztetés a %{acct} fióknak
+ silence: A fiókodat %{acct} korlátozták
+ suspend: A fiókodat %{acct} felfüggesztették
+ title:
+ disable: Befagyasztott fiók
+ none: Figyelem
+ silence: Lekorlátozott fiók
+ suspend: Felfüggesztett fiók
welcome:
edit_profile_action: Készítsd el profilod
edit_profile_step: 'Itt tudod egyedivé tenni a profilod: feltölthetsz profil- és borítóképet, megváltoztathatod a megjelenített neved és így tovább. Ha jóvá szeretnéd hagyni követőidet, mielőtt láthatják a tülkjeid, itt tudod a fiókodat zárttá tenni.'
explanation: Néhány tipp a kezdeti lépésekhez
final_action: Kezdj tülkölni
- final_step: 'Kezdj tülkölni! Publikus üzeneteid még követők híján is megjelennek másoknak, például a helyi időfolyamban és a címkéknél. Kezdd például azzal, hogy bemutatkozol: használd a #bemutatkozas és az #introductions címkét a tülködben.'
+ final_step: 'Kezdj tülkölni! Publikus üzeneteid még követők híján is megjelennek másoknak, például a helyi idővonalon és a hashtageknél. Kezdd például azzal, hogy bemutatkozol: használd a #bemutatkozas vagy az #introductions hashtaget a tülködben.'
full_handle: Teljes felhasználóneved
- full_handle_hint: Ez az, amit megadhatsz másoknak, hogy üzenhessenek neked vagy követhessenek téged más instanciákról.
+ full_handle_hint: Ez az, amit megadhatsz másoknak, hogy üzenhessenek neked vagy követhessenek téged más szerverekről.
review_preferences_action: Beállítások módosítása
- review_preferences_step: Tekintsd át beállításaidat, például hogy milyen értesítéseket kérsz emailben vagy hogy alapértelmezettként mi legyen a tülkjeid adatvédelmi beállítása. Ha nem vagy szédülős alkat, azt is engedélyezheted, hogy automatikusan lejátsszuk a GIF-eket.
+ review_preferences_step: Tekintsd át beállításaidat, például hogy milyen értesítéseket kérsz e-mailben vagy hogy alapértelmezettként mi legyen a tülkjeid láthatósága. Ha nem vagy szédülős alkat, azt is engedélyezheted, hogy automatikusan lejátsszuk a GIF-eket.
subject: Üdvözöl a Mastodon
- tip_federated_timeline: A nyilvános időfolyam a Mastodon ütőere, ahol minden tülk összefolyik. Nem teljes ugyan, mert csak azokat az emberek fogod látni, akiket instanciád többi felhasználója követ.
- tip_following: Alapértelmezettként instanciád adminisztrátorait követed. Látogasd meg a helyi és a nyilvános időfolyamot, hogy más érdekes emberekre is rátalálj.
- tip_local_timeline: A helyi időfolyam a saját instanciád (%{instance}) ütőere. Ezek a kedves emberek itt mind a szomszédaid!
- tip_mobile_webapp: Ha a böngésződ lehetővé teszi, hogy kezdőképernyődhöz add a Mastodont, még értesítéseket is fogsz kapni – akárcsak egy igazi alkalmazás esetében!
+ tip_federated_timeline: A nyilvános idővonal a Mastodon ütőere, ahol minden tülkölés összefolyik. Nem teljes ugyan, mert csak azokat az embereket fogod látni, akiket a szervered többi felhasználója közül valaki követ.
+ tip_following: Alapértelmezettként szervered adminisztrátorait követed. Látogasd meg a helyi és a nyilvános idővonalat, hogy más érdekes emberekre is rátalálj.
+ tip_local_timeline: A helyi idővonal a saját szervered (%{instance}) ütőere. Ezek a kedves emberek itt mind a szomszédaid!
+ tip_mobile_webapp: Ha a böngésződ lehetővé teszi, hogy a kezdőképernyődhöz add a Mastodont, még értesítéseket is fogsz kapni, akárcsak egy igazi alkalmazás esetében!
tips: Tippek
title: Üdv a fedélzeten, %{name}!
users:
+ follow_limit_reached: Nem követhetsz több, mint %{limit} embert
invalid_email: A megadott e-mail cím helytelen
invalid_otp_token: Érvénytelen ellenőrző kód
+ otp_lost_help_html: Ha mindkettőt elvesztetted, kérhetsz segítséget itt %{email}
+ seamless_external_login: Külső szolgáltatáson keresztül jelentkeztél be, így a jelszó és e-mail beállítások nem elérhetőek.
signed_in_as: Bejelentkezve mint
+ verification:
+ explanation_html: 'A profilodon hitelesítheted magad, mint az itt található linkek tulajdonosa. Ehhez a linkelt weboldalnak tartalmaznia kell egy linket vissza a Mastodon profilodra. Ennek tartalmaznia kell a rel="me" attribútumot. A link szövege bármi lehet. Itt egy példa:'
+ verification: Hitelesítés
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
new file mode 100644
index 000000000..86645a574
--- /dev/null
+++ b/config/locales/hy.yml
@@ -0,0 +1,17 @@
+---
+hy:
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 4323c145f..43721b19b 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -5,7 +5,6 @@ id:
about_mastodon_html: 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
administered_by: 'Dikelola oleh:'
- api: API
apps: Aplikasi hp
contact: Kontak
contact_missing: Belum diset
@@ -20,25 +19,21 @@ id:
privacy_policy: Kebijakan Privasi
source_code: Kode sumber
status_count_after:
- one: status
other: status
status_count_before: Yang telah menulis
terms: Kebijakan layanan
user_count_after:
- one: pengguna
other: pengguna
user_count_before: Tempat bernaung bagi
what_is_mastodon: Apa itu Mastodon?
accounts:
follow: Ikuti
followers:
- one: Pengikut
other: Pengikut
following: Mengikuti
joined: Bergabung pada %{date}
last_active: terakhir aktif
link_verified_on: Kepemilikan tautan ini telah dicek pada %{date}
- media: Media
moved_html: "%{name} telah pindah ke %{new_profile_link}:"
network_hidden: Informasi ini tidak tersedia
nothing_here: Tidak ada apapun disini!
@@ -47,14 +42,11 @@ id:
pin_errors:
following: Anda harus mengikuti orang yang ingin anda endorse
posts:
- one: Toot
other: Toot
posts_tab_heading: Toot
posts_with_replies: Toot dan balasan
reserved_username: Nama pengguna telah dipesan
roles:
- admin: Admin
- bot: Bot
moderator: Moderator
unfollow: Berhenti mengikuti
admin:
@@ -68,8 +60,6 @@ id:
destroyed_msg: Catatan moderasi berhasil dihapus!
accounts:
are_you_sure: Anda yakin?
- avatar: Avatar
- by_domain: Domain
change_email:
changed_msg: Email akun ini berhasil diubah!
current_email: Email saat ini
@@ -85,7 +75,6 @@ id:
disable_two_factor_authentication: Nonaktifkan 2FA
disabled: Dinonaktifkan
display_name: Nama
- domain: Domain
edit: Ubah
email: E-mail
email_status: Status Email
@@ -97,12 +86,10 @@ id:
follows: Mengikut
inbox_url: URL Kotak masuk
invited_by: Diundang oleh
- ip: IP
joined: Bergabung
location:
all: Semua
local: Lokal
- remote: Remote
title: Lokasi
login_status: Status login
media_attachments: Lampiran media
@@ -132,13 +119,10 @@ id:
already_confirmed: Pengguna ini sudah dikonfirmasi
send: Kirim ulang email konfirmasi
success: Email konfirmasi berhasil dikirim!
- reset: Reset
reset_password: Reset kata sandi
resubscribe: Langganan ulang
role: Hak akses
roles:
- admin: Administrator
- moderator: Moderator
staff: Staf
user: Pengguna
salmon_url: URL Salmon
@@ -158,12 +142,10 @@ id:
unsubscribe: Berhenti langganan
username: Nama pengguna
warn: Beri Peringatan
- web: Web
domain_blocks:
add_new: Tambah
created_msg: Pemblokiran domain sedang diproses
destroyed_msg: Pemblokiran domain telah dibatalkan
- domain: Domain
new:
create: Buat pemblokiran
hint: Pemblokiran domain tidak akan menghentikan pembuatan akun dalam database, tapi kami akan memberikan moderasi otomatis pada akun-akun tersebut.
@@ -176,13 +158,11 @@ id:
reject_media_hint: Hapus file media yang tersimpan dan menolak semua unduhan nantinya. Tidak terpengaruh dengan suspen
show:
affected_accounts:
- one: Satu akun di dalam database terpengaruh
other: "%{count} akun dalam database terpengaruh"
retroactive:
silence: Hapus pendiaman terhadap akun pada domain ini
suspend: Hapus suspen terhadap akun pada domain ini
title: Hapus pemblokiran domain %{domain}
- undo: Undo
instances:
title: Server yang diketahui
reports:
@@ -193,7 +173,6 @@ id:
reported_account: Akun yang dilaporkan
reported_by: Dilaporkan oleh
resolved: Terseleseikan
- status: Status
title: Laporan
unresolved: Belum Terseleseikan
settings:
@@ -213,11 +192,9 @@ id:
site_title: Judul Situs
title: Pengaturan situs
subscriptions:
- callback_url: Callback URL
confirmed: Dikonfirmasi
expires_in: Kadaluarsa dalam
last_delivery: Terakhir dikirim
- title: WebSub
topic: Topik
title: Administrasi
application_mailer:
@@ -260,16 +237,16 @@ id:
'422':
content: Verifikasi keamanan gagal. Apa anda memblokir cookie?
title: Verifikasi keamanan gagal
+ '429': Throttled
+ '500':
exports:
blocks: Anda blokir
- csv: CSV
follows: Anda ikuti
mutes: Anda bisukan
storage: Penyimpanan media
generic:
changes_saved_msg: Perubahan berhasil disimpan!
save_changes: Simpan perubahan
- validation_errors: Ada yang tidak beres! Mohon tinjau error dibawah ini
imports:
preface: Anda bisa mengimpor data tertentu seperti orang-orang yang anda ikuti atau anda blokir di server ini, dari file yang dibuat oleh fitur expor di server lain.
success: Data anda berhasil diupload dan akan diproses sesegera mungkin
@@ -278,6 +255,14 @@ id:
following: Daftar diikuti
muting: Daftar didiamkan
upload: Unggah
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
media_attachments:
validations:
images_and_video: Tidak bisa melampirkan video pada status yang telah memiliki gambar
@@ -287,10 +272,8 @@ id:
body: Ini adalah ringkasan singkat yang anda lewatkan pada sejak kunjungan terakhir anda pada %{since}
mention: "%{name} menyebut anda di:"
new_followers_summary:
- one: Anda mendapatkan satu pengikut baru! Hore!
other: Anda mendapatkan %{count} pengikut baru! Luar biasa!
subject:
- one: "1 notifikasi baru sejak kunjungan terakhir anda pada \U0001F418"
other: "%{count} notifikasi baru sejak kunjungan terakhir anda pada \U0001F418"
favourite:
body: 'Status anda disukai oleh %{name}:'
@@ -307,21 +290,9 @@ id:
reblog:
body: 'Status anda di-boost oleh %{name}:'
subject: "%{name} mem-boost status anda"
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
next: Selanjutnya
prev: Sebelumnya
- truncate: "…"
remote_follow:
acct: Masukkan namapengguna@domain yang akan anda ikuti
missing_resource: Tidak dapat menemukan URL redirect dari akun anda
diff --git a/config/locales/io.yml b/config/locales/io.yml
index b5edb2aa3..559bf0f53 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -5,97 +5,35 @@ io:
about_this: Pri ta instaluro
contact: Kontaktar
source_code: Fontkodexo
- status_count_after: mesaji
status_count_before: Qua publikigis
- user_count_after: uzeri
user_count_before: Hemo di
accounts:
follow: Sequar
- followers: Sequanti
following: Sequati
nothing_here: Esas nulo hike!
people_followed_by: Sequati da %{name}
people_who_follow: Sequanti di %{name}
- posts: Mesaji
unfollow: Dessequar
admin:
accounts:
are_you_sure: Ka tu esas certa?
- display_name: Display name
- domain: Domain
- edit: Edit
email: E-mail
- feed_url: Feed URL
- followers: Followers
- follows: Follows
- location:
- all: All
- local: Local
- remote: Remote
- title: Location
- media_attachments: Media attachments
- moderation:
- all: All
- silenced: Silenced
- suspended: Suspended
- title: Moderation
- most_recent_activity: Most recent activity
- most_recent_ip: Most recent IP
- not_subscribed: Not subscribed
perform_full_suspension: Perform full suspension
- profile_url: Profile URL
- public: Public
- push_subscription_expires: PuSH subscription expires
- reset_password: Reset password
- salmon_url: Salmon URL
show:
created_reports: Reports created by this account
targeted_reports: Reports made about this account
- silence: Silence
- statuses: Statuses
- title: Accounts
- undo_silenced: Undo silence
- undo_suspension: Undo suspension
- username: Username
- web: Web
domain_blocks:
add_new: Add new
- created_msg: Domain block is now being processed
- destroyed_msg: Domain block has been undone
- domain: Domain
new:
- create: Create block
- hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
severity:
desc_html: "Silence will make the account's posts invisible to anyone who isn't following them. Suspend will remove all of the account's content, media, and profile data."
- silence: Silence
- suspend: Suspend
- title: New domain block
- reject_media: Reject media files
- reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
show:
- affected_accounts:
- one: One account in the database affected
- other: "%{count} accounts in the database affected"
retroactive:
silence: Unsilence all existing accounts from this domain
suspend: Unsuspend all existing accounts from this domain
- title: Undo domain block for %{domain}
- undo: Undo
undo: Undo
instances:
title: Known Instances
- reports:
- comment:
- none: None
- mark_as_resolved: Mark as resolved
- report: 'Report #%{id}'
- reported_account: Reported account
- reported_by: Reported by
- resolved: Resolved
- status: Status
- title: Reports
- unresolved: Unresolved
settings:
contact_information:
email: Enter a public e-mail address
@@ -103,7 +41,6 @@ io:
registrations:
closed_message:
desc_html: Displayed on frontpage when registrations are closed You can use HTML tags
- title: Closed registration message
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
@@ -112,14 +49,6 @@ io:
title: Extended site description
site_title: Site title
title: Site Settings
- subscriptions:
- callback_url: Callback URL
- confirmed: Confirmed
- expires_in: Expires in
- last_delivery: Last delivery
- title: WebSub
- topic: Topic
- title: Administration
application_mailer:
settings: 'Chanjar la retpost-mesajala preferi: %{link}'
view: 'Vidar:'
@@ -141,29 +70,18 @@ io:
title: Sequar %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
- about_x_months: "%{count}mo"
- about_x_years: "%{count}y"
- almost_x_years: "%{count}y"
half_a_minute: Jus
- less_than_x_minutes: "%{count}m"
less_than_x_seconds: Jus
- over_x_years: "%{count}y"
- x_days: "%{count}d"
- x_minutes: "%{count}m"
- x_months: "%{count}mo"
- x_seconds: "%{count}s"
errors:
+ '403': You don't have permission to view this page.
'404': La pagino quan tu serchas ne existas.
'410': La pagino quan tu serchas ne plus existas.
- '422':
- content: Security verification failed. Are you blocking cookies?
- title: Security verification failed
+ '422':
+ '429': Throttled
+ '500':
exports:
blocks: Tu blokusas
- csv: CSV
follows: Tu sequas
- mutes: You mute
storage: Konservado di kontenajo
generic:
changes_saved_msg: Chanji senprobleme konservita!
@@ -177,12 +95,15 @@ io:
types:
blocking: Listo de blokusiti
following: Listo de sequati
- muting: Muting list
upload: Kargar
- media_attachments:
- validations:
- images_and_video: Cannot attach a video to a status that already contains images
- too_many: Cannot attach more than 4 files
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
notification_mailer:
digest:
body: Yen mikra rezumo di to, depos ke tu laste vizitis en %{since}
@@ -208,21 +129,9 @@ io:
reblog:
body: "%{name} diskonocigis tua mesajo:"
subject: "%{name} diskonocigis tua mesajo"
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
next: Sequanta
prev: Preiranta
- truncate: "…"
remote_follow:
acct: Enpozez tua uzernomo@instaluro de ube tu volas sequar ta uzero
missing_resource: La URL di plussendado ne povis esar trovita
@@ -247,23 +156,13 @@ io:
stream_entries:
reblogged: diskonocigita
sensitive_content: Titiliva kontenajo
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
two_factor_authentication:
- code_hint: Enter the code generated by your authenticator app to confirm
description_html: Se tu posibligas dufaktora autentikigo, tu bezonos tua poshtelefonilo por enirar, nam ol kreos nombri, quin tu devos enskribar.
disable: Extingar
enable: Acendar
- enabled_success: Two-factor authentication successfully enabled
generate_recovery_codes: Generate Recovery Codes
instructions_html: "Skanez ta QR-kodexo per Google Authenticator o per simila apliko di tua poshtelefonilo. De lore, la apliko kreos nombri, quin tu devos enskribar."
- lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated.
- manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
- recovery_codes_regenerated: Recovery codes successfully regenerated
recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe, for example by printing them and storing them with other important documents.
- setup: Set up
- wrong_code: The entered code was invalid! Are server time and device time correct?
users:
invalid_email: La retpost-adreso ne esas valida
invalid_otp_token: La dufaktora autentikigila kodexo ne esas valida
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 508b8a0dc..6dfe212d1 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -4,25 +4,36 @@ it:
about_hashtag_html: Questi sono i toot pubblici etichettati con #%{hashtag}. Puoi interagire con loro se hai un account nel fediverse.
about_mastodon_html: 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
+ active_count_after: attivo
+ active_footnote: Utenti Attivi Mensili (MAU)
administered_by: 'Amministrato da:'
api: API
apps: Applicazioni Mobile
+ apps_platforms: Usa Mastodon da iOS, Android e altre piattaforme
+ browse_directory: Sfoglia la directory dei profili e filtra per interessi
+ browse_public_posts: Sfoglia il flusso in tempo reale di post pubblici su Mastodon
contact: Contatti
contact_missing: Non impostato
contact_unavailable: N/D
+ discover_users: Scopri utenti
documentation: Documentazione
extended_description_html: |
Un buon posto per le regole
La descrizione estesa non è ancora stata preparata.
+ federation_hint_html: Con un account su %{instance} sarai in grado di seguire persone su qualsiasi server Mastodon e oltre.
generic_description: "%{domain} è un server nella rete"
+ get_apps: Prova un'app per smartphone
hosted_on: Mastodon ospitato su %{domain}
learn_more: Scopri altro
privacy_policy: Politica della privacy
+ see_whats_happening: Guarda cosa succede
+ server_stats: 'Statistiche del server:'
source_code: Codice sorgente
status_count_after:
- one: status
- other: status
+ one: stato
+ other: stati
status_count_before: Che hanno pubblicato
+ tagline: Segui amici e trovane di nuovi
terms: Termini di Servizio
user_count_after:
one: utente
@@ -57,6 +68,7 @@ it:
admin: Amministratore
bot: Bot
moderator: Moderatore
+ unavailable: Profilo non disponibile
unfollow: Non seguire più
admin:
account_actions:
@@ -68,8 +80,10 @@ it:
delete: Elimina
destroyed_msg: Nota di moderazione distrutta con successo!
accounts:
+ approve: Approva
+ approve_all: Approva tutto
are_you_sure: Sei sicuro?
- avatar: Avatar
+ avatar: Immagine di profilo
by_domain: Dominio
change_email:
changed_msg: Account email cambiato con successo!
@@ -113,15 +127,18 @@ it:
moderation:
active: Attivo
all: Tutto
+ pending: In attesa
silenced: Silenziati
suspended: Sospesi
title: Moderazione
moderation_notes: Note di moderazione
most_recent_activity: Attività più recenti
most_recent_ip: IP più recenti
+ no_account_selected: Nessun account è stato modificato visto che non ne è stato selezionato nessuno
no_limits_imposed: Nessun limite imposto
not_subscribed: Non sottoscritto
outbox_url: URL outbox
+ pending: Revisioni in attesa
perform_full_suspension: Sospendi
profile_url: URL profilo
promote: Promuovi
@@ -129,6 +146,8 @@ it:
public: Pubblico
push_subscription_expires: Sottoscrizione PuSH scaduta
redownload: Aggiorna avatar
+ reject: Rifiuta
+ reject_all: Rifiuta tutto
remove_avatar: Rimuovi avatar
remove_header: Rimuovi intestazione
resend_confirmation:
@@ -155,6 +174,7 @@ it:
statuses: Stati
subscribe: Sottoscrivi
suspended: Sospeso
+ time_in_queue: Attesa in coda %{time}
title: Account
unconfirmed_email: Email non confermata
undo_silenced: Rimuovi silenzia
@@ -196,7 +216,7 @@ it:
update_custom_emoji: "%{name} ha aggiornato l'emoji %{target}"
update_status: "%{name} stato aggiornato da %{target}"
deleted_status: "(stato cancellato)"
- title: Audit log
+ title: Registro di controllo
custom_emojis:
by_domain: Dominio
copied_msg: Creata con successo una copia locale dell'emoji
@@ -215,7 +235,7 @@ it:
new:
title: Aggiungi nuovo emoji personalizzato
overwrite: Sovrascrivi
- shortcode: Shortcode
+ shortcode: Scorciatoia
shortcode_hint: Almeno due caratteri, solo caratteri alfanumerici e trattino basso
title: Emoji personalizzate
unlisted: Non elencato
@@ -223,13 +243,14 @@ it:
updated_msg: Emoji aggiornata con successo!
upload: Carica
dashboard:
- backlog: backlogged jobs
+ backlog: lavori arretrati
config: Configurazione
feature_deletions: Cancellazioni di account
feature_invites: Link di invito
feature_profile_directory: Directory dei profili
feature_registrations: Registrazioni
feature_relay: Ripetitore di federazione
+ feature_timeline_preview: Anteprima timeline
features: Funzionalità
hidden_service: Federazione con servizi nascosti
open_reports: apri report
@@ -238,7 +259,7 @@ it:
single_user_mode: Modalita utente singolo
software: Software
space: Utilizzo dello spazio
- title: Dashboard
+ title: Cruscotto
total_users: utenti totali
trends: Tendenze
week_interactions: interazioni per questa settimana
@@ -249,6 +270,7 @@ it:
created_msg: Il blocco del dominio sta venendo processato
destroyed_msg: Il blocco del dominio è stato rimosso
domain: Dominio
+ existing_domain_block_html: Hai già impostato limitazioni più stringenti su %{name}, dovresti sbloccare prima.
new:
create: Crea blocco
hint: Il blocco dominio non previene la creazione di utenti nel database, ma applicherà automaticamente e retroattivamente metodi di moderazione specifici su quegli account.
@@ -262,6 +284,8 @@ it:
reject_media_hint: Rimuovi i file media salvati in locale e blocca i download futuri. Irrilevante per le sospensioni
reject_reports: Respingi rapporti
reject_reports_hint: Ignora tutti i rapporti provenienti da questo dominio. Irrilevante per sospensioni
+ rejecting_media: rigetta file media
+ rejecting_reports: rigetta segnalazioni
severity:
silence: silenziato
suspend: sospeso
@@ -290,16 +314,19 @@ it:
title: Seguaci di %{acct}
instances:
by_domain: Dominio
+ delivery_available: Distribuzione disponibile
known_accounts:
one: "%{count} account noto"
other: "%{count} account noti"
moderation:
+ all: Tutto
limited: Limitato
title: Moderazione
title: Istanze conosciute
total_blocked_by_us: Bloccato da noi
total_followed_by_them: Seguito da loro
total_followed_by_us: Seguito da noi
+ total_reported: Segnalazioni su di loro
total_storage: Media allegati
invites:
deactivate_all: Disattiva tutto
@@ -309,6 +336,8 @@ it:
expired: Scaduto
title: Filtro
title: Inviti
+ pending_accounts:
+ title: Account in attesa (%{count})
relays:
add_new: Aggiungi ripetitore
delete: Cancella
@@ -322,7 +351,7 @@ it:
pending: In attesa dell'approvazione del ripetitore
save_and_enable: Salva e attiva
setup: Crea una connessione con un ripetitore
- status: Status
+ status: Stato
title: Ripetitori
report_notes:
created_msg: Nota rapporto creata!
@@ -365,6 +394,7 @@ it:
desc_html: Separa i nomi utente con virgola. Funziona solo con account locali e non bloccati. Quando vuoto, valido per tutti gli amministratori locali.
title: Seguiti predefiniti per i nuovi utenti
contact_information:
+ email: E-mail di lavoro
username: Nome utente del contatto
custom_css:
desc_html: Modifica l'aspetto con il CSS caricato in ogni pagina
@@ -383,7 +413,7 @@ it:
title: Mostra media sensibili nella anteprime OpenGraph
profile_directory:
desc_html: Permetti agli utenti di essere trovati
- title: Attiva directory del profilo
+ title: Attiva directory dei profili
registrations:
closed_message:
desc_html: Mostrato nella pagina iniziale quando le registrazioni sono chiuse. Puoi usare tag HTML
@@ -394,10 +424,17 @@ it:
min_invite_role:
disabled: Nessuno
title: Permetti inviti da
+ registrations_mode:
+ modes:
+ approved: Approvazione richiesta per le iscrizioni
+ none: Nessuno può iscriversi
+ open: Chiunque può iscriversi
+ title: Modalità di registrazione
show_known_fediverse_at_about_page:
desc_html: Quando attivato, mostra nell'anteprima i toot da tutte le istanze conosciute. Altrimenti mostra solo i toot locali.
title: Mostra la fediverse conosciuta nell'anteprima della timeline
show_staff_badge:
+ desc_html: Mostra un distintivo dello staff sulla pagina dell'utente
title: Mostra badge staff
site_description:
desc_html: Paragrafo introduttivo nella pagina iniziale. Descrive ciò che rende speciale questo server Mastodon e qualunque altra cosa sia importante dire. Potete usare marcatori HTML, in particolare <a> e <em>.
@@ -436,12 +473,14 @@ it:
callback_url: URL Callback
confirmed: Confermato
expires_in: Scade in
+ last_delivery: Ultima distribuzione
+ title: WebSub
topic: Argomento
tags:
accounts: Account
hidden: Nascosto
- hide: Nascondi nella directory
- name: Hashtag
+ hide: Nascondi dalla directory
+ name: Etichetta
title: Hashtag
unhide: Mostra nella directory
visible: Visibile
@@ -452,6 +491,22 @@ it:
edit: Modifica
edit_preset: Modifica avviso predefinito
title: Gestisci avvisi predefiniti
+ admin_mailer:
+ new_pending_account:
+ body: I dettagli del nuovo account sono qui sotto. Puoi approvare o rifiutare questa richiesta.
+ subject: Nuovo account pronto per la revisione su %{instance} (%{username})
+ new_report:
+ body: "%{reporter} ha segnalato %{target}"
+ body_remote: Qualcuno da %{domain} ha segnalato %{target}
+ subject: Nuova segnalazione per %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Interfaccia web avanzata
+ advanced_web_interface_hint: |-
+ Se vuoi utilizzare l'intera larghezza dello schermo, l'interfaccia web avanzata ti consente di configurare varie colonne per mostrare più informazioni allo stesso tempo, secondo le tue preferenze:
+ Home, notifiche, timeline federata, qualsiasi numero di liste e etichette.
+ animations_and_accessibility: Animazioni e accessibiiltà
+ confirmation_dialogs: Dialoghi di conferma
+ sensitive_content: Contenuto sensibile
application_mailer:
notification_preferences: Cambia preferenze email
salutation: "%{name},"
@@ -466,23 +521,32 @@ it:
regenerate_token: Rigenera il token di accesso
token_regenerated: Token di accesso rigenerato
warning: Fa' molta attenzione con questi dati. Non fornirli mai a nessun altro!
+ your_token: Il tuo token di accesso
auth:
+ apply_for_account: Richiedi un invito
change_password: Password
+ checkbox_agreement_html: Sono d'accordo con le regole del server ed i termini di servizio
confirm_email: Conferma email
delete_account: Elimina account
delete_account_html: Se desideri cancellare il tuo account, puoi farlo qui. Ti sarà chiesta conferma.
didnt_get_confirmation: Non hai ricevuto le istruzioni di conferma?
forgot_password: Hai dimenticato la tua password?
+ invalid_reset_password_token: Il token di reimpostazione della password non è valido o è scaduto. Per favore richiedine uno nuovo.
login: Entra
logout: Esci da Mastodon
migrate_account: Sposta ad un account differente
migrate_account_html: Se vuoi che questo account sia reindirizzato a uno diverso, puoi configurarlo qui.
or_log_in_with: Oppure accedi con
+ providers:
+ cas: CAS
+ saml: SAML
register: Iscriviti
+ registration_closed: "%{instance} non accetta nuovi membri"
resend_confirmation: Invia di nuovo le istruzioni di conferma
reset_password: Resetta la password
security: Credenziali
set_new_password: Imposta una nuova password
+ trouble_logging_in: Problemi di accesso?
authorize_follow:
already_following: Stai già seguendo questo account
error: Sfortunatamente c'è stato un errore nel consultare l'account remoto
@@ -515,6 +579,7 @@ it:
proceed: Cancella l'account
success_msg: Il tuo account è stato cancellato
warning_html: È garantita la cancellazione del contenuto solo da questo server. I contenuti che sono stati ampiamente condivisi probabilmente lasceranno delle tracce. I server offline e quelli che non ricevono più i tuoi aggiornamenti non aggiorneranno i loro database.
+ warning_title: Disponibilità di contenuto diffuso
directories:
directory: Directory dei profili
enabled: Attualmente sei elencato nella directory.
@@ -532,10 +597,14 @@ it:
'422':
content: Verifica di sicurezza non riuscita. Stai bloccando i cookies?
title: Verifica di sicurezza non riuscita
+ '429': Limitato
'500':
content: Siamo spiacenti, ma qualcosa non ha funzionato dal nostro lato.
title: Questa pagina non è corretta
noscript_html: Per usare l'interfaccia web di Mastodon dovi abilitare JavaScript. In alternativa puoi provare una delle app native per Mastodon per la tua piattaforma.
+ existing_username_validator:
+ not_found: impossibile trovare un utente locale con quel nome utente
+ not_found_multiple: impossibile trovare %{usernames}
exports:
archive_takeout:
date: Data
@@ -565,6 +634,7 @@ it:
title: Modifica filtro
errors:
invalid_context: Contesto mancante o non valido
+ invalid_irreversible: Il filtraggio irreversibile funziona solo nei contesti di home o notifiche
index:
delete: Cancella
title: Filtri
@@ -573,13 +643,36 @@ it:
footer:
developers: Sviluppatori
more: Altro…
+ resources: Risorse
generic:
+ all: Tutto
changes_saved_msg: Modifiche effettuate con successo!
copy: Copia
+ order_by: Ordina per
save_changes: Salva modifiche
validation_errors:
one: Qualcosa ancora non va bene! Per favore, controlla l'errore qui sotto
other: Qualcosa ancora non va bene! Per favore, controlla i %{count} errori qui sotto
+ html_validator:
+ invalid_markup: 'contiene markup HTML non valido: %{error}'
+ identity_proofs:
+ active: Attive
+ authorize: Si, autorizza
+ authorize_connection_prompt: Autorizzare questa connessione crittografata?
+ errors:
+ failed: La connessione crittografata non è riuscita. Per favore riprova da %{provider}.
+ keybase:
+ invalid_token: I toked di Keybase sono hash di firme e devono essere lunghi 66 caratteri esadecimali
+ verification_failed: Keybase non riconosce questo token come firma dell'utente Keybase %{kb_username}. Per favore riprova da Keybase.
+ wrong_user: Impossibile creare una prova per %{proving} mentre si è effettuato l'accesso come %{current}. Accedi come %{proving} e riprova.
+ explanation_html: Qui puoi connettere crittograficamente le tue altre identità, come il profilo Keybase. Questo consente ad altre persone di inviarti messaggi criptati e fidarsi dei contenuto che tu invii a loro.
+ i_am_html: Io sono %{username} su %{service}.
+ identity: Identità
+ inactive: Inattiva
+ publicize_checkbox: 'E posta questo:'
+ publicize_toot: 'É provato! Io sono %{username} su %{service}: %{url}'
+ status: Stato della verifica
+ view_proof: Vedi prova
imports:
modes:
merge: Fondi
@@ -670,12 +763,11 @@ it:
decimal_units:
format: "%n%u"
units:
- billion: B
+ billion: G
million: M
- quadrillion: Q
- thousand: K
+ quadrillion: P
+ thousand: k
trillion: T
- unit: ''
pagination:
newer: Più recente
next: Avanti
@@ -685,6 +777,7 @@ it:
polls:
errors:
already_voted: Hai già votato in questo sondaggio
+ duplicate_options: contiene oggetti duplicati
duration_too_long: è troppo lontano nel futuro
duration_too_short: è troppo presto
expired: Il sondaggio si è già concluso
@@ -692,16 +785,29 @@ it:
too_few_options: deve avere più di un elemento
too_many_options: non può contenere più di %{max} elementi
preferences:
- languages: Lingue
other: Altro
- publishing: Pubblicazione
- web: Web
+ posting_defaults: Predefinite di pubblicazione
+ public_timelines: Timeline pubbliche
+ relationships:
+ activity: Attività dell'account
+ dormant: Dormiente
+ last_active: Ultima volta attivo
+ most_recent: Più recente
+ moved: Trasferito
+ mutual: Reciproco
+ primary: Principale
+ relationship: Relazione
+ remove_selected_domains: Rimuovi tutti i seguaci dai domini selezionati
+ remove_selected_followers: Rimuovi i seguaci selezionati
+ remove_selected_follows: Smetti di seguire gli utenti selezionati
+ status: Stato dell'account
remote_follow:
acct: Inserisci il tuo username@dominio da cui vuoi seguire questo utente
missing_resource: Impossibile trovare l'URL di reindirizzamento richiesto per il tuo account
no_account_html: Non hai un account? Puoi iscriverti qui
proceed: Conferma
prompt: 'Stai per seguire:'
+ reason_html: "Perchè questo passo è necessario?%{instance} potrebbe non essere il server nel quale tu sei registrato, quindi dobbiamo reindirizzarti prima al tuo server."
remote_interaction:
favourite:
proceed: Continua per segnare come apprezzato
@@ -724,14 +830,23 @@ it:
activity: Ultima attività
browser: Browser
browsers:
+ alipay: Alipay
blackberry: Blackberry
chrome: Chrome
edge: Microsoft Edge
+ electron: Electron
firefox: Firefox
generic: Browser sconosciuto
ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
opera: Opera
+ otter: Otter
+ phantom_js: PhantomJS
+ qq: QQ Browser
safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
current_session: Sessione corrente
description: "%{browser} su %{platform}"
explanation: Questi sono i browser da cui attualmente è avvenuto l'accesso al tuo account Mastodon.
@@ -749,8 +864,13 @@ it:
windows: Windows
windows_mobile: Windows Mobile
windows_phone: Windows Phone
+ revoke: Revoca
+ revoke_success: Sessione revocata con successo
title: Sessioni
settings:
+ account: Account
+ account_settings: Impostazioni dell'account
+ appearance: Interfaccia
authorized_apps: Applicazioni autorizzate
back: Torna a Mastodon
delete: Cancellazione account
@@ -758,10 +878,14 @@ it:
edit_profile: Modifica profilo
export: Esporta impostazioni
featured_tags: Hashtag in evidenza
+ identity_proofs: Prove di identità
import: Importa
+ import_and_export: Importa ed esporta
migrate: Migrazione dell'account
notifications: Notifiche
preferences: Preferenze
+ profile: Profilo
+ relationships: Follows and followers
two_factor_authentication: Autenticazione a due fattori
statuses:
attached:
@@ -773,6 +897,7 @@ it:
one: "%{count} video"
other: "%{count} video"
boosted_from_html: Condiviso da %{acct_link}
+ content_warning: 'Avviso di contenuto: %{warning}'
disallowed_hashtags:
one: 'contiene un hashtag non permesso: %{tags}'
other: 'contiene gli hashtags non permessi: %{tags}'
@@ -791,6 +916,7 @@ it:
vote: Vota
show_more: Mostra di più
sign_in_to_participate: Accedi per partecipare alla conversazione
+ title: '%{name}: "%{quote}"'
visibilities:
private: Mostra solo ai tuoi seguaci
private_long: Mostra solo ai seguaci
@@ -811,6 +937,7 @@ it:
time:
formats:
default: "%b %d, %Y, %H:%M"
+ month: "%b %Y"
two_factor_authentication:
code_hint: Inserisci il codice generato dalla tua app di autenticazione
description_html: Se abiliti l'autorizzazione a due fattori, entrare nel tuo account ti richiederà di avere vicino il tuo telefono, il quale ti genererà un codice per eseguire l'accesso.
@@ -832,7 +959,24 @@ it:
explanation: Hai richiesto un backup completo del tuo account Mastodon. È pronto per essere scaricato!
subject: Il tuo archivio è pronto per essere scaricato
title: Esportazione archivio
+ warning:
+ explanation:
+ disable: Mentre il tuo account è congelato, i tuoi dati dell'account rimangono intatti, ma non potrai eseguire nessuna azione fintanto che non viene sbloccato.
+ silence: Mentre il tuo account è limitato, solo le persone che già ti seguono possono vedere i tuoi toot su questo server, e potresti essere escluso da vari elenchi pubblici. Comunque, altri possono manualmente seguirti.
+ suspend: Il tuo account è stato sospeso, e tutti i tuoi toot ed i tuoi file media caricati sono stati irreversibilmente rimossi da questo server, e dai server dove avevi dei seguaci.
+ review_server_policies: Rivedi regole del server
+ subject:
+ disable: Il tuo account %{acct} è stato congelato
+ none: Avviso per %{acct}
+ silence: Il tuo account %{acct} è stato limitato
+ suspend: Il tuo account %{acct} è stato sospeso
+ title:
+ disable: Account congelato
+ none: Avviso
+ silence: Account limitato
+ suspend: Account sospeso
welcome:
+ edit_profile_action: Imposta profilo
edit_profile_step: Puoi personalizzare il tuo profilo caricando un avatar, un'intestazione, modificando il tuo nome visualizzato e così via. Se vuoi controllare i tuoi nuovi seguaci prima di autorizzarli a seguirti, puoi bloccare il tuo account.
explanation: Ecco alcuni suggerimenti per iniziare
final_action: Inizia a postare
@@ -852,6 +996,7 @@ it:
follow_limit_reached: Non puoi seguire più di %{limit} persone
invalid_email: L'indirizzo email inserito non è valido
invalid_otp_token: Codice d'accesso non valido
+ otp_lost_help_html: Se perdessi l'accesso ad entrambi, puoi entrare in contatto con %{email}
seamless_external_login: Ti sei collegato per mezzo di un servizio esterno, quindi le impostazioni di email e password non sono disponibili.
signed_in_as: 'Hai effettuato l''accesso come:'
verification:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 545146145..ca640d07d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -20,7 +20,7 @@ ja:
extended_description_html: |
@@ -1049,21 +1041,21 @@ ja:
suspend: アカウントが停止されました
welcome:
edit_profile_action: プロフィールを設定
- edit_profile_step: アバター画像やヘッダー画像をアップロードしたり、表示名やその他プロフィールを変更しカスタマイズすることができます。新しいフォロワーからのフォローを許可する前に検討したい場合、アカウントを承認制にすることができます。
+ edit_profile_step: アイコンやヘッダーの画像をアップロードしたり、表示名を変更したりして、自分のプロフィールをカスタマイズすることができます。また、誰かからの新規フォローを許可する前にその人の様子を見ておきたい場合、アカウントを承認制にすることもできます。
explanation: 始めるにあたってのアドバイスです
final_action: 始めましょう
- final_step: 'さあ始めましょう! たとえフォロワーがいなくても、あなたの公開した投稿はローカルタイムラインやハッシュタグなどで誰かの目に止まるかもしれません。自己紹介をしたい時は #introductions ハッシュタグを使うといいかもしれません。'
- full_handle: あなたの正式なユーザー名
- full_handle_hint: これは別のサーバーからフォローしてもらったりメッセージのやり取りをする際に、友達に伝えるといいでしょう。
+ final_step: 'さあ、始めましょう! たとえフォロワーがまだいなくても、あなたの公開した投稿はローカルタイムラインやハッシュタグなどを通じて誰かの目にとまるはずです。自己紹介をしたいときには #introductions ハッシュタグが便利かもしれません。'
+ full_handle: あなたの正式なユーザーID
+ full_handle_hint: 別のサーバーの友達とフォローやメッセージをやり取りする際には、これを伝えることになります。
review_preferences_action: 設定の変更
- review_preferences_step: 受け取りたいメールや投稿の公開範囲などの設定を必ず行ってください。不快でないならアニメーション GIF の自動再生を有効にすることもできます。
+ review_preferences_step: 受け取りたいメールの種類や投稿のデフォルト公開範囲など、ユーザー設定を必ず済ませておきましょう。目が回らない自信があるなら、アニメーション GIF を自動再生する設定もご検討ください。
subject: Mastodon へようこそ
tip_federated_timeline: 連合タイムラインは Mastodon ネットワークの流れを見られるものです。ただしあなたと同じサーバーの人がフォローしている人だけが含まれるので、それが全てではありません。
- tip_following: 標準では自動でサーバーの管理者をフォローしています。もっと興味のある人たちを見つけるには、ローカルタイムラインと連合タイムラインを確認してください。
+ tip_following: 最初は、サーバーの管理者をフォローした状態になっています。もっと興味のある人たちを見つけるには、ローカルタイムラインと連合タイムラインを確認してみましょう。
tip_local_timeline: ローカルタイムラインは %{instance} にいる人々の流れを見られるものです。彼らはあなたと同じサーバーにいる隣人のようなものです!
- tip_mobile_webapp: もしモバイル端末のブラウザで Mastodon をホーム画面に追加できる場合、プッシュ通知を受け取ることができます。それはまるでネイティブアプリのように動作します!
+ tip_mobile_webapp: お使いのモバイル端末で、ブラウザから Mastodon をホーム画面に追加できますか? もし追加できる場合、プッシュ通知の受け取りなど、まるで「普通の」アプリのような機能が楽しめます!
tips: 豆知識
- title: ようこそ、%{name} !
+ title: ようこそ、%{name}!
users:
follow_limit_reached: あなたは現在 %{limit} 人以上フォローできません
invalid_email: メールアドレスが無効です
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 9781fc5be..53057d860 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -19,16 +19,13 @@ ka:
learn_more: გაიგე მეტი
privacy_policy: კონფიდენციალურობის პოლიტიკა
source_code: კოდი
- status_count_after: სტატუსები
status_count_before: ვინც უავტორა
terms: მომსახურების პირობები
- user_count_after: მომხმარებლისთვის
user_count_before: სახლი
what_is_mastodon: რა არის მასტოდონი?
accounts:
choices_html: "%{name}-ის არჩევნები:"
follow: გაყევი
- followers: მიმდევრები
following: მიჰყვება
joined: გაწევრიანდა %{date}
media: მედია
@@ -39,7 +36,6 @@ ka:
people_who_follow: ხალხი ვინც მიჰყვება %{name}-ს
pin_errors:
following: იმ ადამიანს, ვინც მოგწონთ, უკვე უნდა მიჰყვებოდეთ
- posts: ტუტები
posts_with_replies: ტუტები და პასუხები
reserved_username: მომხმარებელი რეზერვირებულია
roles:
@@ -387,7 +383,6 @@ ka:
subject: ახალი რეპორტი %{instance} (#%{id})-ზე
application_mailer:
notification_preferences: შეცვალეთ ელ-ფოსტის პრეფერნსიები
- salutation: "%{name},"
settings: 'შეცვალეთ ელ-ფოსტის პრეფერენსიები: %{link}'
view: 'ჩვენება:'
view_profile: პროფილის ჩვენება
@@ -587,25 +582,19 @@ ka:
number:
human:
decimal_units:
- format: "%n%u"
units:
billion: ბილ.
million: მილ.
quadrillion: კუად.
thousand: ათას.
trillion: ტრილ.
- unit: ''
pagination:
newer: უფრო ახალი
next: შემდეგი
older: ძველი
prev: წინა
- truncate: "…"
preferences:
- languages: ენები
other: სხვა
- publishing: გამოქვეყნება
- web: ვები
remote_follow:
acct: შეიყვანეთ თქვენი username@domain საიდანაც გსურთ გაჰყვეთ
missing_resource: საჭირო გადამისამართების ურლ თქვენი ანგარიშისთვის ვერ მოიძებნა
@@ -693,7 +682,6 @@ ka:
reblog: ბუსტი ვერ აიპინება
show_more: მეტის ჩვენება
sign_in_to_participate: საუბარში მონაწილეობისთვის გაიარეთ ავტორიზაცია
- title: '%{name}: "%{quote}"'
visibilities:
private: მხოლოდ-მიმდევრები
private_long: აჩვენე მხოლოდ მიმდევრებს
@@ -711,10 +699,10 @@ ka:
რა ინფორმაციას ვაგროვებთ?
-
ძირითადი ანგარიშის ინფორმაცია: თუ დარეგისტრირდებით ამ სერვერზე, შესაძლოა მოგთხოვოთ მომხმარებლის სახელი, ელ-ფოსტის მისამართი და პაროლი. შესაძლებელია, ასევე შეიყვანოთ დამატებითი პროფილის ინორმაცია, როგორიცაა დისპლეის სახელი და ბიოგრაფია, ასევე ატვირთოთ პროფილის და დასათაურების სურათი. მომხმარებლის სახელი, დისპლეის სახელი, ბიოგრაფია, პროფილის სურათი, დასათაურების სურათი ყოველთვის ღიადაა ჩამოთვლილი.
-
პოსტები, დადევნებები და სხვა საჯარო ინფორმაცია: ადამიანების სია, რომლებსაც მიჰყვებით საჯაროდაა ჩამოთვლილი, იგივე ეხება თქვენს მიდევრებსაც. როდესაც აგზავნით წერილს, თარიღი, დრო და აპლიკაცია თუ საიდანაც განათავსეთ წერილი ინახება. წერილები შესაძლოა შეიცავდნენ მედია ფაილებს, როგორებიცაა სურათები და ვიდეოები. ღია და ჩამოუთვლელი პოსტები ხელმისაწვდომია საჯაროდ. როდესაც ათავსებთ პოსტს თქვენს პროფილზე, ის ასევე საჟაროდ წვდომადი ხდება. თქვენი პოსტები ეგზავნებათ თქვენს მიმდევრებს, ზოგიერთ შემთხვევაში ეს ნიშნავს, რომ ისინი იგზავნება სხვა სერვერებზე და მათი ასლები იქვე ინახება. როდესაც აუქმებთ პოსტს, ეს მოქმედება ეგზავნებათ თქვენს მიმდევრებს. რე-ბლოგირების ან ფავორიტად ქცევის ქმედებები ასევე საქვეყნოა.
-
პირდაპირი და პოსტები მხოლოდ-მიმდევრებისთვის: ყველა პოსტი ინახება და მათი პროცესირება ხდება სერვერზე. პოსტები რომლებიც განეკუთვნება მხოლოდ მიმდევრებს მიეწოდებათ მათ, მომხმარებლები, რომლებიც დასახელებულია პოსტებში და პირდაპირი პოსტები ეგზავნებათ მხოლოდ ჩამოთვლილ მომხმარებლებს. ზოგიერთ შემთხვევაში, ეს ნიშნავს, რომ გადაგზავნა ხდება გარე სერვერებზე და ასლებიც იქ ინახება. ჩვენ დიდ ძალისხმევას ვუწევთ წვდომის ლიმიტს მხოლოდ აუტორიზირებული ადამიანებისთვის, თუმცა სხვა სერვერებმა შეიძლება ეს არ აწარმოონ. აქედან გამომდინარე, მნიშვნელოვანია განიხილოთ სერვერები, საიდანაც მოდიან თქვენი მიმდევრები. შეგიძლიათ ჩართოთ ან გამორთოთ პარამეტრი, დაადასტუროთ ან უარყოთ ახალი მიმდევარი. გთხოვთ გაითვალისწინოთ, რომ სერვერის ოპერაციები და სხვა მიმღები სერვერები შესაძლოა კითხულობდნენ ამგვარ წერილებს, მიმღებებს შეუძლიათ შექმნან სქრინშოთი, დააკოპირონ ან ხელახლა გააზიარონ ისინი. არ გააზიაროთ საშიში ინფორმაცია მასტოდონით.
-
აი-პიები და სხვა მეტა-მონაცემები: როდესაც გაივლით აუტენტიფიკაციას, ჩვენ ვინახავთ აი-პი მისამართს საიდანაც შემოხვედით, ასევე ბრაუზერის აპლიკაციას. ყველა ავტორიზირებული სესია თქვენთვის განსახილველად და გასაუქმებლად ხელმისაწვდომია პარამეტრებში. ბოლო შენახული აი-პი მისამართი ინახება მაქსიმუმ 12 თვით. ჩვენ ასევე შეიძლება გაგვაჩნდეს სერვერის ლოგი, რომელიც ინახავს თითოეული მოთხოვნის IP მისამართს.
+
ძირითადი ანგარიშის ინფორმაცია: თუ დარეგისტრირდებით ამ სერვერზე, შესაძლოა მოგთხოვოთ მომხმარებლის სახელი, ელ-ფოსტის მისამართი და პაროლი. შესაძლებელია, ასევე შეიყვანოთ დამატებითი პროფილის ინორმაცია, როგორიცაა დისპლეის სახელი და ბიოგრაფია, ასევე ატვირთოთ პროფილის და დასათაურების სურათი. მომხმარებლის სახელი, დისპლეის სახელი, ბიოგრაფია, პროფილის სურათი, დასათაურების სურათი ყოველთვის ღიადაა ჩამოთვლილი.
+
პოსტები, დადევნებები და სხვა საჯარო ინფორმაცია: ადამიანების სია, რომლებსაც მიჰყვებით საჯაროდაა ჩამოთვლილი, იგივე ეხება თქვენს მიდევრებსაც. როდესაც აგზავნით წერილს, თარიღი, დრო და აპლიკაცია თუ საიდანაც განათავსეთ წერილი ინახება. წერილები შესაძლოა შეიცავდნენ მედია ფაილებს, როგორებიცაა სურათები და ვიდეოები. ღია და ჩამოუთვლელი პოსტები ხელმისაწვდომია საჯაროდ. როდესაც ათავსებთ პოსტს თქვენს პროფილზე, ის ასევე საჟაროდ წვდომადი ხდება. თქვენი პოსტები ეგზავნებათ თქვენს მიმდევრებს, ზოგიერთ შემთხვევაში ეს ნიშნავს, რომ ისინი იგზავნება სხვა სერვერებზე და მათი ასლები იქვე ინახება. როდესაც აუქმებთ პოსტს, ეს მოქმედება ეგზავნებათ თქვენს მიმდევრებს. რე-ბლოგირების ან ფავორიტად ქცევის ქმედებები ასევე საქვეყნოა.
+
პირდაპირი და პოსტები მხოლოდ-მიმდევრებისთვის: ყველა პოსტი ინახება და მათი პროცესირება ხდება სერვერზე. პოსტები რომლებიც განეკუთვნება მხოლოდ მიმდევრებს მიეწოდებათ მათ, მომხმარებლები, რომლებიც დასახელებულია პოსტებში და პირდაპირი პოსტები ეგზავნებათ მხოლოდ ჩამოთვლილ მომხმარებლებს. ზოგიერთ შემთხვევაში, ეს ნიშნავს, რომ გადაგზავნა ხდება გარე სერვერებზე და ასლებიც იქ ინახება. ჩვენ დიდ ძალისხმევას ვუწევთ წვდომის ლიმიტს მხოლოდ აუტორიზირებული ადამიანებისთვის, თუმცა სხვა სერვერებმა შეიძლება ეს არ აწარმოონ. აქედან გამომდინარე, მნიშვნელოვანია განიხილოთ სერვერები, საიდანაც მოდიან თქვენი მიმდევრები. შეგიძლიათ ჩართოთ ან გამორთოთ პარამეტრი, დაადასტუროთ ან უარყოთ ახალი მიმდევარი. გთხოვთ გაითვალისწინოთ, რომ სერვერის ოპერაციები და სხვა მიმღები სერვერები შესაძლოა კითხულობდნენ ამგვარ წერილებს, მიმღებებს შეუძლიათ შექმნან სქრინშოთი, დააკოპირონ ან ხელახლა გააზიარონ ისინი. არ გააზიაროთ საშიში ინფორმაცია მასტოდონით.
+
აი-პიები და სხვა მეტა-მონაცემები: როდესაც გაივლით აუტენტიფიკაციას, ჩვენ ვინახავთ აი-პი მისამართს საიდანაც შემოხვედით, ასევე ბრაუზერის აპლიკაციას. ყველა ავტორიზირებული სესია თქვენთვის განსახილველად და გასაუქმებლად ხელმისაწვდომია პარამეტრებში. ბოლო შენახული აი-პი მისამართი ინახება მაქსიმუმ 12 თვით. ჩვენ ასევე შეიძლება გაგვაჩნდეს სერვერის ლოგი, რომელიც ინახავს თითოეული მოთხოვნის IP მისამართს.
@@ -724,9 +712,9 @@ ka:
ნებისმიერი სხვა ინფორმაცია, რომელსაც ვაგროვებთ თქვენგან შესაძლოა გამოყენებულ იქნას შემდეგი გზებით:
-
რომ უზრუნველვყოთ მასტოდონის მთავარი ფუნქციონალი. შეგიძლიათ ინტერაქცია გაუწიოთ მხოლოდ სხვის კონტენტს და შექმნათ პოსტები მაშინ როდესაც ავტორიზებული ხართ. მაგალითად, შესაძლოა გაჰყვეთ სხვა ადამიანებს, რათა იხილოთ მათი ჯამური პოსტები საკუთარ პერსონალიზებულ სახლის თაიმლაინზე.
-
რომ შევუწყვოთ ხელი საზოგადოების მოდერაციას, მაგალითად შევადაროთ თქვენი აი-პი მისამართი სხვა ცნობილ მისამართებს, რათა ამოვიცნოთ ბანის გადაუხდელობა ან სხვა დარღვევები.
-
ელ-ფოსტის მისამართი რომელსაც გვაწვდით, შესაძლოა გამოვიყენოთ თქვენთვის ინფორმაციის გამოსაგძავნად, შეგატყობინოთ სხვა ადამიანების ინტერაქციაზე თქვენს კონტენტთან ან თქვენთვის გამოგზავნილ წერილებზე, ასევე რომ გიპასუხოთ მოთხოვნებზე და/ან სხვა საკითხებზე.
+
რომ უზრუნველვყოთ მასტოდონის მთავარი ფუნქციონალი. შეგიძლიათ ინტერაქცია გაუწიოთ მხოლოდ სხვის კონტენტს და შექმნათ პოსტები მაშინ როდესაც ავტორიზებული ხართ. მაგალითად, შესაძლოა გაჰყვეთ სხვა ადამიანებს, რათა იხილოთ მათი ჯამური პოსტები საკუთარ პერსონალიზებულ სახლის თაიმლაინზე.
+
რომ შევუწყვოთ ხელი საზოგადოების მოდერაციას, მაგალითად შევადაროთ თქვენი აი-პი მისამართი სხვა ცნობილ მისამართებს, რათა ამოვიცნოთ ბანის გადაუხდელობა ან სხვა დარღვევები.
+
ელ-ფოსტის მისამართი რომელსაც გვაწვდით, შესაძლოა გამოვიყენოთ თქვენთვის ინფორმაციის გამოსაგძავნად, შეგატყობინოთ სხვა ადამიანების ინტერაქციაზე თქვენს კონტენტთან ან თქვენთვის გამოგზავნილ წერილებზე, ასევე რომ გიპასუხოთ მოთხოვნებზე და/ან სხვა საკითხებზე.
@@ -742,8 +730,8 @@ ka:
ჩვენ არ დავიშურებთ ძალისხმევას რომ:
-
შევინარჩუნოთ სერვერის ლოგები, რომლებიც მოიცავენ ყველა მოთხოვნის აი-პი მისამართს, თუმცა ესეთი ლოგები არ ინახება 90 დღეზე მეტ ხანს.
შეგიძლიათ მოითხოვოთ და ჩამოტვირთოთ თქვენი კონტენტის არქივი, რომელიც მოიცავს თქვენს პოსტებს, მედია ფაილებს, პროფილის და დასათაურების სურათს.
@@ -792,10 +780,6 @@ ka:
contrast: მაღალი კონტრასტი
default: მასტოდონი
mastodon-light: მასტოდონი (ღია)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: დასამოწმებლად შეიყვანეთ თქვენი აუტენტიფიკატორ აპლიკაციისგან გენერირებული კოდი
description_html: თუ ჩართავთ მეორე-ფაქტორის აუტენტიფიკაციას, შესვლისას აუცილებელი იქნება ფლობდეთ ტელეფონს, რომელიც დააგენერირებს შესვლის ტოკენებს.
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 84bd71081..c6212c378 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -5,7 +5,6 @@ kk:
about_mastodon_html: Mastodon - әлеуметтік желіге негізделген, тегін және веб протоколды, ашық кодты бағдарлама. Ол email сияқты орталығы жоқ құрылым.
about_this: Туралы
administered_by: 'Админ:'
- api: API
apps: Мобиль қосымшалар
contact: Байланыс
contact_missing: Бапталмаған
@@ -89,7 +88,6 @@ kk:
display_name: Атын көрсет
domain: Домен
edit: Түзету
- email: Email
email_status: Email статусы
enable: Қосу
enabled: Қосылды
@@ -100,7 +98,6 @@ kk:
header: Басы
inbox_url: Келген хаттар URL
invited_by: Шақырған
- ip: IP
joined: Қосылды
location:
all: Барлығы
@@ -468,7 +465,6 @@ kk:
subject: New rеport for %{instance} (#%{id})
application_mailer:
notification_preferences: Change e-mail prеferences
- salutation: "%{name},"
settings: 'Change e-mail preferеnces: %{link}'
view: 'Viеw:'
view_profile: Viеw Profile
@@ -691,11 +687,9 @@ kk:
number:
human:
decimal_units:
- format: "%n%u"
units:
billion: В
million: М
- quadrillion: Q
thousand: К
trillion: Т
pagination:
@@ -703,7 +697,6 @@ kk:
next: Келесі
older: Ерте
prev: Алдыңғы
- truncate: "…"
polls:
errors:
already_voted: Бұл сауалнамаға қатысқансыз
@@ -715,10 +708,7 @@ kk:
too_few_options: бір жауаптан көп болуы керек
too_many_options: "%{max} жауаптан көп болмайды"
preferences:
- languages: Тілдер
other: Басқа
- publishing: Жариялау
- web: Веб
remote_follow:
acct: Өзіңіздің username@domain теріңіз
missing_resource: Аккаунтыңызға байланған URL табылмады
@@ -827,7 +817,6 @@ kk:
vote: Дауыс беру
show_more: Тағы әкел
sign_in_to_participate: Сұхбатқа қатысу үшін кіріңіз
- title: '%{name}: "%{quote}"'
visibilities:
private: Тек оқырмандарға
private_long: Тек оқырмандарға ғана көрінеді
@@ -845,10 +834,10 @@ kk:
What information do we collect?
-
Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
-
Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
-
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
-
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
+
Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
+
Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
+
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
+
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
@@ -858,9 +847,9 @@ kk:
Any of the information we collect from you may be used in the following ways:
-
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
-
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
-
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
+
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
+
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
+
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
@@ -876,8 +865,8 @@ kk:
We will make a good faith effort to:
-
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
-
Retain the IP addresses associated with registered users no more than 12 months.
+
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
+
Retain the IP addresses associated with registered users no more than 12 months.
You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
@@ -926,10 +915,6 @@ kk:
contrast: Mastodon (Жоғары контраст)
default: Mastodon (Қою)
mastodon-light: Mastodon (Ашық)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: Растау үшін түпнұсқалықты растау бағдарламасы арқылы жасалған кодты енгізіңіз
description_html: "екі факторлы түпнұсқалықты растауды қоссаңыз, кіру үшін сізге телефонға кіруіңізді талап етеді, сізге арнайы токен беріледі."
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 6334ad30b..3f14d5df6 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -14,7 +14,7 @@ ko:
browse_public_posts: 마스토돈의 공개 라이브 스트림을 둘러보기
contact: 연락처
contact_missing: 미설정
- contact_unavailable: N/A
+ contact_unavailable: 없음
discover_users: 유저 발견하기
documentation: 문서
extended_description_html: |
@@ -30,13 +30,11 @@ ko:
server_stats: '서버 통계:'
source_code: 소스 코드
status_count_after:
- one: 툿
other: 툿
status_count_before: 툿 수
tagline: 친구들을 팔로우 하고 새로운 사람들도 만나기
terms: 이용약관
user_count_after:
- one: 명
other: 명
user_count_before: 사용자 수
what_is_mastodon: 마스토돈이란?
@@ -44,7 +42,6 @@ ko:
choices_html: "%{name}의 추천:"
follow: 팔로우
followers:
- one: 팔로워
other: 팔로워
following: 팔로잉
joined: "%{date}에 가입함"
@@ -59,7 +56,6 @@ ko:
pin_errors:
following: 추천하려는 사람을 팔로우 하고 있어야 합니다
posts:
- one: 툿
other: 툿
posts_tab_heading: 툿
posts_with_replies: 툿과 답장
@@ -174,6 +170,7 @@ ko:
statuses: 툿 수
subscribe: 구독하기
suspended: 정지 됨
+ time_in_queue: "%{time}동안 기다림"
title: 계정
unconfirmed_email: 미확인 된 이메일 주소
undo_silenced: 침묵 해제
@@ -269,6 +266,7 @@ ko:
created_msg: 도메인 차단 처리를 완료했습니다
destroyed_msg: 도메인 차단이 해제되었습니다
domain: 도메인
+ existing_domain_block_html: 이미 %{name}에 대한 더 강력한 제한이 걸려 있습니다, 차단 해제를 먼저 해야 합니다.
new:
create: 차단 추가
hint: 도메인 차단은 내부 데이터베이스에 계정이 생성되는 것까지는 막을 수 없지만, 그 도메인에서 생성된 계정에 자동적으로 특정한 모더레이션을 적용하게 할 수 있습니다.
@@ -291,7 +289,6 @@ ko:
suspend: 정지
show:
affected_accounts:
- one: 데이터베이스 중 1개의 계정에 영향을 끼칩니다
other: 데이터베이스 중 %{count}개의 계정에 영향을 끼칩니다
retroactive:
silence: 이 도메인에 존재하는 모든 계정의 침묵를 해제
@@ -316,7 +313,6 @@ ko:
by_domain: 도메인
delivery_available: 전송 가능
known_accounts:
- one: 알려진 계정 %{count}개
other: 알려진 계정 %{count}개
moderation:
all: 모두
@@ -499,11 +495,17 @@ ko:
body: "%{reporter} 가 %{target} 를 신고했습니다"
body_remote: "%{domain}의 누군가가 %{target}을 신고했습니다"
subject: "%{instance} 에 새 신고 등록됨 (#%{id})"
+ appearance:
+ advanced_web_interface: 고급 웹 인터페이스
+ advanced_web_interface_hint: '화면의 가로폭을 가득 채우고 싶다면, 고급 웹 인터페이스는 한 번에 여러 정보를 볼 수 있도록 여러 컬럼을 설정할 수 있도록 합니다: 홈, 알림, 연합타임라인, 리스트, 해시태그 등'
+ animations_and_accessibility: 애니메이션과 접근성
+ confirmation_dialogs: 확인 대화상자
+ sensitive_content: 민감한 내용
application_mailer:
notification_preferences: 메일 설정 변경
salutation: "%{name} 님,"
settings: '메일 설정을 변경: %{link}'
- view: 'View:'
+ view: '보기:'
view_profile: 프로필 보기
view_status: 게시물 보기
applications:
@@ -580,7 +582,6 @@ ko:
explore_mastodon: "%{title} 탐사하기"
how_to_enable: 아직 디렉터리에 참여하지 않았습니다. 아래에서 참여할 수 있습니다. 바이오 텍스트에 해시태그를 사용해 특정 해시태그 디렉터리에 표시 될 수 있습니다!
people:
- one: "%{count}명"
other: "%{count}명"
errors:
'403': 이 페이지를 표시할 권한이 없습니다.
@@ -643,7 +644,6 @@ ko:
order_by: 순서
save_changes: 변경 사항을 저장
validation_errors:
- one: 오류가 발생했습니다. 아래 오류를 확인해 주십시오
other: 오류가 발생했습니다. 아래 %{count}개 오류를 확인해 주십시오
html_validator:
invalid_markup: '올바르지 않은 HTML 마크업을 포함하고 있습니다: %{error}'
@@ -694,7 +694,6 @@ ko:
generate: 생성
invited_by: '당신을 초대한 사람:'
max_uses:
- one: 일회용
other: "%{count} 회"
max_uses_prompt: 제한 없음
prompt: 이 서버에 대한 초대 링크를 만들고 공유합니다
@@ -722,10 +721,8 @@ ko:
body: 마지막 로그인(%{since}) 이후로 일어난 일들에 관한 요약
mention: "%{name} 님이 답장했습니다:"
new_followers_summary:
- one: 그리고, 접속 하지 않으신 동안 새 팔로워가 생겼습니다!
other: 게다가, 접속하지 않은 동안 %{count} 명의 팔로워가 생겼습니다!
subject:
- one: "1건의 새로운 알림 \U0001F418"
other: "%{count}건의 새로운 알림 \U0001F418"
title: 당신이 없는 동안에...
favourite:
@@ -760,7 +757,6 @@ ko:
quadrillion: Q
thousand: K
trillion: T
- unit: "."
pagination:
newer: 새로운 툿
next: 다음
@@ -778,10 +774,9 @@ ko:
too_few_options: 한가지 이상의 항목을 포함해야 합니다
too_many_options: 항목은 %{max}개를 넘을 수 없습니다
preferences:
- languages: 언어
other: 기타
- publishing: 퍼블리싱
- web: 웹
+ posting_defaults: 게시물 기본설정
+ public_timelines: 공개 타임라인
relationships:
activity: 계정 활동
dormant: 휴면
@@ -839,7 +834,7 @@ ko:
phantom_js: PhantomJS
qq: QQ 브라우저
safari: 사파리
- uc_browser: UCBrowser
+ uc_browser: UC브라우저
weibo: 웨이보
current_session: 현재 세션
description: "%{platform}의 %{browser}"
@@ -885,15 +880,12 @@ ko:
attached:
description: '첨부: %{attached}'
image:
- one: "%{count} 이미지"
other: "%{count} 이미지"
video:
- one: "%{count} 영상"
other: "%{count} 영상"
- boosted_from_html: "%{acct_link} 님이 부스트"
+ boosted_from_html: "%{acct_link} 님으로부터 부스트"
content_warning: '열람 주의: %{warning}'
disallowed_hashtags:
- one: '허용 되지 않은 해시태그를 포함하고 있습니다: %{tags}'
other: '허용되지 않은 해시태그를 포함하고 있습니다: %{tags}'
language_detection: 자동으로 언어 감지
open_in_web: Web으로 열기
@@ -905,7 +897,6 @@ ko:
reblog: 부스트는 고정될 수 없습니다
poll:
total_votes:
- one: "%{count}명 투표함"
other: "%{count}명 투표함"
vote: 투표
show_more: 더 보기
@@ -928,10 +919,10 @@ ko:
우리가 어떤 정보를 수집하나요?
-
기본 계정 정보: 이 서버에 가입하실 때 유저네임, 이메일 주소, 패스워드 등을 입력 받게 됩니다. 추가적으로 디스플레이네임이나 자기소개, 프로필 이미지, 헤더 이미지 등의 프로필 정보를 입력하게 됩니다. 유저네임, 디스플레이네임, 자기소개, 프로필 이미지와 헤더 이미지는 언제나 공개적으로 게시됩니다.
-
게시물, 팔로잉, 기타 공개된 정보: 당신이 팔로우 하는 사람들의 리스트는 공개됩니다. 당신을 팔로우 하는 사람들도 마찬가지입니다. 당신이 게시물을 작성하는 경우, 응용프로그램이 메시지를 받았을 때의 날짜와 시간이 기록 됩니다. 게시물은 그림이나 영상 등의 미디어를 포함할 수 있습니다. 퍼블릭과 미표시(unlisted) 게시물은 공개적으로 접근이 가능합니다. 프로필에 게시물을 고정하는 경우 마찬가지로 공개적으로 접근 가능한 정보가 됩니다. 당신의 게시물들은 당신의 팔로워들에게 전송 됩니다. 몇몇 경우 이것은 다른 서버에 전송되고 그곳에 사본이 저장 됩니다. 당신이 게시물을 삭제하는 경우 이 또한 당신의 팔로워들에게 전송 됩니다. 다른 게시물을 리블로깅 하거나 즐겨찾기 하는 경우 이는 언제나 공개적으로 제공 됩니다.
-
DM, 팔로워 공개 게시물: 모든 게시물들은 서버에서 처리되고 저장됩니다. 팔로워 공개 게시물은 당신의 팔로워와 멘션 된 사람들에게 전달이 됩니다. 다이렉트 메시지는 멘션 된 사람들에게만 전송 됩니다. 몇몇 경우 이것은 다른 서버에 전송 되고 그곳에 사본이 저장됨을 의미합니다. 우리는 이 게시물들이 권한을 가진 사람들만 열람이 가능하도록 노력을 할 것이지만 다른 서버에서는 이것이 실패할 수도 있습니다. 그러므로 당신의 팔로워들이 속한 서버를 재확인하는 것이 중요합니다. 당신은 새 팔로워를 수동으로 승인하거나 거절하도록 설정을 변경할 수 있습니다. 해당 서버의 운영자는 서버가 받는 메시지를 열람할 수 있다는 것을 항상 염두해 두세요, 그리고 수신자들은 스크린샷을 찍거나 복사하는 등의 방법으로 다시 공유할 수 있습니다. 위험한 정보를 마스토돈을 통해 공유하지 마세요.
-
IP와 기타 메타데이터: 당신이 로그인 하는 경우 IP 주소와 브라우저의 이름을 저장합니다. 모든 세션은 당신이 검토하고 취소할 수 있도록 설정에서 제공 됩니다. 마지막으로 사용 된 IP 주소는 최대 12개월 간 저장됩니다. 또한, 모든 요청에 대해 IP주소를 포함한 정보를 로그에 저장할 수 있습니다.
+
기본 계정 정보: 이 서버에 가입하실 때 유저네임, 이메일 주소, 패스워드 등을 입력 받게 됩니다. 추가적으로 디스플레이네임이나 자기소개, 프로필 이미지, 헤더 이미지 등의 프로필 정보를 입력하게 됩니다. 유저네임, 디스플레이네임, 자기소개, 프로필 이미지와 헤더 이미지는 언제나 공개적으로 게시됩니다.
+
게시물, 팔로잉, 기타 공개된 정보: 당신이 팔로우 하는 사람들의 리스트는 공개됩니다. 당신을 팔로우 하는 사람들도 마찬가지입니다. 당신이 게시물을 작성하는 경우, 응용프로그램이 메시지를 받았을 때의 날짜와 시간이 기록 됩니다. 게시물은 그림이나 영상 등의 미디어를 포함할 수 있습니다. 퍼블릭과 미표시(unlisted) 게시물은 공개적으로 접근이 가능합니다. 프로필에 게시물을 고정하는 경우 마찬가지로 공개적으로 접근 가능한 정보가 됩니다. 당신의 게시물들은 당신의 팔로워들에게 전송 됩니다. 몇몇 경우 이것은 다른 서버에 전송되고 그곳에 사본이 저장 됩니다. 당신이 게시물을 삭제하는 경우 이 또한 당신의 팔로워들에게 전송 됩니다. 다른 게시물을 리블로깅 하거나 즐겨찾기 하는 경우 이는 언제나 공개적으로 제공 됩니다.
+
DM, 팔로워 공개 게시물: 모든 게시물들은 서버에서 처리되고 저장됩니다. 팔로워 공개 게시물은 당신의 팔로워와 멘션 된 사람들에게 전달이 됩니다. 다이렉트 메시지는 멘션 된 사람들에게만 전송 됩니다. 몇몇 경우 이것은 다른 서버에 전송 되고 그곳에 사본이 저장됨을 의미합니다. 우리는 이 게시물들이 권한을 가진 사람들만 열람이 가능하도록 노력을 할 것이지만 다른 서버에서는 이것이 실패할 수도 있습니다. 그러므로 당신의 팔로워들이 속한 서버를 재확인하는 것이 중요합니다. 당신은 새 팔로워를 수동으로 승인하거나 거절하도록 설정을 변경할 수 있습니다. 해당 서버의 운영자는 서버가 받는 메시지를 열람할 수 있다는 것을 항상 염두해 두세요, 그리고 수신자들은 스크린샷을 찍거나 복사하는 등의 방법으로 다시 공유할 수 있습니다. 위험한 정보를 마스토돈을 통해 공유하지 마세요.
+
IP와 기타 메타데이터: 당신이 로그인 하는 경우 IP 주소와 브라우저의 이름을 저장합니다. 모든 세션은 당신이 검토하고 취소할 수 있도록 설정에서 제공 됩니다. 마지막으로 사용 된 IP 주소는 최대 12개월 간 저장됩니다. 또한, 모든 요청에 대해 IP주소를 포함한 정보를 로그에 저장할 수 있습니다.
@@ -941,9 +932,9 @@ ko:
당신에게서 수집한 정보는 다음과 같은 곳에 사용 됩니다:
-
마스토돈의 주요 기능 제공. 다른 사람의 게시물에 상호작용 하거나 자신의 게시물을 작성하기 위해서는 로그인을 해야 합니다. 예를 들어, 다른 사람의 게시물을 자신만의 홈 타임라인에서 모아 보기 위해 팔로우를 할 수 있습니다.
-
커뮤니티의 모더레이션을 위해, 예를 들어 당신의 IP 주소와 기타 사항을 비교하여 금지를 우회하거나 다른 규칙을 위반하는지 판단하는 데에 사용할 수 있습니다.
-
당신이 제공한 이메일 주소를 통해 정보, 다른 사람들의 반응이나 받은 메시지에 대한 알림, 기타 요청 등에 관한 응답 요청 등을 보내는 데에 활용됩니다.
+
마스토돈의 주요 기능 제공. 다른 사람의 게시물에 상호작용 하거나 자신의 게시물을 작성하기 위해서는 로그인을 해야 합니다. 예를 들어, 다른 사람의 게시물을 자신만의 홈 타임라인에서 모아 보기 위해 팔로우를 할 수 있습니다.
+
커뮤니티의 모더레이션을 위해, 예를 들어 당신의 IP 주소와 기타 사항을 비교하여 금지를 우회하거나 다른 규칙을 위반하는지 판단하는 데에 사용할 수 있습니다.
+
당신이 제공한 이메일 주소를 통해 정보, 다른 사람들의 반응이나 받은 메시지에 대한 알림, 기타 요청 등에 관한 응답 요청 등을 보내는 데에 활용됩니다.
@@ -959,8 +950,8 @@ ko:
우리는 다음을 위해 노력을 할 것입니다:
-
IP를 포함해 이 서버에 전송 되는 모든 요청에 대한 로그는 90일을 초과하여 저장되지 않습니다.
-
가입 된 유저의 IP 정보는 12개월을 초과하여 저장 되지 않습니다.
+
IP를 포함해 이 서버에 전송 되는 모든 요청에 대한 로그는 90일을 초과하여 저장되지 않습니다.
+
가입 된 유저의 IP 정보는 12개월을 초과하여 저장 되지 않습니다.
당신은 언제든지 게시물, 미디어 첨부, 프로필 이미지, 헤더 이미지를 포함한 당신의 컨텐트에 대한 아카이브를 요청하고 다운로드 할 수 있습니다.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 7ea8dc76b..2cf0b7c42 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -5,11 +5,9 @@ lt:
about_mastodon_html: Mastodon, tai socialinis tinklas pagrįstas atviro kodo programavimu, ir atvirais web protokolais. Visiškai nemokamas. Ši sistema decantrilizuota kaip jūsų elektroninis paštas.
about_this: Apie
administered_by: 'Administruoja:'
- api: API
apps: Mobilioji Aplikacija
contact: Kontaktai
contact_missing: Nenustatyta
- contact_unavailable: N/A
documentation: Dokumentacija
extended_description_html: |
Taisyklės
@@ -19,25 +17,13 @@ lt:
learn_more: Daugiau
privacy_policy: Privatumo Politika
source_code: Šaltinio kodas
- status_count_after:
- few: statusai
- one: statusas
- other: statusai
status_count_before: Autorius
terms: Naudojimo sąlygos
- user_count_after:
- few: vartotojai
- one: vartotojas
- other: vartotojai
user_count_before: Namai
what_is_mastodon: Kas tai, Mastodon?
accounts:
choices_html: "%{name} pasirinkimai:"
follow: Sekti
- followers:
- few: Sekėjai
- one: Sekėjas
- other: Sekėjai
following: Sekami
joined: Prisijungiai %{date}
last_active: paskutinį kartą aktyvus
@@ -50,10 +36,6 @@ lt:
people_who_follow: Žmonės kurie seka %{name}
pin_errors:
following: Privalai sekti žmogų kurį nori pagerbti
- posts:
- few: Tootai
- one: Tootas
- other: Tootai
posts_tab_heading: Tootai
posts_with_replies: Tootai ir atsakymai
reserved_username: Vartotojo vardas rezervuotas
@@ -104,7 +86,6 @@ lt:
header: Antraštė
inbox_url: Gautųjų URL
invited_by: Pakvietė
- ip: IP
joined: Prisijungė
location:
all: Visi
@@ -166,7 +147,6 @@ lt:
unsubscribe: Nebeprenumeruoti
username: Slapyvardis
warn: Įspėti
- web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} paskyrė reportą %{target} saviems"
@@ -274,10 +254,6 @@ lt:
silence: užtildytas
suspend: uždraustas
show:
- affected_accounts:
- few: "%{count} vartotojai duomenų bazėje yra paveikti"
- one: Vienas vartotojas duomenų bazėje paveiktas
- other: "%{count} vartotojai duomenų bazėje yra paveikti"
retroactive:
silence: Atitildyti visus egzistuojančius vartotojus šiame domene
suspend: Atblokuotis visus egzistuojančius vartotojus šiame domene
@@ -300,10 +276,6 @@ lt:
instances:
by_domain: Domenas
delivery_available: Pristatymas galimas
- known_accounts:
- few: "%{count} žinomos paskyros"
- one: "%{count} žinoma paskyra"
- other: "%{count} žinomos paskyros"
moderation:
all: Visi
limited: Limituotas
@@ -476,7 +448,6 @@ lt:
subject: Naujas skundas %{instance} (#%{id})
application_mailer:
notification_preferences: Keisti el pašto parinktis
- salutation: "%{name},"
settings: 'Keisti el pašto parinktis: %{link}'
view: 'Peržiūra:'
view_profile: Peržiurėti profilį
@@ -502,9 +473,6 @@ lt:
migrate_account: Prisijungti prie kitos paskyros
migrate_account_html: Jeigu norite nukreipti šią paskyrą į kita, galite tai konfiguruoti čia.
or_log_in_with: Arba prisijungti su
- providers:
- cas: CAS
- saml: SAML
register: Užsiregistruoti
resend_confirmation: Išsiųsti dar kartą patvirtinimo instrukcijas
reset_password: Atstatyti slaptažodį
@@ -550,10 +518,6 @@ lt:
explanation: Raskite vartotojus, remiantis tuo, kuo jie domisi
explore_mastodon: Naršyti %{title}
how_to_enable: Jūs nesate prisijungęs prie šios direktorijos. Galite prisijungti žemiau. Naudokite saitažodžius savo biografiniame tekste, kad būtumėte rastas naudojantis specifinius saitažodžius!
- people:
- few: "%{count} žmonės"
- one: "%{count} žmogus"
- other: "%{count} žmonės"
errors:
'403': Jūs neturie prieigos matyti šiam puslapiui.
'404': Puslapis nerastas.
@@ -575,7 +539,6 @@ lt:
request: Prašyti savo archyvo
size: Dydis
blocks: Jūs blokuojate
- csv: CSV
domain_blocks: Domeno blokai
follows: Jūs sekate
lists: Sąrašai
@@ -609,10 +572,6 @@ lt:
changes_saved_msg: Pakeitimai sėkmingai išsaugoti!
copy: Kopijuoti
save_changes: Išsaugoti pakeitimus
- validation_errors:
- few: Kažkas negerai! Prašau patikrinti %{count} klaidas žemiau
- one: Kažkas negerai! Peržiūrėk klaidas žemiau
- other: Kažkas negerai! Prašau patikrinti %{count} klaidas žemiau
imports:
modes:
merge: Sulieti
@@ -641,10 +600,6 @@ lt:
expires_in_prompt: Niekada
generate: Generuoti
invited_by: 'Jus pakvietė:'
- max_uses:
- few: "%{count} naudojimai"
- one: 1 naudojimas
- other: "%{count} naudojimai"
max_uses_prompt: Be limito
prompt: Generuoti ir dalintis įrašais su kitais, kad sukurti prieigą prie serverio
table:
@@ -670,14 +625,6 @@ lt:
action: Peržiurėti visus pranešimus
body: Čia yra trumpa santrauka žinutės, kurią jūs praleidote nuo jūsų paskutinio apsilankymo %{since}
mention: "%{name} paminėjo jus:"
- new_followers_summary:
- few: Beje, jūs gavote %{count} naujų sekėjų, nuo jūsų paskutinio apsilankymo! Nuostabu!
- one: Beje, jūs gavote naują sekėją, kol buvote atsijungęs! Yay!
- other: Beje, jūs gavote %{count} naujų sekėjų, nuo jūsų paskutinio apsilankymo! Nuostabu!
- subject:
- few: "%{count} nauji pranešimai, nuo paskutinio apsilankymo\U0001F418"
- one: "1 naujas pranešimas nuo paskutinio apsilankymo \U0001F418"
- other: "%{count} nauji pranešimai, nuo paskutinio apsilankymo\U0001F418"
title: Kol jūsų nebuvo...
favourite:
body: 'Jūsų statusą pamėgo %{name}:'
@@ -701,27 +648,13 @@ lt:
body: 'Jūsų statusą pakėlė %{name}:'
subject: "%{name} pakėlė Jūsų statusą"
title: Naujas pakėlimas
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
pagination:
newer: Naujesnis
next: Kitas
older: Senesnis
prev: Ankstesnis
- truncate: "…"
preferences:
- languages: Kalbos
other: Kita
- publishing: Skelbiama
- web: Tinklas
remote_follow:
acct: Įveskite Jūsų slapyvardį@domenas kurį norite naudoti
missing_resource: Jūsų paskyros nukreipimo URL nerasta
@@ -751,40 +684,12 @@ lt:
activity: Paskutinė veikla
browser: Naršyklė
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Nežinoma naršyklė
- ie: Internet Explorer
- micro_messenger: MicroMessenger
- nokia: Nokia S40 Ovi Browser
- opera: Opera
- otter: Otter
- phantom_js: PhantomJS
- qq: QQ Browser
- safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Dabartinė sesija
description: "%{browser} ant %{platform}"
explanation: Čia rodomos web naršyklės prijungtos prie Jūsų Mastodon paskyros.
- 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: nežinoma platforma
- windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Atšaukti
revoke_success: Sesija sėkmingai atšaukta
title: Sesijos
@@ -804,20 +709,8 @@ lt:
statuses:
attached:
description: 'Pridėta: %{attached}'
- image:
- few: "%{count} nuotraukos"
- one: "%{count} nuotrauka"
- other: "%{count} nuotraukos"
- video:
- few: "%{count} vaizdo įrašai"
- one: "%{count} video"
- other: "%{count} vaizdo įrašai"
boosted_from_html: Pakelta iš %{acct_link}
content_warning: 'Turinio įspėjimas: %{warning}'
- disallowed_hashtags:
- few: 'rasti neleistini saitąžodžiai: %{tags}'
- one: 'rastas neleistinas saitažodis : %{tags}'
- other: 'rasti neleistini saitąžodžiai: %{tags}'
language_detection: Automatiškai nustatyti kalbą
open_in_web: Atidaryti naudojan Web
over_character_limit: pasiektas %{max} simbolių limitas
@@ -828,7 +721,6 @@ lt:
reblog: Pakeltos žinutės negali būti prisegtos
show_more: Daugiau
sign_in_to_participate: Prisijunkite jeigu norite dalyvauti pokalbyje
- title: '%{name}: "%{quote}"'
visibilities:
private: Tik sekėjams
private_long: Rodyti tik sekėjams
@@ -925,10 +817,6 @@ lt:
contrast: Mastodon (Didelio Kontrasto)
default: Mastodon (Tamsus)
mastodon-light: Mastodon (Šviesus)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: Įveskite autentikacijos aplikacijos sugeneruotą kodą kad galėtumete tęsti
description_html: Jeigu įjungiate dviejų veiksnių autentikaciją, prisijungiant jums reikės turėti su savimi savo telefoną, kuris jums generuos prisijungimo žetonus.
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 0967ef424..971450a89 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1 +1,17 @@
-{}
+---
+lv:
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index fbadd80fd..3597ccd15 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -5,7 +5,6 @@ ms:
about_mastodon_html: Mastodon ialah rangkaian sosial berasaskan protokol web terbuka dan perisian percuma bersumber terbuka. Ianya tak terpusat seperti emel.
about_this: Mengenai Kami
administered_by: 'Ditadbir oleh:'
- api: API
apps: Aplikasi mudah alih
contact: Hubungi kami
contact_missing: Tidak ditetapkan
@@ -20,12 +19,10 @@ ms:
privacy_policy: Polisi privasi
source_code: Kod sumber
status_count_after:
- one: status
other: status
status_count_before: Telah menulis
terms: Terma perkhidmatan
user_count_after:
- one: pengguna
other: pengguna
user_count_before: Rumah kepada
what_is_mastodon: Apakah itu Mastodon?
@@ -33,12 +30,10 @@ ms:
choices_html: 'Pilihan %{name}:'
follow: Ikut
followers:
- one: Pengikut
other: Pengikut
following: Mengikuti
joined: Sertai pada %{date}
link_verified_on: Pemilikan pautan ini diperiksa pada %{date}
- media: Media
moved_html: "%{name} telah berpindah ke %{new_profile_link}:"
network_hidden: Maklumat ini tidak tersedia
nothing_here: Tiada apa-apa di sini!
@@ -47,14 +42,11 @@ ms:
pin_errors:
following: Anda mestilah sudah mengikuti orang yang anda ingin syorkan
posts:
- one: Toot
other: Toot
posts_tab_heading: Toot
posts_with_replies: Toot dan maklum balas
reserved_username: Nama pengguna ini terpelihara
roles:
- admin: Admin
- bot: Bot
moderator: Pengawal
unfollow: Nyahikut
admin:
@@ -65,8 +57,6 @@ ms:
destroyed_msg: Nota kawalan telah berjaya dipadam!
accounts:
are_you_sure: Anda pasti?
- avatar: Avatar
- by_domain: Domain
change_email:
changed_msg: Emel akaun telah berjaya ditukar!
current_email: Emel Semasa
@@ -82,7 +72,6 @@ ms:
disable_two_factor_authentication: Lumpuhkan 2FA
disabled: Dilumpuhkan
display_name: Nama paparan
- domain: Domain
edit: Tukar
email: Emel
email_status: Status Emel
@@ -151,7 +140,6 @@ ms:
undo_suspension: Buang penggantungan
unsubscribe: Buang langganan
username: Nama pengguna
- web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} memberikan laporan %{target} kepada diri mereka sendiri"
@@ -186,7 +174,6 @@ ms:
deleted_status: "(status telah dipadam)"
title: Log audit
custom_emojis:
- by_domain: Domain
copied_msg: Telah berjaya mencipta salinan tempatan emoji
copy: Salin
copy_failed_msg: Tidak dapat membuat salinan tempatan emoji tersebut
@@ -195,7 +182,6 @@ ms:
destroyed_msg: Emoji berjaya dipadam!
disable: Lumpuhkan
disabled_msg: Emoji tersebut berjaya dilumpuhkan
- emoji: Emoji
enable: Bolehkan
enabled_msg: Emoji tersebut berjaya dibolehkan
image_hint: PNG, maksimum 50KB
@@ -235,7 +221,6 @@ ms:
add_new: Tambah
created_msg: Sekatan domain sedang diproses
destroyed_msg: Sekatan domain telah dibatalkan
- domain: Domain
new:
create: Cipta sekatan
hint: Sekatan domain tidak akan menghindarkan penciptaan entri akaun dalam pangkalan data, tetapi akan diberikan kaedah kawalan khusus tertentu pada akaun-akaun tersebut secara retroaktif dan automatik.
@@ -251,7 +236,6 @@ ms:
reject_reports_hint: Abaikan semua laporan daripada domain ini. Tidak dikira untuk penggantungan
show:
affected_accounts:
- one: Satu akaun dalam pangkalan data menerima kesan
other: "%{count} akaun dalam pangkalan data menerima kesan"
retroactive:
silence: Buang penyenyapan semua akaun sedia ada daripada domain ini
@@ -264,7 +248,6 @@ ms:
created_msg: Berjaya menambah domain emel ke dalam senarai hitam
delete: Padam
destroyed_msg: Berjaya memadam domain emel daripada senarai hitam
- domain: Domain
new:
create: Tambah domain
title: Entri senarai hitam emel baru
@@ -292,7 +275,6 @@ ms:
pending: Menunggu persetujuan geganti
save_and_enable: Simpan dan bolehkan
setup: Tetapkan sambungan geganti
- status: Status
title: Geganti
report_notes:
created_msg: Nota laporan berjaya dicipta!
@@ -314,9 +296,24 @@ ms:
create: Tambah nota
create_and_resolve: Selesaikan dengan nota
placeholder: Terangkan tindakan apa yang telah diambil, atau sebarang kemas kini lain yang berkaitan...
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
exports:
archive_takeout:
in_progress: Mengkompil arkib anda...
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
notification_mailer:
digest:
title: Ketika anda tiada di sini...
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e07e7b133..78be7872d 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -121,7 +121,7 @@ nl:
local: Lokaal
remote: Extern
title: Locatie
- login_status: Login status
+ login_status: Loginstatus
media_attachments: Mediabijlagen
memorialize: In gedenkpagina veranderen
moderation:
@@ -174,6 +174,7 @@ nl:
statuses: Toots
subscribe: Abonneren
suspended: Opgeschort
+ time_in_queue: "%{time} in de wachtrij"
title: Accounts
unconfirmed_email: Onbevestigd e-mailadres
undo_silenced: Niet langer negeren
@@ -234,7 +235,7 @@ nl:
new:
title: Lokale emoji toevoegen
overwrite: Overschrijven
- shortcode: Shortcode
+ shortcode: Verkorte code
shortcode_hint: Tenminste 2 tekens (alleen alfanumeriek en underscores)
title: Lokale emoji’s
unlisted: Niet weergegeven
@@ -269,6 +270,7 @@ nl:
created_msg: Domeinblokkade wordt nu verwerkt
destroyed_msg: Domeinblokkade is ongedaan gemaakt
domain: Domein
+ existing_domain_block_html: Jij hebt al strengere beperkingen opgelegd aan %{name}, je moet het domein eerst deblokkeren.
new:
create: Blokkade aanmaken
hint: Een domeinblokkade voorkomt niet dat accountgegevens van dit domein aan de database worden toegevoegd, maar dat er met terugwerkende kracht en automatisch bepaalde moderatiemethoden op deze accounts worden toegepast.
@@ -497,6 +499,12 @@ nl:
body: "%{reporter} heeft %{target} gerapporteerd"
body_remote: Iemand van %{domain} heeft %{target} gerapporteerd
subject: Nieuwe rapportage op %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Geavanceerde webomgeving
+ advanced_web_interface_hint: 'Wanneer je van de hele schermbreedte gebruik wilt maken, stelt de geavanceerde webomgeving je in staat om meerdere verschillende kolommen te configureren. Hiermee kun je zoveel mogelijk informatie op hetzelfde moment bekijken, zoals: Start, meldingen, de globale tijdlijn, meerdere lijsten en hashtags.'
+ animations_and_accessibility: Animaties en toegankelijkheid
+ confirmation_dialogs: Bevestigingen
+ sensitive_content: Gevoelige inhoud
application_mailer:
notification_preferences: E-mailvoorkeuren wijzigen
salutation: "%{name},"
@@ -753,12 +761,11 @@ nl:
decimal_units:
format: "%n%u"
units:
- billion: B
- million: M
- quadrillion: Q
+ billion: mld.
+ million: mln.
+ quadrillion: qdn.
thousand: K
- trillion: T
- unit: " "
+ trillion: bln.
pagination:
newer: Nieuwer
next: Volgende
@@ -776,10 +783,9 @@ nl:
too_few_options: moet meer dan één item bevatten
too_many_options: kan niet meer dan %{max} items bevatten
preferences:
- languages: Talen
other: Overig
- publishing: Publiceren
- web: Webapp
+ posting_defaults: Standaardinstellingen voor posten
+ public_timelines: Openbare tijdlijnen
relationships:
activity: Accountactiviteit
dormant: Sluimerend
@@ -926,10 +932,10 @@ nl:
What information do we collect?
-
Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
-
Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
-
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
-
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
+
Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
+
Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
+
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
+
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
@@ -939,9 +945,9 @@ nl:
Any of the information we collect from you may be used in the following ways:
-
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
-
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
-
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
+
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
+
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
+
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
@@ -957,8 +963,8 @@ nl:
We will make a good faith effort to:
-
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
-
Retain the IP addresses associated with registered users no more than 12 months.
+
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
+
Retain the IP addresses associated with registered users no more than 12 months.
You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index f16b314cb..d21dda6fb 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -14,25 +14,19 @@
hosted_on: Mastodon driftet på %{domain}
learn_more: Lær mer
source_code: Kildekode
- status_count_after: statuser
status_count_before: Som skrev
- user_count_after: brukere
user_count_before: Her bor
what_is_mastodon: Hva er Mastodon?
accounts:
follow: Følg
- followers: Følgere
following: Følger
- media: Media
moved_html: "%{name} har flyttet til %{new_profile_link}:"
nothing_here: Det er ingenting her!
people_followed_by: Folk som %{name} følger
people_who_follow: Folk som følger %{name}
- posts: Poster
posts_with_replies: Tuter med svar
reserved_username: Brukernavnet er reservert
roles:
- admin: Admin
moderator: Moderere
unfollow: Slutte følge
admin:
@@ -98,8 +92,6 @@
resubscribe: Abonner på nytt
role: Rettigheter
roles:
- admin: Administrator
- moderator: Moderator
staff: Personale
user: Bruker
salmon_url: Salmon-URL
@@ -116,7 +108,6 @@
undo_suspension: Angre utvisning
unsubscribe: Avslutte abonnementet
username: Brukernavn
- web: Web
action_logs:
actions:
confirm_user: "%{name} bekreftet e-postadresse for bruker %{target}"
@@ -153,7 +144,6 @@
destroyed_msg: Emojo slettet uten problem!
disable: Deaktivere
disabled_msg: Deaktiverte emoji uten problem
- emoji: Emoji
enable: Aktivere
enabled_msg: Aktiverte emojien uten problem
image_hint: PNG opp til 50KB
@@ -211,7 +201,6 @@
all: Alle
available: Tilgjengelig
expired: Utløpt
- title: Filter
title: Invitasjoner
reports:
action_taken_by: Handling utført av
@@ -223,7 +212,6 @@
reported_account: Rapportert konto
reported_by: Rapportert av
resolved: Løst
- status: Status
title: Rapporter
unresolved: Uløst
settings:
@@ -276,8 +264,6 @@
nsfw_off: NSFW AV
nsfw_on: NSFW PÅ
failed_to_execute: Utføring mislyktes
- media:
- title: Media
no_media: Ingen media
title: Kontostatuser
with_media: Med media
@@ -286,7 +272,6 @@
confirmed: Bekreftet
expires_in: Utløper om
last_delivery: Siste levering
- title: WebSub
topic: Emne
title: Administrasjon
admin_mailer:
@@ -295,7 +280,6 @@
subject: Ny rapport for %{instance} (#%{id})
application_mailer:
notification_preferences: Endre e-post innstillingene
- salutation: "%{name},"
settings: 'Endre foretrukne e-postinnstillinger: %{link}'
view: 'Se:'
view_profile: Vis Profil
@@ -369,7 +353,6 @@
noscript_html: For å bruke Mastodon webapplikasjon må du aktivere JavaScript. Alternativt kan du forsøke en av de mange integrerte appene for Mastodon til din plattform.
exports:
blocks: Du blokkerer
- csv: CSV
follows: Du følger
mutes: Du demper
storage: Medialagring
@@ -396,6 +379,7 @@
'21600': 6 timer
'3600': 1 time
'43200': 12 timer
+ '604800': 1 week
'86400': 1 dag
expires_in_prompt: Aldri
generate: Generer
@@ -456,26 +440,11 @@
body: 'Din status ble fremhevd av %{name}:'
subject: "%{name} fremhevde din status"
title: Ny fremheving
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: " "
pagination:
next: Neste
prev: Forrige
- truncate: "…"
preferences:
- languages: Språk
other: Annet
- publishing: Publisering
- web: Web
remote_follow:
acct: Tast inn brukernavn@domene som du vil følge fra
missing_resource: Kunne ikke finne URLen for din konto
@@ -485,40 +454,13 @@
activity: Siste aktivitet
browser: Nettleser
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Ukjent nettleser
- ie: Internet Explorer
- micro_messenger: MicroMessenger
- nokia: Nokia S40 Ovi Browser
- opera: Opera
- otter: Otter
- phantom_js: PhantomJS
- qq: QQ Browser
- safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Nåværende økt
description: "%{browser} på %{platform}"
explanation: Dette er nettlesere innlogget på din Mastodon-konto akkurat nå.
ip: IP-adresse
platforms:
- adobe_air: Adobe Air
- android: Android
- blackberry: Blackberry
- chrome_os: ChromeOS
- firefox_os: Firefox OS
- ios: iOS
- linux: Linux
- mac: Mac
other: ukjent plattform
- windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Tilbakekall
revoke_success: Økt tilbakekalt
title: Økter
@@ -543,7 +485,6 @@
private: Kun offentlige tuter kan festes
reblog: En fremheving kan ikke festes
show_more: Vis mer
- title: '%{name}: "%{quote}"'
visibilities:
private: Privat
private_long: Synlig kun for følgere
@@ -594,7 +535,6 @@
tip_following: Du følger din tjeners administrator(er) som standard. For å finne mer interessante personer, sjekk den lokale og forente tidslinjen.
tip_local_timeline: Den lokale tidslinjen blir kontant matet med meldinger fra personer på %{instance}. Dette er dine nærmeste naboer!
tip_mobile_webapp: Hvis din mobile nettleser tilbyr deg å legge Mastadon til din hjemmeskjerm kan du motta push-varslinger. Det er nesten som en integrert app på mange måter!
- tips: Tips
title: Velkommen ombord, %{name}!
users:
invalid_email: E-postaddressen er ugyldig
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 81f17cd3d..785caa4ec 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -7,7 +7,6 @@ oc:
active_count_after: actius
active_footnote: Utilizaire actius per mes (UAM)
administered_by: 'Administrat per :'
- api: API
apps: Aplicacions per mobil
apps_platforms: Utilizatz Mastodon d‘iOS, Android o d’autras plataforma estant
browse_directory: Navigatz per l’annuari de perfil e filtratz segon çò qu’aimatz
@@ -63,7 +62,6 @@ oc:
posts_with_replies: Tuts e responsas
reserved_username: Aqueste nom d’utilizaire es reservat
roles:
- admin: Admin
bot: Robòt
moderator: Moderador
unfollow: Quitar de sègre
@@ -79,7 +77,6 @@ oc:
accounts:
approve: Aprovar
are_you_sure: Sètz segur ?
- avatar: Avatar
by_domain: Domeni
change_email:
changed_msg: Adreça corrèctament cambiada !
@@ -110,7 +107,6 @@ oc:
header: Bandièra
inbox_url: URL de recepcion
invited_by: Convidat per
- ip: IP
joined: Venguèt
location:
all: Totes
@@ -138,7 +134,6 @@ oc:
profile_url: URL del perfil
promote: Promòure
protocol: Protocòl
- public: Public
push_subscription_expires: Fin de l’abonament PuSH
redownload: Actualizar lo perfil
remove_avatar: Supriir l’avatar
@@ -150,9 +145,7 @@ oc:
reset: Reïnicializar
reset_password: Reïnicializar lo senhal
resubscribe: Se tornar abonar
- role: Permissions
roles:
- admin: Administrator
moderator: Moderador
staff: Personnal
user: Uitlizaire
@@ -174,7 +167,6 @@ oc:
unsubscribe: Se desabonar
username: Nom d’utilizaire
warn: Avisar
- web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} s’assignèt lo rapòrt %{target}"
@@ -219,7 +211,6 @@ oc:
destroyed_msg: Emoji ben suprimit !
disable: Desactivar
disabled_msg: Aqueste emoji es ben desactivat
- emoji: Emoji
enable: Activar
enabled_msg: Aqueste emoji es ben activat
image_hint: PNG cap a 50Ko
@@ -460,7 +451,6 @@ oc:
confirmed: Confirmat
expires_in: S’acaba dins
last_delivery: Darrièra distribucion
- title: WebSub
topic: Subjècte
tags:
accounts: Comptes
@@ -469,7 +459,6 @@ oc:
name: Etiqueta
title: Etiquetas
unhide: Aparéisser dins l’annuari
- visible: Visible
title: Administracion
warning_presets:
add_new: N’ajustar un nòu
@@ -484,7 +473,6 @@ oc:
subject: Novèl senhalament per %{instance} (#%{id})
application_mailer:
notification_preferences: Cambiar las preferéncias de corrièl
- salutation: "%{name},"
settings: 'Cambiar las preferéncias de corrièl : %{link}'
view: 'Veire :'
view_profile: Veire lo perfil
@@ -512,9 +500,6 @@ oc:
migrate_account: Mudar endacòm mai
migrate_account_html: Se volètz mandar los visitors d’aqueste compte a un autre, podètz o configurar aquí.
or_log_in_with: O autentificatz-vos amb
- providers:
- cas: CAS
- saml: SAML
register: Se marcar
registration_closed: "%{instance} accepta pas de nòus membres"
resend_confirmation: Tornar mandar las instruccions de confirmacion
@@ -533,59 +518,6 @@ oc:
return: Veire lo perfil a la persona
web: Tornar a l’interfàcia Web
title: Sègre %{acct}
- date:
- abbr_day_names:
- - dg
- - dl
- - dm
- - dc
- - dj
- - dv
- - ds
- abbr_month_names:
- - None
- - gen
- - feb
- - mar
- - abr
- - mai
- - jun
- - jul
- - ago
- - set
- - oct
- - nov
- - dec
- day_names:
- - dimenge
- - diluns
- - dimars
- - dimècres
- - dijòus
- - divendres
- - dissabte
- formats:
- default: "%e/%m/%Y"
- long: Lo %e %B de %Y
- short: "%e %B de %Y"
- month_names:
- - None
- - de genièr
- - de febrièr
- - de març
- - d’abrial
- - de mai
- - de junh
- - de julhet
- - d’agost
- - de setembre
- - d’octòbre
- - de novembre
- - de decembre
- order:
- - :day
- - :month
- - :year
datetime:
distance_in_words:
about_x_hours: "%{count} h"
@@ -599,10 +531,6 @@ oc:
x_days: "%{count} jorns"
x_minutes: "%{count} min"
x_months: "%{count} meses"
- x_seconds: "%{count}s"
- x_years:
- one: Fa un an
- other: Fa %{count} ans
deletes:
bad_password_msg: Ben ensajat pirata ! Senhal incorrècte
confirm_password: Picatz vòstre senhal actual per verificar vòstra identitat
@@ -642,7 +570,6 @@ oc:
request: Demandar vòstre archiu
size: Talha
blocks: Personas que blocatz
- csv: CSV
domain_blocks: Blocatge de domenis
follows: Personas que seguètz
lists: Listas
@@ -771,23 +698,11 @@ oc:
body: "%{name} a tornat partejar vòstre estatut :"
subject: "%{name} a tornat partejar vòstre estatut"
title: Novèl partatge
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
newer: Mai recents
next: Seguent
older: Mai ancians
prev: Precedent
- truncate: "…"
polls:
errors:
already_voted: Avètz ja votat per aqueste sondatge
@@ -799,10 +714,7 @@ oc:
too_few_options: deu contenir mai d’una opcion
too_many_options: pòt pas contenir mai de %{max} opcions
preferences:
- languages: Lengas
other: Autre
- publishing: Publicar
- web: Interfàcia Web
relationships:
activity: Activitat del compte
dormant: Inactiu
@@ -829,7 +741,6 @@ oc:
proceed: Contunhar per respondre
prompt: 'Volètz respondre a aqueste tut :'
remote_unfollow:
- error: Error
title: Títol
unfollowed: Pas mai seguit
scheduled_statuses:
@@ -840,43 +751,14 @@ oc:
activity: Darrièra activitat
browser: Navigator
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Navigator desconegut
- ie: Internet Explorer
- micro_messenger: MicroMessenger
- nokia: Nokia S40 Ovi Browser
- opera: Opera
- otter: Otter
- phantom_js: PhantomJS
- qq: QQ Browser
- safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Session en cors
description: "%{browser} sus %{platform}"
explanation: Aquí los navigators connectats a vòstre compte 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: plataforma desconeguda
- windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Revocar
revoke_success: Session ben revocada
- title: Sessions
settings:
authorized_apps: Aplicacions autorizadas
back: Tornar a Mastodon
@@ -924,7 +806,6 @@ oc:
visibilities:
private: Seguidors solament
private_long: Mostrar pas qu’als seguidors
- public: Public
public_long: Tot lo monde pòt veire
unlisted: Pas listat
unlisted_long: Tot lo monde pòt veire mai serà pas visible sul flux public
@@ -938,10 +819,10 @@ oc:
Quinas informacions reculhèm ?
-
Inforacions de basa del compte : se vos marcatz sus aqueste servidor, vos podèm demandar de picar un escais-nom, una adreça de corrièl e un senhal. Podètz tanben ajustar d’informacions de perfil addicionalas coma un nom de far veire, una biografia, un imatge de perfil e una banièra. L’escais-nom, lo nom d’afichatge, la biografia, l’imatge de perfil e la banièra son totjorn indicats per èsser vistes publicament.
-
Publicacions, abonaments e autras informacions publicas : La lista del monde que seguètz es visibla publicament, tot parièr per vòstres seguidors. Quand enviatz un messatge, la data e l’ora son gardats, l’aplicacion qu’avètz utilizada tanben. Los messatges pòdon conténer de mèdias juntats coma d’imatge e vidèos. Las publicacions publicas e pas listadas son disponiblas publicament. Quand penjatz una publicacion per vòstre perfil, aquò tanben es visible per tot lo monde. Vòstras publicacions son mandadas a vòstre seguidors, dins qualques cases aquò significa que passaràn per diferents servidors e seràn copiadas e gardadas sus aqueles servidors. Quand escafatz de publicacions, aquò es tanben mandat a vòstre seguidors. L’accion de partejar o d’ajustar als favorits una publicacion es totjorn quicòm de public.
-
Publicacions dirèctas e solament pels seguidors :
totas las publicacions son gardadas e tractadas pel servidor. Las publicacions pas que per vòstres seguidors son enviadas a vòstres seguidors e las personas mencionadas dedins, las publicacions dirèctas son pas qu’enviadas a las personas mencionadas. Dins qualques cases aquò significa que passaràn per diferents servidors, copiadas e gardadas sus eles. Ensagem de limitar l’accès a aquelas publicacions a monde autorizat, mas los demai servidors pòdon fracar a far parièr. A causa d’aquò es fòrça important de repassar los servidors d’apertenéncia de vòstres seguidors. Podètz activar una opcion per autorizar o regetar una demanda de seguiment dins los paramètres. Vos cal pas oblidar que’ls administrators dels servidors e dels servidors de recepcion pòdon veire aqueles messatges, e que’ls destinataris pòdon realizar de captura d’ecran, copiar e tornar partejar los messatges.Partegetz pas cap informacion perilhosa sus Mastodon
.
-
Adreças IP e autras metadonadas : quand vos connectatz, enregistrem l’adreça IP qu’utilizatz per establir la connexion, e tanben lo nom de vòstre navigador. Totas las sessions de connexion son disponiblas per que las repassetz e tiretz dins los paramètres. Las darrièras adreças IP son salvagardas fins a 12 meses. Podèm tanben gardar de jornals d’audit del servidor que pòdon conténer las adreças IP de cada requèstas mandadas a nòstre servidor.
+
Inforacions de basa del compte : se vos marcatz sus aqueste servidor, vos podèm demandar de picar un escais-nom, una adreça de corrièl e un senhal. Podètz tanben ajustar d’informacions de perfil addicionalas coma un nom de far veire, una biografia, un imatge de perfil e una banièra. L’escais-nom, lo nom d’afichatge, la biografia, l’imatge de perfil e la banièra son totjorn indicats per èsser vistes publicament.
+
Publicacions, abonaments e autras informacions publicas : La lista del monde que seguètz es visibla publicament, tot parièr per vòstres seguidors. Quand enviatz un messatge, la data e l’ora son gardats, l’aplicacion qu’avètz utilizada tanben. Los messatges pòdon conténer de mèdias juntats coma d’imatge e vidèos. Las publicacions publicas e pas listadas son disponiblas publicament. Quand penjatz una publicacion per vòstre perfil, aquò tanben es visible per tot lo monde. Vòstras publicacions son mandadas a vòstre seguidors, dins qualques cases aquò significa que passaràn per diferents servidors e seràn copiadas e gardadas sus aqueles servidors. Quand escafatz de publicacions, aquò es tanben mandat a vòstre seguidors. L’accion de partejar o d’ajustar als favorits una publicacion es totjorn quicòm de public.
+
Publicacions dirèctas e solament pels seguidors :
totas las publicacions son gardadas e tractadas pel servidor. Las publicacions pas que per vòstres seguidors son enviadas a vòstres seguidors e las personas mencionadas dedins, las publicacions dirèctas son pas qu’enviadas a las personas mencionadas. Dins qualques cases aquò significa que passaràn per diferents servidors, copiadas e gardadas sus eles. Ensagem de limitar l’accès a aquelas publicacions a monde autorizat, mas los demai servidors pòdon fracar a far parièr. A causa d’aquò es fòrça important de repassar los servidors d’apertenéncia de vòstres seguidors. Podètz activar una opcion per autorizar o regetar una demanda de seguiment dins los paramètres. Vos cal pas oblidar que’ls administrators dels servidors e dels servidors de recepcion pòdon veire aqueles messatges, e que’ls destinataris pòdon realizar de captura d’ecran, copiar e tornar partejar los messatges.Partegetz pas cap informacion perilhosa sus Mastodon
.
+
Adreças IP e autras metadonadas : quand vos connectatz, enregistrem l’adreça IP qu’utilizatz per establir la connexion, e tanben lo nom de vòstre navigador. Totas las sessions de connexion son disponiblas per que las repassetz e tiretz dins los paramètres. Las darrièras adreças IP son salvagardas fins a 12 meses. Podèm tanben gardar de jornals d’audit del servidor que pòdon conténer las adreças IP de cada requèstas mandadas a nòstre servidor.
@@ -952,9 +833,9 @@ oc:
Totas las informacions que collectem de vos pòdon servir dins los cases seguents :
-
Per provesir la foncionament màger de Mastodon. Podètz pas qu’interagir amb lo contengut del monde e de vòstras publicacions quand sètz connectat. Per exemple, avètz la possibilitat de sègre de monde per veire lors publicacions amassadas dins vòstre flux d’actualitat personalizat.
-
Per ajudar la moderacion de la comunitat, per exemple en comparant vòstra adreça IP amb d’autras per determinar d’ensages de contornament de bandiment e d’autras violéncias.
-
Podèm utilizar l’adreça qu’avètz donada per vos enviar d’informacions e de notificacions que demandatz tocant de cambiaments dins los subjèctes del forum o en responsa a vòstre nom d’utilizaire, en responsa a una demanda, e/o tota autra question.
+
Per provesir la foncionament màger de Mastodon. Podètz pas qu’interagir amb lo contengut del monde e de vòstras publicacions quand sètz connectat. Per exemple, avètz la possibilitat de sègre de monde per veire lors publicacions amassadas dins vòstre flux d’actualitat personalizat.
+
Per ajudar la moderacion de la comunitat, per exemple en comparant vòstra adreça IP amb d’autras per determinar d’ensages de contornament de bandiment e d’autras violéncias.
+
Podèm utilizar l’adreça qu’avètz donada per vos enviar d’informacions e de notificacions que demandatz tocant de cambiaments dins los subjèctes del forum o en responsa a vòstre nom d’utilizaire, en responsa a una demanda, e/o tota autra question.
@@ -969,8 +850,8 @@ oc:
Farem esfòrces per :
-
Gardar los jornals del servidor que contenon las adreças IP de totas las demandas al servidor pas mai de 90 jorns.
-
Gardar las adreças IP ligadas als utilizaires e lors publicacions pas mai de 12 messes.
+
Gardar los jornals del servidor que contenon las adreças IP de totas las demandas al servidor pas mai de 90 jorns.
+
Gardar las adreças IP ligadas als utilizaires e lors publicacions pas mai de 12 messes.
Podètz demandar e telecargar vòstre archiu de contengut, amb vòstras publicacions, los mèdias enviats, l’imatge de perfil e l’imatge de bandièra.
@@ -1024,7 +905,6 @@ oc:
time:
formats:
default: Lo %d %b de %Y a %Ho%M
- month: "%b %Y"
two_factor_authentication:
code_hint: Picatz lo còdi generat per vòstra aplicacion d’autentificacion per confirmar
description_html: S’activatz l’autentificacion two-factor, vos caldrà vòstre mobil per vos connectar perque generarà un geton per vos daissar dintrar.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1b9bb614c..78db4c672 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -35,7 +35,7 @@ pl:
one: wpisu
other: wpisów
status_count_before: Są autorami
- tagline: Śledź znajomych i poznawal nowych
+ tagline: Śledź znajomych i poznawaj nowych
terms: Zasady użytkowania
user_count_after:
few: użytkowników
@@ -76,6 +76,7 @@ pl:
admin: Administrator
bot: Bot
moderator: Moderator
+ unavailable: Profil niedostępny
unfollow: Przestań śledzić
admin:
account_actions:
@@ -88,6 +89,7 @@ pl:
destroyed_msg: Pomyślnie usunięto notatkę moderacyjną!
accounts:
approve: Przyjmij
+ approve_all: Zatwierdź wszystkie
are_you_sure: Jesteś tego pewien?
avatar: Awatar
by_domain: Domena
@@ -140,6 +142,7 @@ pl:
moderation_notes: Notatki moderacyjne
most_recent_activity: Najnowsza aktywność
most_recent_ip: Ostatnie IP
+ no_account_selected: Żadne konto nie zostało zmienione, bo żadne nie zostało wybrane
no_limits_imposed: Nie nałożono ograniczeń
not_subscribed: Nie zasubskrybowano
outbox_url: Adres skrzynki nadawczej
@@ -152,6 +155,7 @@ pl:
push_subscription_expires: Subskrypcja PuSH wygasa
redownload: Odśwież profil
reject: Odrzuć
+ reject_all: Odrzuć wszystkie
remove_avatar: Usun awatar
remove_header: Usuń nagłówek
resend_confirmation:
@@ -178,6 +182,7 @@ pl:
statuses: Wpisy
subscribe: Subskrybuj
suspended: Zawieszono
+ time_in_queue: Czekanie w kolejce %{time}
title: Konta
unconfirmed_email: Niepotwierdzony adres e-mail
undo_silenced: Cofnij wyciszenie
@@ -230,7 +235,7 @@ pl:
destroyed_msg: Pomyślnie usunięto emoji!
disable: Wyłącz
disabled_msg: Pomyślnie wyłączono emoji
- emoji: Emoji
+ emoji: Emotikona
enable: Włącz
enabled_msg: Pomyślnie przywrócono emoji
image_hint: Plik PNG ważący do 50KB
@@ -238,7 +243,7 @@ pl:
new:
title: Dodaj nowe niestandardowe emoji
overwrite: Zastąp
- shortcode: Shortcode
+ shortcode: Krótki kod
shortcode_hint: Co najmniej 2 znaki, tylko znaki alfanumeryczne i podkreślniki
title: Niestandardowe emoji
unlisted: Niewidoczne
@@ -273,6 +278,7 @@ pl:
created_msg: Blokada domen jest przetwarzana
destroyed_msg: Blokada domeny nie może zostać odwrócona
domain: Domena
+ existing_domain_block_html: Już narzuciłeś bardziej rygorystyczne limity na %{name}, musisz najpierw je odblokować.
new:
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.
@@ -342,6 +348,8 @@ pl:
expired: Wygasłe
title: Filtruj
title: Zaproszenia
+ pending_accounts:
+ title: Oczekujące konta (%{count})
relays:
add_new: Dodaj nowy
delete: Usuń
@@ -468,7 +476,7 @@ pl:
nsfw_on: Oznacz jako NSFW
failed_to_execute: Nie udało się wykonać
media:
- title: Media
+ title: Multimedia
no_media: Bez zawartości multimedialnej
no_status_selected: Żaden wpis nie został zmieniony, bo żaden nie został wybrany
title: Wpisy konta
@@ -484,7 +492,7 @@ pl:
accounts: Konta
hidden: Ukryte
hide: Ukryj w katalogu
- name: Hashtag
+ name: Hasztag
title: Hashtagi
unhide: Pokazuj w katalogu
visible: Widoczne
@@ -503,6 +511,12 @@ pl:
body: Użytkownik %{reporter} zgłosił(a) %{target}
body_remote: Użytkownik instancji %{domain} zgłosił(a) %{target}
subject: Nowe zgłoszenie na %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Zaawansowany interfejs użytkownika
+ advanced_web_interface_hint: Jeśli chcesz użyć pełną szerokość swojego ekranu, zaawansowany interfejs użytkownika pozwala Ci skonfigurować wiele różnych kolumn, by zobaczyć jak najwięcej informacji kiedy tylko chcesz. Strona główna, Powiadomienia, Globalna oś czasu, dowolna ilość list i hasztagów.
+ animations_and_accessibility: Animacje i dostępność
+ confirmation_dialogs: Dialogi potwierdzenia
+ sensitive_content: Wrażliwa zawartość
application_mailer:
notification_preferences: Zmień ustawienia e-maili
salutation: "%{name},"
@@ -556,7 +570,7 @@ pl:
title: Śledź %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
+ about_x_hours: "%{count}g"
about_x_months: "%{count} miesięcy"
about_x_years: "%{count} lat"
almost_x_years: "%{count} lat"
@@ -769,12 +783,11 @@ pl:
decimal_units:
format: "%n%u"
units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
+ billion: mld
+ million: mil
+ quadrillion: bld
+ thousand: tys
+ trillion: bln
pagination:
newer: Nowsze
next: Następna
@@ -792,10 +805,9 @@ pl:
too_few_options: musi zawierać przynajmniej dwie opcje
too_many_options: nie może zawierać więcej niż %{max} opcji
preferences:
- languages: Języki
other: Pozostałe
- publishing: Publikowanie
- web: Sieć
+ posting_defaults: Domyślne ustawienia wpisów
+ public_timelines: Publiczne osie czasu
relationships:
activity: Aktywność konta
dormant: Uśpione
@@ -876,6 +888,9 @@ pl:
revoke_success: Pomyślnie unieważniono sesję
title: Sesje
settings:
+ account: Konto
+ account_settings: Ustawienia konta
+ appearance: Wygląd
authorized_apps: Uwierzytelnione aplikacje
back: Powrót do Mastodona
delete: Usuń konto
@@ -885,9 +900,11 @@ pl:
featured_tags: Wyróżnione hashtagi
identity_proofs: Dowody tożsamości
import: Importowanie danych
+ import_and_export: Import i eksport
migrate: Migracja konta
notifications: Powiadomienia
preferences: Preferencje
+ profile: Profil
relationships: Śledzeni i śledzący
two_factor_authentication: Uwierzytelnianie dwuetapowe
statuses:
@@ -945,10 +962,10 @@ pl:
Jakie informacje zbieramy?
-
Podstawowe informacje o koncie: Podczas rejestracji na tym serwerze, możesz zostać poproszony(-a) o wprowadzenie nazwy użytkownika, adresu e-mail i hasła. Możesz także wprowadzić dodatkowe informacje o profilu, takie jak nazwa wyświetlana i biografia oraz wysłać awatar i obraz nagłówka. Nazwa użytkownika, nazwa wyświetlana, biografia, awatar i obraz nagłówka są zawsze widoczne dla wszystkich.
-
Wpisy, śledzenie i inne publiczne informacje: Lista osób które śledzisz jest widoczna publicznie, tak jak lista osób, które Cię śledzą. Jeżeli dodasz wpis, data i czas jego utworzenia i aplikacja, z której go wysłano są przechowywane. Wiadomości mogą zawierać załączniki multimedialne, takie jak zdjęcia i filmy. Publiczne i niewidoczne wpisy są dostępne publicznie. Udostępniony wpis również jest widoczny publicznie. Twoje wpisy są dostarczane obserwującym, co oznacza że jego kopie mogą zostać dostarczone i być przechowywane na innych serwerach. Kiedy usuniesz wpis, przestaje być widoczny również dla osób śledzących Cię. „Podbijanie” i dodanie do ulubionych jest zawsze publiczne.
-
Wpisy bezpośrednie i tylko dla śledzących: Wszystkie wpisy są przechowywane i przetwarzane na serwerze. Wpisy przeznaczone tylko dla śledzących są widoczne tylko dla nich i osób wspomnianych we wpisie, a wpisy bezpośrednie tylko dla wspomnianych. W wielu przypadkach oznacza to, że ich kopie są dostarczane i przechowywane na innych serwerach. Staramy się ograniczać zasięg tych wpisów wyłącznie do właściwych odbiorców, ale inne serwery mogą tego nie robić. Ważne jest, aby sprawdzać jakich serwerów używają osoby, które Cię śledzą. Możesz aktywować opcję pozwalającą na ręczne akceptowanie i odrzucanie nowych śledzących. Pamiętaj, że właściciele serwerów mogą zobaczyć te wiadomości, a odbiorcy mogą wykonać zrzut ekranu, skopiować lub udostępniać ten wpis. Nie udostępniaj wrażliwych danych z użyciem Mastodona.
-
Adresy IP i inne metadane: Kiedy zalogujesz się, przechowujemy adres IP użyty w trakcie logowania wraz z nazwą używanej przeglądarki. Wszystkie aktywne sesje możesz zobaczyć (i wygasić) w ustawieniach. Ostatnio używany adres IP jest przechowywany przez nas do 12 miesięcy. Możemy również przechowywać adresy IP wykorzystywane przy każdym działaniu na serwerze.
+
Podstawowe informacje o koncie: Podczas rejestracji na tym serwerze, możesz zostać poproszony(-a) o wprowadzenie nazwy użytkownika, adresu e-mail i hasła. Możesz także wprowadzić dodatkowe informacje o profilu, takie jak nazwa wyświetlana i biografia oraz wysłać awatar i obraz nagłówka. Nazwa użytkownika, nazwa wyświetlana, biografia, awatar i obraz nagłówka są zawsze widoczne dla wszystkich.
+
Wpisy, śledzenie i inne publiczne informacje: Lista osób które śledzisz jest widoczna publicznie, tak jak lista osób, które Cię śledzą. Jeżeli dodasz wpis, data i czas jego utworzenia i aplikacja, z której go wysłano są przechowywane. Wiadomości mogą zawierać załączniki multimedialne, takie jak zdjęcia i filmy. Publiczne i niewidoczne wpisy są dostępne publicznie. Udostępniony wpis również jest widoczny publicznie. Twoje wpisy są dostarczane obserwującym, co oznacza że jego kopie mogą zostać dostarczone i być przechowywane na innych serwerach. Kiedy usuniesz wpis, przestaje być widoczny również dla osób śledzących Cię. „Podbijanie” i dodanie do ulubionych jest zawsze publiczne.
+
Wpisy bezpośrednie i tylko dla śledzących: Wszystkie wpisy są przechowywane i przetwarzane na serwerze. Wpisy przeznaczone tylko dla śledzących są widoczne tylko dla nich i osób wspomnianych we wpisie, a wpisy bezpośrednie tylko dla wspomnianych. W wielu przypadkach oznacza to, że ich kopie są dostarczane i przechowywane na innych serwerach. Staramy się ograniczać zasięg tych wpisów wyłącznie do właściwych odbiorców, ale inne serwery mogą tego nie robić. Ważne jest, aby sprawdzać jakich serwerów używają osoby, które Cię śledzą. Możesz aktywować opcję pozwalającą na ręczne akceptowanie i odrzucanie nowych śledzących. Pamiętaj, że właściciele serwerów mogą zobaczyć te wiadomości, a odbiorcy mogą wykonać zrzut ekranu, skopiować lub udostępniać ten wpis. Nie udostępniaj wrażliwych danych z użyciem Mastodona.
+
Adresy IP i inne metadane: Kiedy zalogujesz się, przechowujemy adres IP użyty w trakcie logowania wraz z nazwą używanej przeglądarki. Wszystkie aktywne sesje możesz zobaczyć (i wygasić) w ustawieniach. Ostatnio używany adres IP jest przechowywany przez nas do 12 miesięcy. Możemy również przechowywać adresy IP wykorzystywane przy każdym działaniu na serwerze.
@@ -958,9 +975,9 @@ pl:
Zebrane informacje mogą zostać użyte w następujące sposoby:
-
Aby dostarczyć podstawową funkcjonalność Mastodona. Możesz wchodzić w interakcje z zawartością tworzoną przez innych tylko gdy jesteś zalogowany. Na przykład, możesz śledzić innych, aby widzieć ich wpisy w dostosowanej osi czasu.
-
Aby wspomóc moderację społeczności, na przykład porównując Twój adres IP ze znanymi, aby rozpoznać próbę obejścia blokady i inne naruszenia.
-
Adres e-mail może zostać wykorzystany, aby wysyłać Ci informacje, powiadomienia o osobach wchodzących w interakcje z tworzoną przez Ciebie zawartością, wysyłających Ci wiadomości, odpowiadać na zgłoszenia i inne żądania lub zapytania.
+
Aby dostarczyć podstawową funkcjonalność Mastodona. Możesz wchodzić w interakcje z zawartością tworzoną przez innych tylko gdy jesteś zalogowany. Na przykład, możesz śledzić innych, aby widzieć ich wpisy w dostosowanej osi czasu.
+
Aby wspomóc moderację społeczności, na przykład porównując Twój adres IP ze znanymi, aby rozpoznać próbę obejścia blokady i inne naruszenia.
+
Adres e-mail może zostać wykorzystany, aby wysyłać Ci informacje, powiadomienia o osobach wchodzących w interakcje z tworzoną przez Ciebie zawartością, wysyłających Ci wiadomości, odpowiadać na zgłoszenia i inne żądania lub zapytania.
@@ -976,8 +993,8 @@ pl:
Staramy się:
-
Przechowywać logi zawierające adresy IP używane przy każdym żądaniu do serwera przez nie dłużej niż 90 dni.
-
Przechowywać adresy IP przypisane do użytkowników przez nie dłużej niż 12 miesięcy.
+
Przechowywać logi zawierające adresy IP używane przy każdym żądaniu do serwera przez nie dłużej niż 90 dni.
+
Przechowywać adresy IP przypisane do użytkowników przez nie dłużej niż 12 miesięcy.
Możesz zażądać i pobrać archiwum tworzonej zawartości, wliczając Twoje wpisy, załączniki multimedialne, awatar i zdjęcie nagłówka.
@@ -1028,7 +1045,7 @@ pl:
mastodon-light: Mastodon (Jasny)
time:
formats:
- default: "%b %d, %Y, %H:%M"
+ default: "%d. %b %Y, %H:%M"
month: "%b %Y"
two_factor_authentication:
code_hint: Aby kontynuować, wprowadź kod wyświetlany przez aplikację uwierzytelniającą
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 22a3918a1..d75e91b8b 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -7,7 +7,6 @@ pt-BR:
active_count_after: Ativo
active_footnote: Usuários ativos mensais (UAM)
administered_by: 'Administrado por:'
- api: API
apps: Apps
apps_platforms: Use o Mastodon a partir de iOS, Android e outras plataformas
browse_directory: Navegue pelo diretório de perfis e filtre por interesses
@@ -29,9 +28,6 @@ pt-BR:
see_whats_happening: Veja o que está acontecendo
server_stats: 'Estatísticas do servidor:'
source_code: Código-fonte
- status_count_after:
- one: status
- other: status
status_count_before: Autores de
tagline: Siga amigos e encontre novos
terms: Termos de serviço
@@ -58,10 +54,6 @@ pt-BR:
people_who_follow: Pessoas que seguem %{name}
pin_errors:
following: Você tem que estar seguindo a pessoa que você quer sugerir
- posts:
- one: Toot
- other: Toots
- posts_tab_heading: Toots
posts_with_replies: Toots e respostas
reserved_username: Este usuário está reservado
roles:
@@ -83,7 +75,6 @@ pt-BR:
approve: Aprovar
approve_all: Aprovar tudo
are_you_sure: Você tem certeza?
- avatar: Avatar
by_domain: Domínio
change_email:
changed_msg: E-mail da conta modificado com sucesso!
@@ -114,11 +105,9 @@ pt-BR:
header: Cabeçalho
inbox_url: URL da caixa de entrada
invited_by: Convidado por
- ip: IP
joined: Se cadastrou
location:
all: Todos
- local: Local
remote: Remoto
title: Localização
login_status: Situação de login
@@ -181,7 +170,6 @@ pt-BR:
unsubscribe: Desinscrever-se
username: Nome de usuário
warn: Notificar
- web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} designou a denúncia %{target} para si"
@@ -226,7 +214,6 @@ pt-BR:
destroyed_msg: Emoji deletado com sucesso!
disable: Desabilitar
disabled_msg: Emoji desabilitado com sucesso
- emoji: Emoji
enable: Habilitar
enabled_msg: Emoji habilitado com sucesso
image_hint: PNG de até 50KB
@@ -256,7 +243,6 @@ pt-BR:
recent_users: Usuários recentes
search: Pesquisa em texto
single_user_mode: Modo de usuário único
- software: Software
space: Uso de espaço em disco
title: Painel de controle
total_users: usuários no total
@@ -349,7 +335,6 @@ pt-BR:
pending: Esperando pela aprovação do repetidor
save_and_enable: Salvar e habilitar
setup: Configurar uma conexão de repetidor
- status: Status
title: Repetidores
report_notes:
created_msg: Nota de denúncia criada com sucesso!
@@ -379,7 +364,6 @@ pt-BR:
reported_by: Denunciada por
resolved: Resolvido
resolved_msg: Denúncia resolvida com sucesso!
- status: Status
title: Denúncias
unassign: Desatribuir
unresolved: Não resolvido
@@ -472,14 +456,11 @@ pt-BR:
confirmed: Confirmado
expires_in: Expira em
last_delivery: Última entrega
- title: WebSub
topic: Tópico
tags:
accounts: Contas
hidden: Escondido
hide: Esconder do diretório
- name: Hashtag
- title: Hashtags
unhide: Mostrar no diretório
visible: Visível
title: Administração
@@ -499,7 +480,6 @@ pt-BR:
subject: Nova denúncia sobre %{instance} (#%{id})
application_mailer:
notification_preferences: Mudar preferências de e-mail
- salutation: "%{name},"
settings: 'Mudar e-mail de preferência: %{link}'
view: 'Visualizar:'
view_profile: Ver perfil
@@ -527,9 +507,6 @@ pt-BR:
migrate_account: Mudar para uma conta diferente
migrate_account_html: Se você quer redirecionar essa conta para uma outra você pode configurar isso aqui.
or_log_in_with: Ou faça login com
- providers:
- cas: CAS
- saml: SAML
register: Cadastrar-se
registration_closed: "%{instance} não está aceitando novos membros"
resend_confirmation: Reenviar instruções de confirmação
@@ -550,7 +527,6 @@ pt-BR:
title: Seguir %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
about_x_months: "%{count} meses"
about_x_years: "%{count} anos"
almost_x_years: "%{count} anos"
@@ -604,7 +580,6 @@ pt-BR:
request: Solicitar o seu arquivo
size: Tamanho
blocks: Você bloqueou
- csv: CSV
domain_blocks: Bloqueios de domínio
follows: Você segue
lists: Listas
@@ -748,23 +723,11 @@ pt-BR:
body: 'Sua postagem foi compartilhada por %{name}:'
subject: "%{name} compartilhou a sua postagem"
title: Novo compartilhamento
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
newer: Mais novo
next: Próximo
older: Mais antigo
prev: Anterior
- truncate: "…"
polls:
errors:
already_voted: Você já votou nessa enquete
@@ -776,10 +739,7 @@ pt-BR:
too_few_options: deve ter mais que um item
too_many_options: não pode ter mais que %{max} itens
preferences:
- languages: Idiomas
other: Outro
- publishing: Publicação
- web: Web
relationships:
activity: Atividade da conta
dormant: Inativo
@@ -822,40 +782,13 @@ pt-BR:
activity: Última atividade
browser: Navegador
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Navegador desconhecido
- ie: Internet Explorer
- micro_messenger: MicroMessenger
nokia: Navegador Nokia S40 Ovi
- opera: Opera
- otter: Otter
- phantom_js: PhantomJS
- qq: QQ Browser
- safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Sessão atual
description: "%{browser} em %{platform}"
explanation: Estes são os navegadores que estão conectados com a sua conta do 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: Plataforma desconhecida
- windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Revogar
revoke_success: Sessão revogada com sucesso
title: Sessões
@@ -908,7 +841,6 @@ pt-BR:
vote: Votar
show_more: Mostrar mais
sign_in_to_participate: Entre para participar dessa conversa
- title: '%{name}: "%{quote}"'
visibilities:
private: Apenas seguidores
private_long: Mostrar apenas para seguidores
@@ -926,10 +858,10 @@ pt-BR:
Que informação nós coletamos?
-
Informação básica de conta: Se você se registrar nesse servidor, podemos pedir que você utilize um nome de usuário, um e-mail e uma senha. Você também pode adicionar informações extras como um nome de exibição e biografia; enviar uma imagem de perfil e imagem de cabeçalho. O nome de usuário, nome de exibição, biografia, imagem de perfil e imagem de cabeçalho são sempre listadas publicamente.
-
Posts, informação de seguidores e outras informações públicas: A lista de pessoas que você segue é listada publicamente, o mesmo é verdade para quem te segue. Quando você envia uma mensagem, a data e o horário são armazenados, assim como a aplicação que você usou para enviar a mensagem. Mensagens podem conter mídias anexadas, como imagens e vídeos. Posts públicos e não-listados estão disponíveis publicamente. Quando você destaca um post no seu perfil, isso também é uma informação pública. Seus posts são entregues aos seus seguidores e em alguns casos isso significa que eles são enviados para servidores diferentes e cópias são armazenadas nesses servidores. Quando você remove posts, essa informação também é entregue aos seus seguidores. O ato de compartilhar ou favoritar um outro post é sempre público.
-
Mensagens diretas e posts somente para seguidores: Todos os posts são armazenados e processados no servidor. Posts somente para seguidores são entregues aos seus seguidores e usuários que são mencionados neles; mensagens diretas são entregues somente aos usuários mencionados nelas. Em alguns casos isso significa que as mensagens são entregues para servidores diferentes e cópias são armazenadas nesses servidores. Nós fazemos esforços substanciais para limitar o acesso dessas mensagens somente para as pessoas autorizadas, mas outros servidores podem não fazer o mesmo. É importante portanto revisar os servidores à qual seus seguidores pertencem. Você pode usar uma opção para aprovar ou rejeitar novos seguidores manualmente nas configurações. Por favor tenha em mente que os operadores do servidor e de qualquer servidores do destinatário podem ver tais mensagens, e que os destinatários podem fazer capturas de tela, copiar ou de outra maneira compartilhar as mensagens. Não compartilhe informação confidencial pelo Mastodon.
-
IPs e outros metadados: Quando você faz se autentica, nos guardamos o endereço de IP que você usou ao se autenticar e o nome do seu navegador da internet. Todas as sessões autenticadas são disponíveis para serem analisadas e revogadas nas configurações. O último endereço de IP usado é guardado por até 12 meses. Nós também podemos reter históricos do servidor que incluem o endereço de IP de todas as requisições ao nosso servidor.
+
Informação básica de conta: Se você se registrar nesse servidor, podemos pedir que você utilize um nome de usuário, um e-mail e uma senha. Você também pode adicionar informações extras como um nome de exibição e biografia; enviar uma imagem de perfil e imagem de cabeçalho. O nome de usuário, nome de exibição, biografia, imagem de perfil e imagem de cabeçalho são sempre listadas publicamente.
+
Posts, informação de seguidores e outras informações públicas: A lista de pessoas que você segue é listada publicamente, o mesmo é verdade para quem te segue. Quando você envia uma mensagem, a data e o horário são armazenados, assim como a aplicação que você usou para enviar a mensagem. Mensagens podem conter mídias anexadas, como imagens e vídeos. Posts públicos e não-listados estão disponíveis publicamente. Quando você destaca um post no seu perfil, isso também é uma informação pública. Seus posts são entregues aos seus seguidores e em alguns casos isso significa que eles são enviados para servidores diferentes e cópias são armazenadas nesses servidores. Quando você remove posts, essa informação também é entregue aos seus seguidores. O ato de compartilhar ou favoritar um outro post é sempre público.
+
Mensagens diretas e posts somente para seguidores: Todos os posts são armazenados e processados no servidor. Posts somente para seguidores são entregues aos seus seguidores e usuários que são mencionados neles; mensagens diretas são entregues somente aos usuários mencionados nelas. Em alguns casos isso significa que as mensagens são entregues para servidores diferentes e cópias são armazenadas nesses servidores. Nós fazemos esforços substanciais para limitar o acesso dessas mensagens somente para as pessoas autorizadas, mas outros servidores podem não fazer o mesmo. É importante portanto revisar os servidores à qual seus seguidores pertencem. Você pode usar uma opção para aprovar ou rejeitar novos seguidores manualmente nas configurações. Por favor tenha em mente que os operadores do servidor e de qualquer servidores do destinatário podem ver tais mensagens, e que os destinatários podem fazer capturas de tela, copiar ou de outra maneira compartilhar as mensagens. Não compartilhe informação confidencial pelo Mastodon.
+
IPs e outros metadados: Quando você faz se autentica, nos guardamos o endereço de IP que você usou ao se autenticar e o nome do seu navegador da internet. Todas as sessões autenticadas são disponíveis para serem analisadas e revogadas nas configurações. O último endereço de IP usado é guardado por até 12 meses. Nós também podemos reter históricos do servidor que incluem o endereço de IP de todas as requisições ao nosso servidor.
@@ -939,9 +871,9 @@ pt-BR:
Toda informação que coletamos de você pode ser usada das seguintes maneiras:
-
Para prover a funcionalidade básica do Mastodon. Você só pode interagir com o conteúdo de outras pessoas e postar seu próprio conteúdo estando autenticado. Por exemplo, você pode seguir outras pessoas para ver seus posts combinados na sua linha do tempo personalizada.
-
Para auxiliar na moderação da comunidade, por exemplo ao comparar o seu endereço de IP com outros endereços de IP conhecidos para determinar evasão de banimento e outras violações.
-
O endereço de email que você prover pode ser usado para lhe enviar informação, notificação sobre outras pessoas interagindo com o seu conteúdo ou lhe enviando mensagens e para responder a questões ou outros pedidos.
+
Para prover a funcionalidade básica do Mastodon. Você só pode interagir com o conteúdo de outras pessoas e postar seu próprio conteúdo estando autenticado. Por exemplo, você pode seguir outras pessoas para ver seus posts combinados na sua linha do tempo personalizada.
+
Para auxiliar na moderação da comunidade, por exemplo ao comparar o seu endereço de IP com outros endereços de IP conhecidos para determinar evasão de banimento e outras violações.
+
O endereço de email que você prover pode ser usado para lhe enviar informação, notificação sobre outras pessoas interagindo com o seu conteúdo ou lhe enviando mensagens e para responder a questões ou outros pedidos.
@@ -957,8 +889,8 @@ pt-BR:
Nós fazemos esforços substanciais para:
-
Reter o histórico do servidor contendo os endereços de IP de todas as requisições feitas à esse servidor, e com respeito a quanto tempo esses logs são retidos, não mais que 90 dias.
-
Reter o endereço de IP associado com usuários registrados não mais que 12 meses.
+
Reter o histórico do servidor contendo os endereços de IP de todas as requisições feitas à esse servidor, e com respeito a quanto tempo esses logs são retidos, não mais que 90 dias.
+
Reter o endereço de IP associado com usuários registrados não mais que 12 meses.
Você pode pedir e fazer o download de um arquivo de todo o conteúdo da sua conta, incluindo as suas mensagens, suas mídias anexadas, imagem de perfil e imagem de topo.
@@ -1009,7 +941,6 @@ pt-BR:
mastodon-light: Mastodon (claro)
time:
formats:
- default: "%b %d, %Y, %H:%M"
month: "%B de %Y"
two_factor_authentication:
code_hint: Insira o código gerado pelo seu aplicativo auteticador para confirmar
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index b827184e9..9cd92f6bd 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -5,7 +5,6 @@ pt:
about_mastodon_html: Mastodon é uma rede social baseada em protocolos abertos da web e software livre e gratuito. É descentralizado como e-mail.
about_this: Sobre esta instância
administered_by: 'Administrado por:'
- api: API
apps: Aplicações móveis
contact: Contacto
contact_missing: Não configurado
@@ -39,7 +38,6 @@ pt:
joined: Aderiu %{date}
last_active: última vez activo
link_verified_on: A posse deste link foi verificada em %{date}
- media: Media
moved_html: "%{name} mudou-se para %{new_profile_link}:"
network_hidden: Esta informação não está disponível
nothing_here: Não há nada aqui!
@@ -69,7 +67,6 @@ pt:
destroyed_msg: Nota de moderação excluída com sucesso!
accounts:
are_you_sure: Tens a certeza?
- avatar: Avatar
by_domain: Domínio
change_email:
changed_msg: E-mail da conta alterado com sucesso!
@@ -100,11 +97,9 @@ pt:
header: Cabeçalho
inbox_url: URL da caixa de entrada
invited_by: Convidado por
- ip: IP
joined: Aderiu
location:
all: Todos
- local: Local
remote: Remoto
title: Local
login_status: Estado de início de sessão
@@ -162,7 +157,6 @@ pt:
unsubscribe: Cancelar inscrição
username: Usuário
warn: Aviso
- web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} atribuiu o relatório %{target} a si próprios"
@@ -207,7 +201,6 @@ pt:
destroyed_msg: Emoji destruído com sucesso!
disable: Desativar
disabled_msg: Desativado com sucesso este emoji
- emoji: Emoji
enable: Ativar
enabled_msg: Ativado com sucesso este emoji
image_hint: PNG de até 50KB
@@ -236,7 +229,6 @@ pt:
recent_users: Utilizadores recentes
search: Pesquisa com texto completo
single_user_mode: Modo de utilizador único
- software: Software
space: Utilização do espaço
title: Painel de controlo
total_users: total de utilizadores
@@ -444,14 +436,11 @@ pt:
confirmed: Confirmado
expires_in: Expira em
last_delivery: Última entrega
- title: WebSub
topic: Tópico
tags:
accounts: Contas
hidden: Escondidas
hide: Esconder no diretório
- name: Hashtag
- title: Hashtags
unhide: Mostrar no diretório
visible: Visível
title: Administração
@@ -468,7 +457,6 @@ pt:
subject: Novo relatório sobre %{instance} (#%{id})
application_mailer:
notification_preferences: Alterar preferências de e-mail
- salutation: "%{name},"
settings: 'Alterar preferências de email: %{link}'
view: 'Ver:'
view_profile: Ver perfil
@@ -494,9 +482,6 @@ pt:
migrate_account: Mudar para uma conta diferente
migrate_account_html: Se desejas redirecionar esta conta para uma outra podesconfigurar isso aqui.
or_log_in_with: Ou iniciar sessão com
- providers:
- cas: CAS
- saml: SAML
register: Registar
resend_confirmation: Reenviar instruções de confirmação
reset_password: Criar nova palavra-passe
@@ -515,7 +500,6 @@ pt:
title: Seguir %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
about_x_months: "%{count} meses"
about_x_years: "%{count} anos"
almost_x_years: "%{count} anos"
@@ -568,7 +552,6 @@ pt:
request: Pede o teu arquivo
size: Tamanho
blocks: Bloqueaste
- csv: CSV
domain_blocks: Bloqueios de domínio
follows: Segues
lists: Listas
@@ -690,23 +673,11 @@ pt:
body: 'O teu post foi partilhado por %{name}:'
subject: "%{name} partilhou o teu post"
title: Nova partilha
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
newer: Mais nova
next: Seguinte
older: Mais velha
prev: Anterior
- truncate: "…"
polls:
errors:
already_voted: Tu já votaste nesta sondagem
@@ -718,10 +689,7 @@ pt:
too_few_options: tem de ter mais do que um item
too_many_options: não pode conter mais do que %{max} itens
preferences:
- languages: Idiomas
other: Outro
- publishing: Publicação
- web: Web
remote_follow:
acct: Entre seu usuário@domínio do qual quer seguir
missing_resource: Não foi possível achar a URL de redirecionamento para sua conta
@@ -751,40 +719,15 @@ pt:
activity: Última atividade
browser: Navegador
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Navegador desconhecido
- ie: Internet Explorer
- micro_messenger: MicroMessenger
nokia: Navegador Nokia S40 Ovi
- opera: Opera
otter: Lontra
- phantom_js: PhantomJS
- qq: QQ Browser
- safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Sessão atual
description: "%{browser} em %{platform}"
explanation: Estes são os navegadores que estão conectados com a tua conta do Mastodon.
- ip: IP
platforms:
- adobe_air: Adobe Air
- android: Android
- blackberry: Blackberry
- chrome_os: ChromeOS
firefox_os: SO Firefox
- ios: iOS
- linux: Linux
- mac: Mac
other: Plataforma desconhecida
- windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Revogar
revoke_success: Sessão revogada com sucesso
title: Sessões
@@ -830,7 +773,6 @@ pt:
vote: Votar
show_more: Mostrar mais
sign_in_to_participate: Inicie a sessão para participar na conversa
- title: '%{name}: "%{quote}"'
visibilities:
private: Mostrar apenas para seguidores
private_long: Mostrar apenas para seguidores
@@ -848,10 +790,10 @@ pt:
Que informação nós recolhemos?
-
Informação básica da conta: Se te registares neste servidor, pode-te ser pedido que indiques um nome de utilizador, um endereço de e-mail e uma palavra-passe. Também podes introduzir informação adicional de perfil, tal como um nome a mostrar e dados biográficos, que carregues uma fotografia para o teu perfil e para o cabeçalho. O nome de utilizador, o nome a mostrar, a biografia, a imagem de perfil e a imagem de cabeçalho são sempre listados publicamente.
-
Publicações, seguimento e outra informação pública: A lista de pessoas que tu segues é pública, o mesmo é verdade para os teus seguidores. Quando tu publicas uma mensagem, a data e a hora são guardados, tal como a aplicação a partir da qual a mensagem foi enviada. As mensagens podem conter anexos multimédia, tais como fotografias ou vídeos. Publicações públicas e não listadas são acessíveis publicamente. Quando expões uma publicação no teu perfil, isso é também informação disponível publicamente. As tuas publicações são enviadas aos teus seguidores. Em alguns casos isso significa que elas são enviadas para servidores diferentes onde são guardadas cópias. Quando tu apagas publicações, isso também é enviado para os teus seguidores. A acção de republicar ou favoritar outra publicação é sempre pública.
-
Publicações directas e exclusivas para seguidores: Todas as publicações são guardadas e processadas no servidor. Publicações exclusivas para seguidores são enviadas para os teus seguidores e para utilizadores que são nelas mencionados. As publicações directas são enviadas apenas para os utilizadores nelas mencionados. Em alguns casos isso significa que elas são enviadas para diferentes servidores onde são guardadas cópias das mesmas. Nós fazemos um grande esforço para limitar o acesso a estas publicações aos utilizadores autorizados, mas outros servidores podem falhar neste objectivo. Por isso, tu deves rever os servidores a que os teus seguidores pertencem. Tu podes activar uma opção para aprovar e rejeitar manualmente novos seguidores nas configurações. Por favor, tem em mente que os gestores do servidor e qualquer servidor que receba a publicação pode lê-lae que os destinatários podem fazer uma captura de tela, copiar ou partilhar a publicação. Não partilhes qualquer informação perigosa no Mastodon.
-
IPs e outros metadados: Quando inicias sessão, nós guardamos o endereço de IP a partir do qual iniciaste a sessão, tal como o nome do teu navegador. Todas as sessões estão disponíveis para verificação e revogação nas configurações. O último endereço de IP usado é guardado até 12 meses. Nós também podemos guardar registos de servidor, os quais incluem o endereço de IP de cada pedido dirigido ao nosso servidor.
+
Informação básica da conta: Se te registares neste servidor, pode-te ser pedido que indiques um nome de utilizador, um endereço de e-mail e uma palavra-passe. Também podes introduzir informação adicional de perfil, tal como um nome a mostrar e dados biográficos, que carregues uma fotografia para o teu perfil e para o cabeçalho. O nome de utilizador, o nome a mostrar, a biografia, a imagem de perfil e a imagem de cabeçalho são sempre listados publicamente.
+
Publicações, seguimento e outra informação pública: A lista de pessoas que tu segues é pública, o mesmo é verdade para os teus seguidores. Quando tu publicas uma mensagem, a data e a hora são guardados, tal como a aplicação a partir da qual a mensagem foi enviada. As mensagens podem conter anexos multimédia, tais como fotografias ou vídeos. Publicações públicas e não listadas são acessíveis publicamente. Quando expões uma publicação no teu perfil, isso é também informação disponível publicamente. As tuas publicações são enviadas aos teus seguidores. Em alguns casos isso significa que elas são enviadas para servidores diferentes onde são guardadas cópias. Quando tu apagas publicações, isso também é enviado para os teus seguidores. A acção de republicar ou favoritar outra publicação é sempre pública.
+
Publicações directas e exclusivas para seguidores: Todas as publicações são guardadas e processadas no servidor. Publicações exclusivas para seguidores são enviadas para os teus seguidores e para utilizadores que são nelas mencionados. As publicações directas são enviadas apenas para os utilizadores nelas mencionados. Em alguns casos isso significa que elas são enviadas para diferentes servidores onde são guardadas cópias das mesmas. Nós fazemos um grande esforço para limitar o acesso a estas publicações aos utilizadores autorizados, mas outros servidores podem falhar neste objectivo. Por isso, tu deves rever os servidores a que os teus seguidores pertencem. Tu podes activar uma opção para aprovar e rejeitar manualmente novos seguidores nas configurações. Por favor, tem em mente que os gestores do servidor e qualquer servidor que receba a publicação pode lê-lae que os destinatários podem fazer uma captura de tela, copiar ou partilhar a publicação. Não partilhes qualquer informação perigosa no Mastodon.
+
IPs e outros metadados: Quando inicias sessão, nós guardamos o endereço de IP a partir do qual iniciaste a sessão, tal como o nome do teu navegador. Todas as sessões estão disponíveis para verificação e revogação nas configurações. O último endereço de IP usado é guardado até 12 meses. Nós também podemos guardar registos de servidor, os quais incluem o endereço de IP de cada pedido dirigido ao nosso servidor.
@@ -861,9 +803,9 @@ pt:
Qualquer informação que recolhemos sobre ti pode ser usada dos seguintes modos:
-
Para providenciar a funcionalidade central do Mastodon. Tu só podes interagir com o conteúdo de outras pessoas e publicar o teu próprio conteúdo depois de teres iniciado sessão. Por exemplo, tu podes seguir outras pessoas para veres as suas publicações na tua cronologia inicial personalizada.
-
Para ajudar na moderação da comunidade para, por exemplo, comparar o teu endereço IP com outros conhecidos, para determinar a fuga ao banimento ou outras violações.
-
O endereço de e-mail que tu forneces pode ser usado para te enviar informações e/ou notificações sobre outras pessoas que estão a interagir com o teu conteúdo ou a enviar-te mensagens, para responderes a inquéritos e/ou outros pedidos ou questões.
+
Para providenciar a funcionalidade central do Mastodon. Tu só podes interagir com o conteúdo de outras pessoas e publicar o teu próprio conteúdo depois de teres iniciado sessão. Por exemplo, tu podes seguir outras pessoas para veres as suas publicações na tua cronologia inicial personalizada.
+
Para ajudar na moderação da comunidade para, por exemplo, comparar o teu endereço IP com outros conhecidos, para determinar a fuga ao banimento ou outras violações.
+
O endereço de e-mail que tu forneces pode ser usado para te enviar informações e/ou notificações sobre outras pessoas que estão a interagir com o teu conteúdo ou a enviar-te mensagens, para responderes a inquéritos e/ou outros pedidos ou questões.
@@ -879,8 +821,8 @@ pt:
Nós envidaremos todos os esforços no sentido de:
-
Guardar registos do servidor contendo o endereço de IP de todos os pedidos feitos a este servidor, considerando que estes registos não serão guardados por mais de 90 dias.
-
Guardar os endereços de IP associados aos utilizadores registados durante um período que não ultrapassará os 12 meses.
+
Guardar registos do servidor contendo o endereço de IP de todos os pedidos feitos a este servidor, considerando que estes registos não serão guardados por mais de 90 dias.
+
Guardar os endereços de IP associados aos utilizadores registados durante um período que não ultrapassará os 12 meses.
Tu podes pedir e descarregar um ficheiro com o teu conteúdo, incluindo as tuas publicações, os ficheiros multimédia, a imagem de perfil e a imagem de cabeçalho.
@@ -929,10 +871,6 @@ pt:
contrast: Mastodon (Elevado contraste)
default: Mastodon
mastodon-light: Mastodon (Leve)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: Entre o código gerado pelo seu aplicativo para confirmar
description_html: Se ativar a autenticação em dois passos, quando logar será necessário o seu telefone que vai gerar os tokens para validação.
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index cdb68c72a..6e6c6f403 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2,11 +2,6 @@
ro:
about:
hosted_on: Mastodon găzduit de %{domain}
- accounts:
- posts:
- few: Toots
- one: Toot
- other: Toots
auth:
change_password: Parolă
confirm_email: Confirmă email
@@ -20,9 +15,6 @@ ro:
migrate_account: Transfer către un alt cont
migrate_account_html: Dacă dorești să redirecționezi acest cont către un altul, poți configura asta aici.
or_log_in_with: Sau conectează-te cu
- providers:
- cas: CAS
- saml: SAML
register: Înregistrare
resend_confirmation: Retrimite instrucțiunile de confirmare
reset_password: Resetare parolă
@@ -50,9 +42,7 @@ ro:
less_than_x_seconds: Chiar acum
over_x_years: "%{count}ani"
x_days: "%{count}z"
- x_minutes: "%{count}m"
x_months: "%{count}l"
- x_seconds: "%{count}s"
deletes:
bad_password_msg: Bună încercare, hackere! Parolă incorectă
confirm_password: Introdu parola curentă pentru a-ți verifica identitatea
@@ -88,7 +78,6 @@ ro:
request: Cere arhiva ta
size: Dimensiune
blocks: Blocați
- csv: CSV
follows: Tu urmărești
mutes: Opriți
storage: Depozitare media
@@ -108,3 +97,11 @@ ro:
title: Filtre
new:
title: Adaugă un filtru nou
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index edccd9e7c..7e336be98 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -171,7 +171,6 @@ ru:
moderator: Модератор
staff: Персонал
user: Пользователь
- salmon_url: Salmon URL
search: Поиск
shared_inbox_url: URL общих входящих
show:
@@ -509,6 +508,9 @@ ru:
body: "%{reporter} подал(а) жалобу на %{target}"
body_remote: Кто-то с узла %{domain} пожаловался на %{target}
subject: Новая жалоба, узел %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Многоколоночный интерфейс
+ sensitive_content: Чувствительное содержимое
application_mailer:
notification_preferences: Изменить настройки e-mail
salutation: "%{name},"
@@ -660,7 +662,7 @@ ru:
one: Что-то здесь не так! Пожалуйста, прочитайте об ошибке ниже
other: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
html_validator:
- invalid_markup: 'contains invalid HTML markup: %{error}'
+ invalid_markup: 'невалидная разметка HTML: %{error}'
identity_proofs:
active: Активно
authorize: Да, авторизовать
@@ -780,7 +782,6 @@ ru:
quadrillion: квадрлн
thousand: тыс
trillion: трлн
- unit: ''
pagination:
newer: Новее
next: След
@@ -798,10 +799,8 @@ ru:
too_few_options: должно быть больше 1 варианта
too_many_options: может содержать не больше %{max} вариантов
preferences:
- languages: Языки
other: Другое
- publishing: Публикация
- web: WWW
+ public_timelines: Публичные ленты
relationships:
activity: Активность аккаунта
dormant: Заброшенные
@@ -956,10 +955,10 @@ ru:
What information do we collect?
-
Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
-
Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
-
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
-
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
+
Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
+
Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
+
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
+
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
@@ -969,9 +968,9 @@ ru:
Any of the information we collect from you may be used in the following ways:
-
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
-
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
-
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
+
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
+
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
+
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
@@ -987,8 +986,8 @@ ru:
We will make a good faith effort to:
-
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
-
Retain the IP addresses associated with registered users no more than 12 months.
+
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
+
Retain the IP addresses associated with registered users no more than 12 months.
You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index f0d121135..b948a5c50 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -17,28 +17,28 @@ ar:
email: سوف تتلقى رسالة إلكترونية للتأكيد
fields: يُمكنك عرض 4 عناصر على شكل جدول في ملفك الشخصي
header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
- inbox_url: نسخ العنوان الذي تريد استخدامه مِن صفحة الإستقبال للمُرحَّل
+ inbox_url: نسخ العنوان الذي تريد استخدامه مِن صفحة الاستقبال للمُرحَّل
irreversible: التبويقات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا
locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات
locked: يتطلب منك الموافقة يدويا على طلبات المتابعة
password: يُنصح باستخدام 8 أحرف على الأقل
phrase: سوف يتم العثور عليه مهما كان نوع النص أو حتى و إن كان داخل الويب فيه تحذير عن المحتوى
- scopes: ما هي المجالات المسموح بها في التطبيق ؟ إن قمت باختيار أعلى المجالات فيمكنك الإستغناء عن الخَيار اليدوي.
+ scopes: ما هي المجالات المسموح بها في التطبيق ؟ إن قمت باختيار أعلى المجالات فيمكنك الاستغناء عن الخَيار اليدوي.
setting_aggregate_reblogs: لا تقم بعرض المشارَكات الجديدة لتبويقات قد قُمتَ بمشاركتها سابقا (هذا الإجراء يعني المشاركات الجديدة فقط التي تلقيتَها)
- setting_default_language: يمكن الكشف التلقائي للّغة اللتي استخدمتها في تحرير تبويقاتك ، غيرَ أنّ العملية ليست دائما دقيقة
setting_display_media_default: إخفاء الوسائط المُعيَّنة كحساسة
setting_display_media_hide_all: إخفاء كافة الوسائط دائمًا
setting_display_media_show_all: دائمًا عرض الوسائط المُعيَّنة كحساسة
setting_hide_network: الحسابات التي تُتابعها و التي تُتابِعك على حد سواء لن تُعرَض على صفحتك الشخصية
setting_noindex: ذلك يؤثر على حالة ملفك الشخصي و صفحاتك
- setting_theme: ذلك يؤثر على الشكل الذي سيبدو عليه ماستدون عندما تقوم بالدخول مِن أي جهاز.
username: اسم المستخدم الخاص بك سوف يكون فريدا مِن نوعه على %{domain}
featured_tag:
name: 'رُبَّما تريد/ي استخدام أحد هؤلاء:'
imports:
data: ملف CSV تم تصديره مِن خادوم ماستدون آخر
+ invite_request:
+ text: هذا سوف يساعدنا في مراجعة تطبيقك
sessions:
- otp: 'قم بإدخال رمز المصادقة بخطوتين الذي قام بتوليده تطبيق جهازك أو إستخدم أحد رموز النفاذ الإحتياطية :'
+ otp: 'قم بإدخال رمز المصادقة بخطوتين الذي قام بتوليده تطبيق جهازك أو استخدم أحد رموز النفاذ الاحتياطية:'
user:
chosen_languages: لن تظهر على الخيوط العمومية إلّا التبويقات المنشورة في اللغات المختارة
labels:
@@ -69,7 +69,7 @@ ar:
current_password: كلمة السر الحالية
data: البيانات
discoverable: القيام بإدراج هذا الحساب في قائمة دليل الحسابات
- display_name: الإسم المعروض
+ display_name: الاسم المعروض
email: عنوان البريد الإلكتروني
expires_in: تنتهي مدة صلاحيته بعد
fields: البيانات الوصفية للصفحة الشخصية
@@ -84,29 +84,30 @@ ar:
otp_attempt: رمز المصادقة بخطوتين
password: كلمة السر
phrase: كلمة مفتاح أو عبارة
+ setting_advanced_layout: تمكين واجهة الويب المتقدمة
setting_aggregate_reblogs: جمع الترقيات في خيوط زمنية
setting_auto_play_gif: تشغيل تلقائي لِوَسائط جيف المتحركة
setting_boost_modal: إظهار مربع حوار للتأكيد قبل ترقية أي تبويق
setting_default_language: لغة النشر
setting_default_privacy: خصوصية المنشور
- setting_default_sensitive: إعتبر الوسائط دائما كمحتوى حساس
+ setting_default_sensitive: اعتبر الوسائط دائما كمحتوى حساس
setting_delete_modal: إظهار مربع حوار للتأكيد قبل حذف أي تبويق
setting_display_media: عرض الوسائط
setting_display_media_default: افتراضي
- setting_display_media_hide_all: اخفاء الكل
+ setting_display_media_hide_all: إخفاء الكل
setting_display_media_show_all: عرض الكل
setting_expand_spoilers: توسيع التبويقات التي تحتوي على تحذيرات عن المحتوى تلقائيا
setting_hide_network: إخفِ شبكتك
setting_noindex: عدم السماح لمحركات البحث بفهرسة ملفك الشخصي
setting_reduce_motion: تخفيض عدد الصور في الوسائط المتحركة
- setting_show_application: إكشف/ي البرامج التي كانت تُرسل تبويقات
- setting_system_font_ui: إستخدم الخطوط الإفتراضية للنظام
+ setting_show_application: اكشف اسم التطبيقات المستخدمة لنشر التبويقات
+ setting_system_font_ui: استخدم الخطوط الافتراضية للنظام
setting_theme: سمة الموقع
setting_unfollow_modal: إظهار مربع حوار للتأكيد قبل إلغاء متابعة أي حساب
severity: القوّة
- type: صيغة الإستيراد
- username: إسم المستخدم
- username_or_email: إسم المستخدم أو كلمة السر
+ type: صيغة الاستيراد
+ username: اسم المستخدم
+ username_or_email: اسم المستخدم أو كلمة السر
whole_word: الكلمة كاملة
featured_tag:
name: الوسم
@@ -114,15 +115,18 @@ ar:
must_be_follower: حظر الإخطارات القادمة من حسابات لا تتبعك
must_be_following: حظر الإخطارات القادمة من الحسابات التي لا تتابعها
must_be_following_dm: حظر الرسائل المباشرة القادمة من طرف أشخاص لا تتبعهم
+ invite_request:
+ text: لماذا ترغب في الانضمام؟
notification_emails:
digest: إرسال ملخصات عبر البريد الإلكتروني
- favourite: إبعث بريداً إلكترونيًا عندما يُعجَب أحدهم بمنشورك
- follow: إبعث بريداً إلكترونيًا عندما يتبعك أحد
- follow_request: إبعث بريدا إلكترونيا عندما يقوم أحدهم بإرسال طلب بالمتابعة
- mention: إبعث بريداً إلكترونيًا عندما يُشير إليك أو يذكُرك أحدهم
- reblog: إبعث بريداً إلكترونيًا عندما يقوم أحدهم بترقية منشورك
+ favourite: ابعث بريداً إلكترونيًا عندما يُعجَب أحدهم بمنشورك
+ follow: ابعث بريداً إلكترونيًا عندما يتبعك أحد
+ follow_request: ابعث بريدا إلكترونيا عندما يقوم أحدهم بإرسال طلب بالمتابعة
+ mention: ابعث بريداً إلكترونيًا عندما يُشير إليك أو يذكُرك أحدهم
+ reblog: ابعث بريداً إلكترونيًا عندما يقوم أحدهم بترقية منشورك
report: إرسال رسالة إلكترونية عند تلقّي إبلاغ جديد
'no': لا
+ recommended: موصى بها
required:
mark: "*"
text: مطلوب
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index b91d5780a..4ec3935c9 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -10,7 +10,6 @@ ast:
irreversible: Los toots peñeraos van desapaecer de mou irreversible, magar que se desanicie la peñera dempués
password: Usa 8 caráuteres polo menos
setting_hide_network: La xente que sigas y teas siguiendo nun va amosase nel perfil
- setting_theme: Afeuta al aspeutu de Mastodon cuando anicies sesión dende cualesquier preséu.
username: El nome d'usuariu va ser únicu en %{domain}
imports:
data: El ficheru CSV esportáu dende otra instancia de Mastodon
@@ -20,7 +19,6 @@ ast:
name: Etiqueta
value: Conteníu
defaults:
- avatar: Avatar
bot: Esta cuenta ye d'un robó
chosen_languages: Peñera de llingües
confirm_new_password: Confirmación de la contraseña nueva
@@ -36,7 +34,6 @@ ast:
locked: Bloquiar cuenta
max_uses: Númberu máximu d'usos
new_password: Contraseña nueva
- note: Bio
otp_attempt: Códigu de verificación en dos pasos
password: Contraseña
phrase: Pallabra clave o fras
@@ -61,6 +58,5 @@ ast:
mention: Unviar un corréu cuando daquién te mente
'no': Non
required:
- mark: "*"
text: ríquese
'yes': Sí
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 9441e53b3..9991bed3d 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -39,6 +39,5 @@ bg:
reblog: Изпращай e-mail, когато някой сподели твоя публикация
'no': Не
required:
- mark: "*"
text: задължително
'yes': Да
diff --git a/config/locales/simple_form.bn.yml b/config/locales/simple_form.bn.yml
new file mode 100644
index 000000000..152c69829
--- /dev/null
+++ b/config/locales/simple_form.bn.yml
@@ -0,0 +1 @@
+bn:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index db87fb116..d8713e4ca 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -27,20 +27,21 @@ ca:
phrase: Es combinarà independentment del format en el text o l'avís de contingut d'un toot
scopes: A quines API es permetrà l'accés a l'aplicació. Si selecciones un àmbit d'alt nivell, no cal que seleccionis un d'individual.
setting_aggregate_reblogs: No mostra els nous impulsos dels toots que ja s'han impulsat recentment (només afecta als impulsos nous rebuts)
- setting_default_language: La llengua dels teus toots pot ser detectada automàticament però no sempre acuradament
+ setting_default_sensitive: Els mèdia sensibles estan ocults per defecte i es poden revelar amb un clic
setting_display_media_default: Amaga els multimèdia marcats com a sensibles
setting_display_media_hide_all: Sempre oculta tots els multimèdia
setting_display_media_show_all: Mostra sempre els elements multimèdia marcats com a sensibles
setting_hide_network: Qui tu segueixes i els que et segueixen a tu no es mostraran en el teu perfil
setting_noindex: Afecta el teu perfil públic i les pàgines d'estat
setting_show_application: L'aplicació que fas servir per a publicar es mostrarà a la vista detallada dels teus toots
- setting_theme: Afecta l'aspecte de Mastodon quan es visita des de qualsevol dispositiu.
username: El teu nom d'usuari serà únic a %{domain}
whole_word: Quan la paraula clau o la frase sigui només alfanumèrica, s'aplicarà si coincideix amb la paraula sencera
featured_tag:
name: 'És possible que vulguis utilitzar un d''aquests:'
imports:
data: Fitxer CSV exportat des d'un altre servidor de Mastodon
+ invite_request:
+ text: Això ens ajudarà a revisar la teva petició
sessions:
otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:'
user:
@@ -88,6 +89,7 @@ ca:
otp_attempt: Codi de dos factors
password: Contrasenya
phrase: Paraula clau o frase
+ setting_advanced_layout: Activar l’interfície web avançada
setting_aggregate_reblogs: Agrupa impulsos en les línies de temps
setting_auto_play_gif: Reproducció automàtica de GIFs animats
setting_boost_modal: Mostra la finestra de confirmació abans d'impulsar
@@ -118,15 +120,19 @@ ca:
must_be_follower: Blocar les notificacions de persones que no et segueixen
must_be_following: Bloca les notificacions de persones que no segueixes
must_be_following_dm: Bloca els missatges directes de persones que no segueixes
+ invite_request:
+ text: Per què vols unir-te?
notification_emails:
digest: Envia un resum per correu electrònic
favourite: Envia un correu electrònic si algú marca com a preferit el teu estat
follow: Envia un correu electrònic si algú et segueix
follow_request: Envia un correu electrònic si algú sol·licita seguir-te
mention: Envia un correu electrònic si algú et menciona
+ pending_account: Envia un correu electrònic quan es necessiti revisar un compte nou
reblog: Envia un correu electrònic si algú comparteix el teu estat
report: Envia un correu electrònic quan s'enviï un nou informe
'no': 'No'
+ recommended: Recomanat
required:
mark: "*"
text: necessari
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index 3a521e85e..1f5dba43f 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -27,14 +27,13 @@ co:
phrase: Sarà trovu senza primura di e maiuscule o di l'avertimenti
scopes: L'API à quelle l'applicazione averà accessu. S'è voi selezziunate un parametru d'altu livellu, un c'hè micca bisognu di selezziunà quell'individuali.
setting_aggregate_reblogs: Ùn mustrà micca e nove spartere per i statuti chì sò stati spartuti da pocu (tocca solu e spartere più ricente)
- setting_default_language: A lingua di i vostri statuti pò esse induvinata autumaticamente, mà ùn marchja micca sempre bè
+ setting_default_sensitive: I media sensibili sò piattati, salvu un cambiamentu di i paramettri, è ponu esse visti cù un cliccu
setting_display_media_default: Piattà i media marcati cum'è sensibili
setting_display_media_hide_all: Sempre piattà tutti i media
setting_display_media_show_all: Sempre affissà i media marcati cum'è sensibili
setting_hide_network: I vostri abbunati è abbunamenti ùn saranu micca mustrati nant’à u vostru prufile
setting_noindex: Tocca à u vostru prufile pubblicu è i vostri statuti
setting_show_application: L'applicazione chì voi utilizate per mandà statuti sarà affissata indè a vista ditagliata di quelli
- setting_theme: Tocca à l’apparenza di Mastodon quandu site cunnettatu·a da qualch’apparechju.
username: U vostru cugnome sarà unicu nant'à %{domain}
whole_word: Quandu a parolla o a frasa sana hè alfanumerica, sarà applicata solu s'ella currisponde à a parolla sana
featured_tag:
@@ -50,7 +49,7 @@ co:
labels:
account:
fields:
- name: Label
+ name: Marcu
value: Cuntinutu
account_warning_preset:
text: Testu preselezziunatu
@@ -90,6 +89,7 @@ co:
otp_attempt: Codice d’identificazione à dui fattori
password: Chjave d’accessu
phrase: Parolla-chjave o frasa
+ setting_advanced_layout: Attivà l'interfaccia web avanzata
setting_aggregate_reblogs: Gruppà e spartere indè e linee
setting_auto_play_gif: Lettura autumatica di i GIF animati
setting_boost_modal: Mustrà una cunfirmazione per sparte un statutu
@@ -132,6 +132,7 @@ co:
reblog: Mandà un’e-mail quandu qualch’unu sparte i mo statuti
report: Mandà un'e-mail quandu c'hè un novu signalamentu
'no': Nò
+ recommended: Ricumandati
required:
mark: "*"
text: riquisiti
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 2b4888424..3bf74e971 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -27,14 +27,13 @@ cs:
phrase: Shoda bude nalezena bez ohledu na velikost písmen v těle tootu či varování o obsahu
scopes: Která API bude aplikaci povoleno používat. Pokud vyberete rozsah nejvyššího stupně, nebudete je muset vybírat jednotlivě.
setting_aggregate_reblogs: Nezobrazovat nové boosty pro tooty, které byly nedávno boostnuty (ovlivňuje pouze nově přijaté boosty)
- setting_default_language: Jazyk vašich tootů může být detekován automaticky, není to však vždy přesné
+ setting_default_sensitive: Citlivá média jsou ve výchozím stavu skryta a mohou být zobrazena kliknutím
setting_display_media_default: Skrývat média označená jako citlivá
setting_display_media_hide_all: Vždy skrývat všechna média
setting_display_media_show_all: Vždy zobrazovat média označená jako citlivá
setting_hide_network: Koho sledujete a kdo sleduje vás nebude zobrazeno na vašem profilu
setting_noindex: Ovlivňuje váš veřejný profil a stránky tootů
setting_show_application: Aplikace, kterou používáte k psaní tootů, bude zobrazena v detailním zobrazení vašich tootů
- setting_theme: Ovlivňuje jak Mastodon vypadá, jste-li přihlášen na libovolném zařízení.
username: Vaše uživatelské jméno bude na %{domain} unikátní
whole_word: Je-li klíčové slovo či fráze pouze alfanumerická, bude aplikována pouze, pokud se shoduje s celým slovem
featured_tag:
@@ -90,6 +89,7 @@ cs:
otp_attempt: Dvoufázový kód
password: Heslo
phrase: Klíčové slovo či fráze
+ setting_advanced_layout: Povolit pokročilé webové rozhraní
setting_aggregate_reblogs: Seskupovat boosty v časových osách
setting_auto_play_gif: Automaticky přehrávat animace GIF
setting_boost_modal: Zobrazovat před boostnutím potvrzovací okno
@@ -132,6 +132,7 @@ cs:
reblog: Posílat e-maily, když někdo boostne váš toot
report: Posílat e-maily, je-li odesláno nové nahlášení
'no': Ne
+ recommended: Doporučeno
required:
mark: "*"
text: požadováno
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 24ae49a2a..023506f24 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -2,33 +2,46 @@
cy:
simple_form:
hints:
+ account_warning_preset:
+ text: Gallwch defnyddio cystrawen tŵt, fel URLs, hashnodau a sôniadau
+ admin_account_action:
+ send_email_notification: Bydd y defnyddiwr yn derbyn esboniad o beth digwyddodd gyda'i cyfrif
+ text_html: Yn ddewisol. Gallwch defnyddio cystrawen tŵt. Gallwch ychwanegu rhagosodiadau rhybydd i arbed amser
+ type_html: Dewis beth i wneud gyda %{acct}
+ warning_preset_id: Yn ddewisol. Gallwch dal ychwanegu testun addasiol I ddiwedd y rhagosodiad
defaults:
autofollow: Bydd pobl sy'n cofrestru drwy'r gwahoddiad yn eich dilyn yn awtomatig
avatar: PNG, GIF neu JPG. %{size} ar y mwyaf. Caiff ei israddio i %{dimensions}px
bot: Mae'r cyfrif hwn yn perfformio gweithredoedd awtomatig yn bennaf ac mae'n bosib nad yw'n cael ei fonitro
context: Un neu fwy cyd-destun lle dylai'r hidlydd weithio
digest: Ond yn cael eu hanfon ar ôl cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
+ discoverable_html: Mae'r cyfeiriadur yn gadael i bobl ddarganfod cyfrifau wedi'i seilio ar ddiddordebau a gweithgareddau.. Mae hyn angen o leiaf %{min_followers} o ddilynwyr
email: Byddwch yn derbyn e-bost i gadarnhau
fields: Mae modd i chi arddangos hyd at 4 eitem fel tabl ar eich proffil
header: PNG, GIF neu JPG. %{size} ar y mwyaf. Ceith ei israddio i %{dimensions}px
inbox_url: Copïwch yr URL o dudalen flaen y relái yr ydych am ei ddefnyddio
irreversible: Bydd tŵtiau wedi eu hidlo yn diflannu am byth, hyd yn oed os ceith yr hidlydd ei ddileu'n hwyrach
- locale: Iaith y rhyngwyneb, e-byst a hysbysiadau push
+ locale: Iaith y rhyngwyneb, e-byst a hysbysiadau gwthiadwy
locked: Ei wneud yn ofynnol i chi i ganiatau dilynwyr a llaw
password: Defnyddiwch oleiaf 8 nodyn
phrase: Caiff ei gyfateb heb ystyriaeth o briflythrennu mewn testun neu rhybudd ynghylch cynnwys tŵt
scopes: Pa APIau y bydd gan y rhaglen ganiatad i gael mynediad iddynt. Os dewiswch maes lefel uchaf, yna nid oes angen dewis rhai unigol.
- setting_default_language: Mae modd adnabod iaith eich tŵtiau yn awtomatig, ond nid yw bob tro'n gywir
+ setting_aggregate_reblogs: Paid dangos bŵstiau newydd ar gyfer tŵtiau sydd wedi'i fŵstio yn ddiweddar (dim ond yn effeithio bŵstiau newydd ei dderbyn)
+ setting_default_sensitive: Mae cyfryngau sensitif yn cael ei gyddio'n rhagosodiedig, a gall cael eu dangos â chlic
setting_display_media_default: Cuddio cyfryngau wedi eu marcio'n sensitif
setting_display_media_hide_all: Cuddio cyfryngau bob tro
setting_display_media_show_all: Dangos cyfryngau wedi eu marcio'n sensitif bob tro
setting_hide_network: Ni fydd y rheini yr ydych yn eu dilyn a phwy sy'n eich dilyn chi yn cael ei ddangos ar eich proffil
setting_noindex: Mae hyn yn effeithio ar eich proffil cyhoeddus a'ch tudalennau statws
- setting_theme: Mae hyn yn effeithio ar sut olwg sydd ar Matododon pan yr ydych wedi mewngofnodi o unrhyw ddyfais.
+ setting_show_application: Bydd y offer frydych yn defnyddio i dŵtio yn cael ei arddangos yn golwg manwl eich tŵtiau
username: Bydd eich enw defnyddiwr yn unigryw ar %{domain}
whole_word: Os yw'r allweddair neu'r ymadrodd yn alffaniwmerig yn unig, mi fydd ond yn cael ei osod os yw'n cyfateb a'r gair cyfan
+ featured_tag:
+ name: 'Efallai hoffech defnyddio un o''r rhain:'
imports:
data: Allforiwyd dogfen CSV o achos Mastodon arall
+ invite_request:
+ text: Bydd hyn yn helpu ni adolygu eich cais
sessions:
otp: 'Mewnbynnwch y cod dau gam a gynhyrchwyd gan eich ap ffôn neu defnyddiwch un o''ch codau adfer:'
user:
@@ -76,7 +89,8 @@ cy:
otp_attempt: Côd dau gam
password: Cyfrinair
phrase: Allweddair neu ymadrodd
- setting_aggregate_reblogs: Grŵp hybiau mewn llinellau amser
+ setting_advanced_layout: Alluogi rhyngwyneb wê uwch
+ setting_aggregate_reblogs: Grŵp hybiau mewn ffrydiau
setting_auto_play_gif: Chwarae GIFs wedi'u hanimeiddio yn awtomatig
setting_boost_modal: Dangos deialog cadarnhad cyn bŵstio
setting_default_language: Cyhoeddi iaith
@@ -91,6 +105,7 @@ cy:
setting_hide_network: Cuddio eich rhwydwaith
setting_noindex: Dewis peidio mynegeio peiriant chwilota
setting_reduce_motion: Lleihau mudiant mewn animeiddiadau
+ setting_show_application: Datguddio'r offer defnyddwyd i anfon tŵtiau
setting_system_font_ui: Defnyddio ffont rhagosodedig y system
setting_theme: Thema'r wefan
setting_unfollow_modal: Dangos deialog cadarnhau cyn dad-ddilyn rhywun
@@ -99,19 +114,25 @@ cy:
username: Enw defnyddiwr
username_or_email: Enw defnyddiwr neu e-bost
whole_word: Gair cyfan
+ featured_tag:
+ name: Hashnod
interactions:
must_be_follower: Blocio hysbysiadau o bobl nad ydynt yn eich dilyn
must_be_following: Blocio hysbysiadau o bobl nad ydych yn eu dilyn
must_be_following_dm: Blocio negeseuon uniongyrchol o bobl nad ydych yn eu dilyn
+ invite_request:
+ text: Pam hoffech ymuno?
notification_emails:
digest: Anfonwch e-byst crynhoi
favourite: Anfon e-bost pan mae rhywun yn ffefrynnu eich statws
follow: Anfon e-bost pan mae rhywun yn eich dilyn chi
follow_request: Anfon e-bost pan mae rhywun yn gofyn i chi i'w dilyn
mention: Anfon e-bost pan mae rhywun yn eich crybwyll
+ pending_account: Anfon ebost pan mae cyfrif newydd angen adolygiad
reblog: Anfon e-bost pan mae rhywun yn bŵstio eich statws
report: Anfon e-bost pan y cyflwynir adroddiad newydd
'no': Na
+ recommended: Argymhellwyd
required:
mark: "*"
text: gofynnol
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 483be7055..324afece6 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -20,12 +20,10 @@ da:
password: Brug mindst 8 tegn
phrase: Vil blive parret uanset om der er store eller små bogstaver i teksten eller om der er en advarsel om et trut
scopes: Hvilke APIs applikationen vil få adgang til. Hvis du vælger et højtlevel omfang, behøver du ikke vælge enkeltstående.
- setting_default_language: Sproget for dine trut kan blive fundet automatisk, men det er ikke altid præcist
setting_display_media_default: Skjul medier markeret som følsomt
setting_display_media_hide_all: Skjul altid alle medier
setting_hide_network: Hvem du følger og hvem der følger dig vil ikke blive vist på din profil
setting_noindex: Påvirker din offentlige profil og status sider
- setting_theme: Påvirker hvordan Mastodon ser ud når du er logget ind via en hvilken som helst enhed.
username: Dit brugernavn vil være unikt på %{domain}
whole_word: Når nøgle ordet eller udtrykket kun er alfanumerisk, vil det kun blive brugt hvis det passer hele ordet
imports:
@@ -53,7 +51,6 @@ da:
confirm_password: Bekræft adgangskode
context: Filtrer sammenhænge
current_password: Nuværende adgangskode
- data: Data
display_name: Visningsnavn
email: E-mail adresse
expires_in: Udløber efter
@@ -105,6 +102,5 @@ da:
report: Send email når en ny anmeldelse bliver indsendt
'no': Nej
required:
- mark: "*"
text: påkrævet
'yes': Ja
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 779476069..61e0f9740 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -3,50 +3,49 @@ de:
simple_form:
hints:
account_warning_preset:
- text: Du kannst Toot-Syntax benutzen, wie zum Beispiel URLs, Hashtags und Erwähnungen
+ text: Du kannst Beitragssyntax benutzen, wie z.B. URLs, Hashtags und Erwähnungen
admin_account_action:
- send_email_notification: Der Benutzer erhält eine Erklärung, was mit seinem Account geschehen ist
- text_html: Optional. Du kannst Toot-Syntax benutzen. Du kannst Warnungsvorlagen benutzen um Zeit zu sparen
+ send_email_notification: Benutzer_in wird Bescheid gegeben, was mit dem Konto geschehen ist
+ text_html: Optional. Du kannst Beitragssyntax nutzen. Du kannst Warnungsvorlagen benutzen um Zeit zu sparen
type_html: Wähle aus, was du mit %{acct} machen möchtest
warning_preset_id: Optional. Du kannst immer noch eigenen Text an das Ende der Vorlage hinzufügen
defaults:
autofollow: Leute, die sich über deine Einladung registrieren, werden dir automatisch folgen
avatar: PNG, GIF oder JPG. Maximal %{size}. Wird auf %{dimensions} px herunterskaliert
bot: Dieses Konto führt lediglich automatisierte Aktionen durch und wird möglicherweise nicht überwacht
- context: Ein oder mehrere Aspekte, wo der Filter greifen soll
- digest: Wenn du lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen in deiner Abwesenheit zugeschickt
- discoverable_html: Das Verzeichnis lässt dich basierend auf Interessen und Aktivitäten neue Benutzerkonten finden. Dies benötigt mindestens %{min_followers} Follower
+ context: Ein oder mehrere Kontexte, wo der Filter aktiv werden soll
+ digest: Wenn du eine lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen zugeschickt, die du in deiner Abwesenheit empfangen hast
+ discoverable_html: Das Verzeichnis erlaubt es dein Profil durch deine Hashtags und deine Aktivitäten zu entdecken. Voraussetzung ist allerdings mindestens %{min_followers} Folger_innen
email: Du wirst eine Bestätigungs-E-Mail erhalten
fields: Du kannst bis zu 4 Elemente auf deinem Profil anzeigen lassen, die als Tabelle dargestellt werden
header: PNG, GIF oder JPG. Maximal %{size}. Wird auf %{dimensions} px herunterskaliert
inbox_url: Kopiere die URL von der Startseite des gewünschten Relays
- irreversible: Gefilterte Beiträge werden unwiderruflich gefiltert, selbst wenn der Filter später entfernt wurde
+ irreversible: Gefilterte Beiträge werden unwiderruflich gelöscht, selbst wenn der Filter später entfernt wird
locale: Die Sprache der Oberfläche, E-Mails und Push-Benachrichtigungen
locked: Wer dir folgen möchte, muss um deine Erlaubnis bitten
password: Verwende mindestens 8 Zeichen
- phrase: Wird unabhängig vom umgebenen Text oder Inhaltswarnung eines Beitrags verglichen
+ phrase: Wird schreibungsunabhängig mit dem Text und Inhaltswarnung eines Beitrags verglichen
scopes: Welche Schnittstellen der Applikation erlaubt sind. Wenn du einen Top-Level-Scope auswählst, dann musst du nicht jeden einzelnen darunter auswählen.
setting_aggregate_reblogs: Zeige denselben Beitrag nicht nochmal an, wenn er erneut geteilt wurde (dies betrifft nur neulich erhaltene erneut geteilte Beiträge)
- setting_default_language: Die Sprache der Beiträge kann automatisch erkannt werden, aber dies ist nicht immer genau
+ setting_default_sensitive: Heikle Medien werden erst nach einem Klick sichtbar
setting_display_media_default: Verstecke Medien, die als sensibel markiert sind
setting_display_media_hide_all: Alle Medien immer verstecken
setting_display_media_show_all: Medien, die als sensibel markiert sind, immer anzeigen
setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt
setting_noindex: Betrifft dein öffentliches Profil und deine Beiträge
- setting_show_application: Die Anwendung, die du zum Schreiben von Beiträgen benutzt wird in der detaillierten Ansicht deiner Beiträge angezeigt
- setting_theme: Wirkt sich darauf aus, wie Mastodon aussieht, egal auf welchem Gerät du eingeloggt bist.
- username: Dein Benutzer:innen-Name wird auf %{domain} nur einmal vorkommen
- whole_word: Wenn das Schlagwort oder die Phrase nur Buchstaben und Zahlen enthält, wird es nur angewendet, wenn es dem ganzen Wort entspricht
+ setting_show_application: Die Anwendung die du nutzst wird in der detaillierten Ansicht deiner Beiträge angezeigt
+ username: Dein Profilname wird auf %{domain} einzigartig sein
+ whole_word: Wenn das Schlagwort nur aus Buchstaben und Zahlen besteht, wird es nur angewendet, wenn es dem ganzen Wort entspricht
featured_tag:
name: 'Du möchtest vielleicht einen von diesen benutzen:'
imports:
data: CSV-Datei, die aus einem anderen Mastodon-Server exportiert wurde
- inivte_request:
- text: Dies wird uns helfen deine Anfrage besser zu verstehen
+ invite_request:
+ text: Dies wird uns helfen deine Anmeldungsanfrage besser zu verarbeiten
sessions:
- otp: 'Gib den Zwei-Faktor-Authentisierungscode von deinem Telefon ein oder benutze einen deiner Wiederherstellungscodes:'
+ otp: 'Gib die Zwei-Faktor-Authentifizierung von deinem Telefon ein oder benutze einen deiner Wiederherstellungscodes:'
user:
- chosen_languages: Wenn dies aktiviert ist, dann werden nur Beiträge in den ausgewählten Sprachen auf der öffentlichen Timeline angezeigt
+ chosen_languages: Wenn aktiviert, werden nur Beiträge in den ausgewählten Sprachen auf den öffentlichen Zeitleisten angezeigt
labels:
account:
fields:
@@ -62,76 +61,78 @@ de:
disable: Deaktivieren
none: Nichts tun
silence: Stummschalten
- suspend: Deaktivieren und unwiderruflich Benutzerdaten löschen
+ suspend: Deaktivieren und Benutzerdaten unwiderruflich löschen
warning_preset_id: Benutze eine Warnungsvorlage
defaults:
- autofollow: Einladen, um deinem Account zu folgen
+ autofollow: Eingeladene Nutzer_innen sollen dir automatisch folgen
avatar: Profilbild
- bot: Dieser Benutzer ist ein Bot
+ bot: Dieses Profil ist ein Bot
chosen_languages: Sprachen filtern
confirm_new_password: Neues Passwort bestätigen
confirm_password: Passwort bestätigen
- context: Aspekte filtern
+ context: In Kontexten filtern
current_password: Derzeitiges Passwort
data: Daten
- discoverable: Dieses Benutzerkonto im Verzeichnis auflisten
+ discoverable: Dieses Profil im Profilverzeichnis zeigen
display_name: Anzeigename
email: E-Mail-Adresse
expires_in: Läuft ab
- fields: Profil-Metadaten
+ fields: Tabellenfelder
header: Titelbild
- inbox_url: Inbox-URL des Relays
+ inbox_url: Inbox-URL des Relais
irreversible: Verwerfen statt verstecken
locale: Sprache der Benutzeroberfläche
- locked: Gesperrtes Profil
+ locked: Profil sperren
max_uses: Maximale Verwendungen
new_password: Neues Passwort
note: Über mich
- otp_attempt: Zwei-Faktor-Authentisierungs-Code
+ otp_attempt: Zwei-Faktor-Authentifizierung
password: Passwort
- phrase: Schlagwort oder Phrase
- setting_aggregate_reblogs: Gruppiere erneut geteilte Beiträge in Zeitleisten
+ phrase: Schlagwort oder Satz
+ setting_advanced_layout: Fortgeschrittene Benutzeroberfläche benutzen
+ setting_aggregate_reblogs: Gruppiere erneut geteilte Beiträge auf der Startseite
setting_auto_play_gif: Animierte GIFs automatisch abspielen
setting_boost_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag geteilt wird
setting_default_language: Beitragssprache
setting_default_privacy: Beitragssichtbarkeit
- setting_default_sensitive: Medien immer als sensibel markieren
+ setting_default_sensitive: Medien immer als heikel markieren
setting_delete_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag gelöscht wird
setting_display_media: Medien-Anzeige
- setting_display_media_default: Standard
- setting_display_media_hide_all: Alle verstecken
- setting_display_media_show_all: Alle anzeigen
+ setting_display_media_default: Heikle Inhalte verstecken
+ setting_display_media_hide_all: Alle Medien verstecken
+ setting_display_media_show_all: Alle Medien anzeigen
setting_expand_spoilers: Beiträge mit Inhaltswarnungen immer ausklappen
- setting_hide_network: Blende dein Netzwerk aus
+ setting_hide_network: Netzwerk ausblenden
setting_noindex: Suchmaschinen-Indexierung verhindern
setting_reduce_motion: Bewegung in Animationen verringern
setting_show_application: Anwendung preisgeben, die benutzt wurde um Beiträge zu versenden
setting_system_font_ui: Standardschriftart des Systems verwenden
- setting_theme: Theme der Website
+ setting_theme: Theme
setting_unfollow_modal: Bestätigungsdialog anzeigen, bevor jemandem entfolgt wird
severity: Schweregrad
- type: Importtyp
+ type: Art des Imports
username: Profilname
username_or_email: Profilname oder E-Mail
whole_word: Ganzes Wort
featured_tag:
name: Hashtag
interactions:
- must_be_follower: Benachrichtigungen von Nicht-Folgenden blockieren
+ must_be_follower: Benachrichtigungen von Profilen blockieren, die mir nicht folgen
must_be_following: Benachrichtigungen von Profilen blockieren, denen ich nicht folge
must_be_following_dm: Private Nachrichten von Profilen, denen ich nicht folge, blockieren
invite_request:
text: Warum möchtest du beitreten?
notification_emails:
- digest: Schicke Übersichts-E-Mails
+ digest: Kurzfassungen über E-Mail senden
favourite: E-Mail senden, wenn jemand meinen Beitrag favorisiert
follow: E-Mail senden, wenn mir jemand folgt
follow_request: E-Mail senden, wenn mir jemand folgen möchte
mention: E-Mail senden, wenn mich jemand erwähnt
- pending_account: E-Mail senden, wenn ein Benutzerkonto zur Überprüfung aussteht
+ pending_account: E-Mail senden, wenn ein neues Benutzerkonto zur Überprüfung aussteht
reblog: E-Mail senden, wenn jemand meinen Beitrag teilt
report: E-Mail senden, wenn ein neuer Bericht vorliegt
'no': Nein
+ recommended: Empfohlen
required:
mark: "*"
text: Pflichtfeld
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 3d812204c..67f3b64aa 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -27,20 +27,21 @@ el:
phrase: Θα ταιριάζει ανεξαρτήτως πεζών/κεφαλαίων ή προειδοποίησης περιεχομένου του τουτ
scopes: Ποια API θα επιτρέπεται στην εφαρμογή να χρησιμοποιήσεις. Αν επιλέξεις κάποιο υψηλό εύρος εφαρμογής, δε χρειάζεται να επιλέξεις και εξειδικευμένα.
setting_aggregate_reblogs: Απόκρυψη των νέων προωθήσεωνγια τα τουτ που έχουν προωθηθεί πρόσφατα (επηρεάζει μόνο τις νέες προωθήσεις)
- setting_default_language: Η γλώσσα των τουτ σου μπορεί να ανιχνευτεί αυτόματα αλλά δεν είναι πάντα ακριβές
+ setting_default_sensitive: Τα ευαίσθητα πολυμέσα είναι κρυμμένα και εμφανίζονται με ένα κλικ
setting_display_media_default: Απόκρυψη ευαίσθητων πολυμέσων
setting_display_media_hide_all: Μόνιμη απόκρυψη όλων των πολυμέσων
setting_display_media_show_all: Μόνιμη εμφάνιση ευαίσθητων πολυμέσων
setting_hide_network: Δε θα εμφανίζεται στο προφίλ σου ποιους ακολουθείς και ποιοι σε ακολουθούν
setting_noindex: Επηρεάζει το δημόσιο προφίλ και τις δημοσιεύσεις σου
setting_show_application: Η εφαρμογή που χρησιμοποιείς για να στέλνεις τα τουτ σου θα εμφανίζεται στις αναλυτικές λεπτομέρειες τους
- setting_theme: Επηρεάζει την εμφάνιση του Mastodon όταν συνδέεται από οποιαδήποτε συσκευή.
username: Το όνομα χρήστη σου θα είναι μοναδικό στο %{domain}
whole_word: Όταν η λέξη ή η φράση κλειδί είναι μόνο αλφαριθμητική, θα εφαρμοστεί μόνο αν ταιριάζει με ολόκληρη τη λέξη
featured_tag:
name: 'Ίσως να θες να χρησιμοποιήσεις μια από αυτές:'
imports:
data: Αρχείο CSV που έχει εξαχθεί από διαφορετικό κόμβο Mastodon
+ invite_request:
+ text: Αυτό θα μας βοηθήσει να επιθεωρήσουμε την αίτησή σου
sessions:
otp: 'Βάλε τον κωδικό δυο παραγόντων (2FA) από την εφαρμογή του τηλεφώνου σου ή χρησιμοποίησε κάποιον από τους κωδικούς ανάκτησης σου:'
user:
@@ -66,7 +67,7 @@ el:
autofollow: Προσκάλεσε για να ακολουθήσουν το λογαριασμό σου
avatar: Αβατάρ
bot: Αυτός είναι ένας αυτοματοποιημένος λογαριασμός (bot)
- chosen_languages: Φίλτραρε γλώσσες
+ chosen_languages: Φιλτράρισμα γλωσσών
confirm_new_password: Επιβεβαίωσε νέο συνθηματικό
confirm_password: Επιβεβαίωσε συνθηματικό
context: Πλαίσια φιλτραρίσματος
@@ -88,12 +89,13 @@ el:
otp_attempt: Κωδικός δυο παραγόντων
password: Συνθηματικό
phrase: Λέξη ή φράση κλειδί
+ setting_advanced_layout: Ενεργοποίηση προηγμένης λειτουργίας χρήσης
setting_aggregate_reblogs: Ομαδοποίηση προωθήσεων στις ροές
setting_auto_play_gif: Αυτόματη αναπαραγωγή των GIF
setting_boost_modal: Εμφάνιση ερώτησης επιβεβαίωσης πριν την προώθηση
setting_default_language: Γλώσσα δημοσιεύσεων
setting_default_privacy: Ιδιωτικότητα δημοσιεύσεων
- setting_default_sensitive: Σημείωνε πάντα τα πολυμέσα ως ευαίσθητου περιεχομένου
+ setting_default_sensitive: Σημείωση των πολυμέσων πάντα ως ευαίσθητου περιεχομένου
setting_delete_modal: Εμφάνιση ερώτησης επιβεβαίωσης πριν διαγράψεις ένα τουτ
setting_display_media: Εμφάνιση πολυμέσων
setting_display_media_default: Προκαθορισμένο
@@ -103,7 +105,7 @@ el:
setting_hide_network: Κρύψε τις διασυνδέσεις σου
setting_noindex: Επέλεξε να μην συμμετέχεις στα αποτελέσματα μηχανών αναζήτησης
setting_reduce_motion: Μείωση κίνησης κινουμένων στοιχείων
- setting_show_application: Να αποκαλύπτεται η εφαρμογή που χρησιμοποιήθηκε για την αποστολή των τουτ
+ setting_show_application: Αποκάλυψη εφαρμογής που χρησιμοποιήθηκε για την αποστολή των τουτ
setting_system_font_ui: Χρησιμοποίησε την προεπιλεγμένη γραμματοσειρά του συστήματος
setting_theme: Θέμα ιστότοπου
setting_unfollow_modal: Εμφάνιση ερώτησης επιβεβαίωσης πριν διακόψεις την παρακολούθηση κάποιου
@@ -118,15 +120,19 @@ el:
must_be_follower: Μπλόκαρε τις ειδοποιήσεις από όσους δεν ακολουθείς
must_be_following: Μπλόκαρε τις ειδοποιήσεις που προέρχονται από άτομα που δεν τα ακολουθείς
must_be_following_dm: Μπλόκαρε τα προσωπικά μηνύματα από όσους δεν ακολουθείς
+ invite_request:
+ text: Γιατί θέλεις να συμμετάσχεις;
notification_emails:
digest: Στέλνε συνοπτικά email
favourite: Στελνε email όταν κάποιος σημειώνει ως αγαπημένη τη δημοσίευσή σου
follow: Στελνε email όταν κάποιος σε ακολουθεί
follow_request: Στέλνε email όταν κάποιος ζητάει να σε ακολουθήσει
mention: Στέλνε email όταν κάποιος σε αναφέρει
+ pending_account: Αποστολή email όταν υπάρχει νέος λογαριασμός για επιθεώρηση
reblog: Στέλνε email όταν κάποιος προωθεί τη δημοσίευση σου
report: Αποστολή email όταν υποβάλλεται νέα καταγγελία
'no': Όχι
+ recommended: Προτείνεται
required:
mark: "*"
text: απαιτείται
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 1a43e19e2..4602f9cd9 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -27,14 +27,13 @@ en:
phrase: Will be matched regardless of casing in text or content warning of a toot
scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts)
- setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
+ setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
setting_display_media_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide all media
setting_display_media_show_all: Always show media marked as sensitive
setting_hide_network: Who you follow and who follows you will not be shown on your profile
setting_noindex: Affects your public profile and status pages
setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
- setting_theme: Affects how Mastodon looks when you're logged in from any device.
username: Your username will be unique on %{domain}
whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
featured_tag:
@@ -90,11 +89,12 @@ en:
otp_attempt: Two-factor code
password: Password
phrase: Keyword or phrase
+ setting_advanced_layout: Enable advanced web interface
setting_aggregate_reblogs: Group boosts in timelines
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before boosting
setting_default_language: Posting language
- setting_default_privacy: Post privacy
+ setting_default_privacy: Posting privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
setting_display_media: Media display
@@ -132,6 +132,7 @@ en:
reblog: Send e-mail when someone boosts your status
report: Send e-mail when a new report is submitted
'no': 'No'
+ recommended: Recommended
required:
mark: "*"
text: required
diff --git a/config/locales/simple_form.en_GB.yml b/config/locales/simple_form.en_GB.yml
index 6eac4bf3c..8752d81bb 100644
--- a/config/locales/simple_form.en_GB.yml
+++ b/config/locales/simple_form.en_GB.yml
@@ -27,14 +27,12 @@ en_GB:
phrase: Will be matched regardless of casing in text or content warning of a toot
scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts)
- setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
setting_display_media_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide all media
setting_display_media_show_all: Always show media marked as sensitive
setting_hide_network: Who you follow and who follows you will not be shown on your profile
setting_noindex: Affects your public profile and status pages
setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
- setting_theme: Affects how Mastodon looks when you're logged in from any device.
username: Your username will be unique on %{domain}
whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
featured_tag:
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index f4e1df32a..1b63b27a8 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -27,20 +27,21 @@ eo:
phrase: Estos provita senzorge pri la uskleco de teksto aŭ averto pri enhavo de mesaĝo
scopes: Kiujn API-ojn la aplikaĵo permesiĝos atingi. Se vi elektas supran amplekson, vi ne bezonas elekti la individuajn.
setting_aggregate_reblogs: Ne montri novajn diskonigojn de mesaĝoj laste diskonigitaj (nur efikas al novaj diskonigoj)
- setting_default_language: La lingvo de viaj mesaĝoj povas esti aŭtomate detektitaj, sed tio ne ĉiam ĝustas
+ setting_default_sensitive: Sentema komunikilo estas kaŝita defaŭlte kaj povas esti rivelita per alklako
setting_display_media_default: Kaŝi aŭdovidaĵojn markitajn kiel tiklaj
setting_display_media_hide_all: Ĉiam kaŝi ĉiujn aŭdovidaĵojn
setting_display_media_show_all: Ĉiam montri aŭdovidaĵojn markitajn kiel tiklaj
setting_hide_network: Tiuj, kiujn vi sekvas, kaj tiuj, kiuj sekvas vin ne estos videblaj en via profilo
setting_noindex: Influas vian publikan profilon kaj mesaĝajn paĝojn
setting_show_application: La aplikaĵo, kiun vi uzas por afiŝi, estos montrita en la detala vido de viaj mesaĝoj
- setting_theme: Influas kiel Mastodon aspektas post ensaluto de ajna aparato.
username: Via uzantnomo estos unika ĉe %{domain}
whole_word: Kiam la vorto aŭ frazo estas nur litera aŭ cifera, ĝi estos uzata nur se ĝi kongruas kun la tuta vorto
featured_tag:
name: 'Vi povus uzi iun el la jenaj:'
imports:
data: CSV-dosiero el alia Mastodon-servilo
+ invite_request:
+ text: Ĉi tio helpos nin revizii vian kandidatiĝon
sessions:
otp: 'Enmetu la kodon de dufaktora aŭtentigo el via telefono aŭ uzu unu el viaj realiraj kodoj:'
user:
@@ -88,6 +89,7 @@ eo:
otp_attempt: Kodo de dufaktora aŭtentigo
password: Pasvorto
phrase: Vorto aŭ frazo
+ setting_advanced_layout: Ebligi altnivelan retpaĝan interfacon
setting_aggregate_reblogs: Grupigi diskonigojn en tempolinioj
setting_auto_play_gif: Aŭtomate ekigi GIF-ojn
setting_boost_modal: Montri fenestron por konfirmi antaŭ ol diskonigi
@@ -118,15 +120,19 @@ eo:
must_be_follower: Bloki sciigojn de nesekvantoj
must_be_following: Bloki sciigojn de homoj, kiujn vi ne sekvas
must_be_following_dm: Bloki rektajn mesaĝojn de homoj, kiujn vi ne sekvas
+ invite_request:
+ text: Kial vi volas aliĝi?
notification_emails:
digest: Sendi resumajn retmesaĝojn
favourite: Sendi retmesaĝon kiam iu stelumas vian mesaĝon
follow: Sendi retmesaĝon kiam iu sekvas vin
follow_request: Sendi retmesaĝon kiam iu petas sekvi vin
mention: Sendi retmesaĝon kiam iu mencias vin
+ pending_account: Sendi retmesaĝon kiam nova konto bezonas kontrolon
reblog: Sendi retmesaĝon kiam iu diskonigas vian mesaĝon
report: Sendi retmesaĝon kiam nova signalo estas sendita
'no': Ne
+ recommended: Rekomendita
required:
mark: "*"
text: bezonata
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index c0d72dc27..7b871e8ba 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -2,27 +2,34 @@
es:
simple_form:
hints:
+ account_warning_preset:
+ text: Puede usar sintaxis de toots, como URLs, hashtags y menciones
+ admin_account_action:
+ send_email_notification: El usuario recibirá una explicación de lo que sucedió con respecto a su cuenta
defaults:
autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
context: Uno o múltiples contextos en los que debe aplicarse el filtro
digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
+ email: Se le enviará un correo de confirmación
fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
inbox_url: Copia la URL de la página principal del relés que quieres utilizar
irreversible: Los toots filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
locale: El idioma de la interfaz de usuario, correos y notificaciones push
locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores
+ password: Utilice al menos 8 caracteres
phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de un toot
scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
- setting_default_language: El idioma de tus toots podrá detectarse automáticamente, pero no siempre es preciso
setting_hide_network: A quién sigues y quién te sigue no será mostrado en tu perfil
setting_noindex: Afecta a tu perfil público y páginas de estado
- setting_theme: Afecta al aspecto de Mastodon cuando te identificas desde cualquier dispositivo.
+ setting_show_application: La aplicación que utiliza usted para publicar toots se mostrará en la vista detallada de sus toots
whole_word: Cuando la palabra clave o frase es solo alfanumérica, solo será aplicado si concuerda con toda la palabra
imports:
data: Archivo CSV exportado desde otra instancia de Mastodon
+ invite_request:
+ text: Esto nos ayudará a revisar su aplicación
sessions:
otp: 'Introduce el código de autenticación de dos factores geberado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
user:
@@ -32,9 +39,15 @@ es:
fields:
name: Etiqueta
value: Contenido
+ admin_account_action:
+ send_email_notification: Notificar al usuario por correo electrónico
+ text: Aviso personalizado
+ type: Acción
+ types:
+ disable: Deshabilitar
+ silence: Silenciar
defaults:
autofollow: Invitar a seguir tu cuenta
- avatar: Avatar
bot: Esta es una cuenta bot
chosen_languages: Filtrar idiomas
confirm_new_password: Confirmar nueva contraseña
@@ -66,6 +79,7 @@ es:
setting_hide_network: Ocultar tu red
setting_noindex: Excluirse del indexado de motores de búsqueda
setting_reduce_motion: Reducir el movimiento de las animaciones
+ setting_show_application: Mostrar aplicación usada para publicar toots
setting_system_font_ui: Utilizar la tipografía por defecto del sistema
setting_theme: Tema del sitio
setting_unfollow_modal: Mostrar diálogo de confirmación antes de dejar de seguir a alguien
@@ -78,16 +92,19 @@ es:
must_be_follower: Bloquear notificaciones de personas que no te siguen
must_be_following: Bloquear notificaciones de personas que no sigues
must_be_following_dm: Bloquear mensajes directos de la gente que no sigues
+ invite_request:
+ text: "¿Por qué quiere unirse usted?"
notification_emails:
digest: Enviar resumen de correos electrónicos
favourite: Enviar correo electrónico cuando alguien de a favorito en su publicación
follow: Enviar correo electrónico cuando alguien te siga
follow_request: Enviar correo electrónico cuando alguien solicita seguirte
mention: Enviar correo electrónico cuando alguien te mencione
+ pending_account: Enviar correo electrónico cuando una nueva cuenta necesita revisión
reblog: Enviar correo electrónico cuando alguien comparta su publicación
report: Enviar un correo cuando se envía un nuevo informe
'no': 'No'
+ recommended: Recomendado
required:
- mark: "*"
text: necesario
'yes': Sí
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index f4fadb29d..acd5fd6d9 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -27,20 +27,21 @@ eu:
phrase: Bat egingo du Maiuskula/minuskula kontuan hartu gabe eta edukiaren abisua kontuan hartu gabe
scopes: Zeintzuk API atzitu ditzakeen aplikazioak. Goi mailako arloa aukeratzen baduzu, ez dituzu azpikoak aukeratu behar.
setting_aggregate_reblogs: Ez erakutsi buktzada berriak berriki bultzada jaso duten tootentzat (berriki jasotako bultzadei eragiten die besterik ez)
- setting_default_language: Zure Toot-en hizkuntza automatikoki antzeman daiteke, baina ez da beti zehatza
+ setting_default_sensitive: Multimedia hunkigarria lehenetsita ezkutatzen da, eta sakatuz ikusi daiteke
setting_display_media_default: Ezkutatu hunkigarri gisa markatutako multimedia
setting_display_media_hide_all: Ezkutatu multimedia guztia beti
setting_display_media_show_all: Erakutsi beti hunkigarri gisa markatutako multimedia
setting_hide_network: Nor jarraitzen duzun eta nork jarraitzen zaituen ez da bistaratuko zure profilean
setting_noindex: Zure profil publiko eta Toot-en orrietan eragina du
setting_show_application: Tootak bidaltzeko erabiltzen duzun aplikazioa zure tooten ikuspegi xehetsuan bistaratuko da
- setting_theme: Edozein gailutik konektatzean Mastodon-en itxuran eragiten du.
username: Zure erabiltzaile-izena bakana izango da %{domain} domeinuan
whole_word: Hitz eta esaldi gakoa alfanumerikoa denean, hitz osoarekin bat datorrenean besterik ez da aplikatuko
featured_tag:
name: 'Hauetakoren bat erabili zenezake:'
imports:
data: Beste Mastodon zerbitzari batetik esportatutako CSV fitxategia
+ invite_request:
+ text: Honek zure eskaera berrikustean lagunduko digu
sessions:
otp: 'Sartu zure telefonoko aplikazioak sortutako bi faktoreetako kodea, edo erabili zure berreskuratze kodeetako bat:'
user:
@@ -88,6 +89,7 @@ eu:
otp_attempt: Bi faktoreetako kodea
password: Pasahitza
phrase: Hitz edo esaldi gakoa
+ setting_advanced_layout: Gaitu web interfaze aurreratua
setting_aggregate_reblogs: Taldekatu bultzadak denbora-lerroetan
setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki
setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik
@@ -118,15 +120,19 @@ eu:
must_be_follower: Blokeatu jarraitzaile ez direnen jakinarazpenak
must_be_following: Blokeatu zuk jarraitzen ez dituzunen jakinarazpenak
must_be_following_dm: Blokeatu zuk jarraitzen ez dituzunen mezu zuzenak
+ invite_request:
+ text: Zergatik elkartu nahi duzu?
notification_emails:
digest: Bidali laburpenak e-mail bidez
favourite: Bidali e-mail bat norbaitek zure mezua gogoko duenean
follow: Bidali e-mail bat norbaitek jarraitzen zaituenean
follow_request: Bidali e-mail bat norbaitek zu jarraitzea eskatzen duenean
mention: Bidali e-mail bat norbaitek zu aipatzean
+ pending_account: Bidali e-mail bat kontu bat berrikusi behar denean
reblog: Bidali e-mail bat norbaitek zure mezuari bultzada ematen badio
report: Bidali e-maila txosten berri bat aurkezten denean
'no': Ez
+ recommended: Aholkatua
required:
mark: "*"
text: beharrezkoa
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index b7ba444aa..7d2dbd8a9 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -27,20 +27,21 @@ fa:
phrase: مستقل از کوچکی و بزرگی حروف، با متن اصلی یا هشدار محتوای بوقها مقایسه میشود
scopes: واسطهای برنامهنویسی که این برنامه به آن دسترسی دارد. اگر بالاترین سطح دسترسی را انتخاب کنید، دیگر نیازی به انتخاب سطحهای پایینی ندارید.
setting_aggregate_reblogs: برای بازبوقهایی که به تازگی برایتان نمایش داده شدهاند، بازبوقهای بیشتر را نشان نده (فقط روی بازبوقهای اخیر تأثیر میگذارد)
- setting_default_language: زبان نوشتههای شما به طور خودکار تشخیص داده میشود، ولی این تشخیص همیشه دقیق نیست
+ setting_default_sensitive: تصاویر حساس به طور پیشفرض پنهان هستند و میتوانند با یک کلیک آشکار شوند
setting_display_media_default: تصویرهایی را که به عنوان حساس علامت زده شدهاند پنهان کن
setting_display_media_hide_all: همیشه همهٔ عکسها و ویدیوها را پنهان کن
setting_display_media_show_all: همیشه تصویرهایی را که به عنوان حساس علامت زده شدهاند را نشان بده
setting_hide_network: فهرست پیگیران شما و فهرست کسانی که شما پی میگیرید روی نمایهٔ شما دیده نخواهد شد
setting_noindex: روی نمایهٔ عمومی و صفحهٔ نوشتههای شما تأثیر میگذارد
setting_show_application: برنامهای که به کمک آن بوق میزنید، در جزئیات بوق شما نمایش خواهد یافت
- setting_theme: ظاهر ماستدون را وقتی که از هر دستگاهی به آن وارد میشوید تعیین میکند.
username: نام کاربری شما روی %{domain} یکتا خواهد بود
whole_word: اگر کلیدواژه فقط دارای حروف و اعداد باشد، تنها وقتی پیدا میشود که با کل یک واژه در متن منطبق باشد، نه با بخشی از یک واژه
featured_tag:
name: 'شاید بخواهید چنین چیزهایی را به کار ببرید:'
imports:
data: پروندهٔ CSV که از سرور ماستدون دیگری برونسپاری شده
+ invite_request:
+ text: این برای بررسی درخواست شما به ما کمک خواهد کرد
sessions:
otp: 'کد تأیید دومرحلهای که اپ روی تلفن شما ساخته را وارد کنید یا یکی از کدهای بازیابی را به کار ببرید:'
user:
@@ -88,6 +89,7 @@ fa:
otp_attempt: کد ورود دومرحلهای
password: رمز
phrase: کلیدواژه یا عبارت
+ setting_advanced_layout: فعالسازی رابط کاربری پیشرفته
setting_aggregate_reblogs: بازبوقها را متحد کن
setting_auto_play_gif: پخش خودکار تصویرهای متحرک
setting_boost_modal: نمایش پیغام تأیید پیش از بازبوقیدن
@@ -118,15 +120,19 @@ fa:
must_be_follower: مسدودکردن اعلانهای همه به جز پیگیران
must_be_following: مسدودکردن اعلانهای کسانی که شما پی نمیگیرید
must_be_following_dm: مسدودکردن پیغامهای خصوصی کسانی که شما پی نمیگیرید
+ invite_request:
+ text: چرا میخواهید عضو شوید؟
notification_emails:
digest: خلاصهکردن چند اعلان در یک ایمیل
favourite: وقتی کسی نوشتهٔ شما را پسندید ایمیل بفرست
follow: وقتی کسی پیگیر شما شد ایمیل بفرست
follow_request: وقتی کسی درخواست پیگیری کرد ایمیل بفرست
mention: وقتی کسی از شما نام برد ایمیل بفرست
+ pending_account: وقتی حساب تازهای نیاز به بازبینی داشت ایمیل بفرست
reblog: وقتی کسی نوشتهٔ شما را بازبوقید ایمیل بفرست
report: وقتی گزارش تازهای فرستاده شد ایمیل بفرست
'no': خیر
+ recommended: توصیه میشود
required:
mark: "*"
text: ضروری
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 5fda10969..2bb56b40e 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -4,7 +4,6 @@ fi:
hints:
admin_account_action:
send_email_notification: Käyttäjä saa selityksen mitä tapahtui hänen tililleen
- type_html: Valitse mitä teet 1%{acct}2
defaults:
avatar: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
digest: Lähetetään vain pitkän poissaolon jälkeen ja vain, jos olet saanut suoria viestejä poissaolosi aikana
@@ -12,7 +11,6 @@ fi:
header: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
locked: Sinun täytyy hyväksyä seuraajat manuaalisesti
setting_noindex: Vaikuttaa julkiseen profiiliisi ja tilasivuihisi
- setting_theme: Vaikuttaa Mastodonin ulkoasuun millä tahansa laitteella kirjauduttaessa.
imports:
data: Toisesta Mastodon-instanssista tuotu CSV-tiedosto
sessions:
@@ -66,6 +64,5 @@ fi:
reblog: Lähetä sähköposti, kun joku buustaa julkaisusi
'no': Ei
required:
- mark: "*"
text: pakollinen tieto
'yes': Kyllä
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 0469ebe06..6b3aa9bfb 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -5,8 +5,8 @@ fr:
account_warning_preset:
text: Vous pouvez utiliser la syntaxe des pouets, comme les URLs, les hashtags et les mentions
admin_account_action:
- send_email_notification: L'utilisateur recevra une explication de ce qu'il s'est passé avec son compte
- text_html: Optionnel. Vous pouvez utilisez la syntaxe des pouets. Vous pouvez ajouter des présélections d'attention pour économiser du temps
+ send_email_notification: L’utilisateur recevra une explication de ce qu’il s’est passé avec son compte
+ text_html: Optionnel. Vous pouvez utilisez la syntaxe des pouets. Vous pouvez ajouter des présélections d’attention pour économiser du temps
type_html: Choisir que faire avec %{acct}
warning_preset_id: Optionnel. Vous pouvez toujours ajouter un texte personnalisé à la fin de la présélection
defaults:
@@ -15,7 +15,7 @@ fr:
bot: Ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
context: Un ou plusieurs contextes où le filtre devrait s’appliquer
digest: Uniquement envoyé après une longue période d’inactivité et uniquement si vous avez reçu des messages personnels pendant votre absence
- discoverable_html: L'annuaire permet aux gens de trouver des comptes en se basant sur les intérêts et les activités. Nécessite au moins %{min_followers} abonnés
+ discoverable_html: L’annuaire permet aux gens de trouver des comptes en se basant sur les intérêts et les activités. Nécessite au moins %{min_followers} abonnés
email: Vous recevrez un courriel de confirmation
fields: Vous pouvez avoir jusqu’à 4 éléments affichés en tant que tableau sur votre profil
header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
@@ -26,21 +26,22 @@ fr:
password: Utilisez au moins 8 caractères
phrase: Sera trouvé sans que la case ou l’avertissement de contenu du pouet soit pris en compte
scopes: À quelles APIs l’application sera autorisée à accéder. Si vous sélectionnez un périmètre de haut-niveau, vous n’avez pas besoin de sélectionner les individuels.
- setting_aggregate_reblogs: Ne pas afficher de nouveaux repartagés pour les pouets qui ont été récemment repartagés (n'affecte que les repartagés nouvellement reçus)
- setting_default_language: La langue de vos pouets peut être détectée automatiquement, mais ça n’est pas toujours pertinent
- setting_display_media_default: Masquer les supports marqués comme sensibles
+ setting_aggregate_reblogs: Ne pas afficher de nouveaux repartagés pour les pouets qui ont été récemment repartagés (n’affecte que les repartagés nouvellement reçus)
+ setting_default_sensitive: Les médias sensibles sont cachés par défaut et peuvent être révélés d’un simple clic
+ setting_display_media_default: Masquer les médias marqués comme sensibles
setting_display_media_hide_all: Toujours masquer tous les médias
setting_display_media_show_all: Toujours afficher les médias marqués comme sensibles
setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
setting_noindex: Affecte votre profil public ainsi que vos statuts
- setting_show_application: Le nom de l'application que vous utilisez afin d'envoyer des pouets sera affiché dans la vue détaillée de ceux-ci
- setting_theme: Affecte l’apparence de Mastodon quand vous êtes connecté·e depuis n’importe quel appareil.
+ setting_show_application: Le nom de l’application que vous utilisez afin d’envoyer des pouets sera affiché dans la vue détaillée de ceux-ci
username: Votre nom d’utilisateur sera unique sur %{domain}
whole_word: Lorsque le mot-clef ou la phrase-clef est uniquement alphanumérique, ça sera uniquement appliqué s’il correspond au mot entier
featured_tag:
- name: 'Vous pourriez utiliser l''un d''entre eux :'
+ name: 'Vous pourriez vouloir utiliser l’un d’entre eux :'
imports:
data: Un fichier CSV généré par un autre serveur de Mastodon
+ invite_request:
+ text: Cela nous aidera à considérer votre demande
sessions:
otp: 'Entrez le code d’authentification à deux facteurs généré par l’application de votre téléphone ou utilisez un de vos codes de récupération :'
user:
@@ -53,15 +54,15 @@ fr:
account_warning_preset:
text: Texte de présélection
admin_account_action:
- send_email_notification: Notifier l'utilisateur par courriel
+ send_email_notification: Notifier l’utilisateur par courriel
text: Attention personnalisée
type: Action
types:
disable: Désactiver
none: Ne rien faire
- silence: Silence
+ silence: Masquer
suspend: Suspendre et effacer les données du compte de manière irréversible
- warning_preset_id: Utiliser un modèle d'avertissement
+ warning_preset_id: Utiliser un modèle d’avertissement
defaults:
autofollow: Invitation à suivre votre compte
avatar: Image de profil
@@ -72,7 +73,7 @@ fr:
context: Contextes du filtre
current_password: Mot de passe actuel
data: Données
- discoverable: Inscrire ce compte dans l'annuaire
+ discoverable: Inscrire ce compte dans l’annuaire
display_name: Nom public
email: Adresse courriel
expires_in: Expire après
@@ -88,6 +89,7 @@ fr:
otp_attempt: Code d’identification à deux facteurs
password: Mot de passe
phrase: Mot-clé ou phrase
+ setting_advanced_layout: Activer l’interface Web avancée
setting_aggregate_reblogs: Repartagés en groupe dans la ligne de temps
setting_auto_play_gif: Lire automatiquement les GIFs animés
setting_boost_modal: Afficher une fenêtre de confirmation avant de partager
@@ -103,7 +105,7 @@ fr:
setting_hide_network: Cacher votre réseau
setting_noindex: Demander aux moteurs de recherche de ne pas indexer vos informations personnelles
setting_reduce_motion: Réduire la vitesse des animations
- setting_show_application: Dévoiler le nom de l'application utilisée pour envoyer des pouets
+ setting_show_application: Dévoiler le nom de l’application utilisée pour envoyer des pouets
setting_system_font_ui: Utiliser la police par défaut du système
setting_theme: Thème du site
setting_unfollow_modal: Afficher une fenêtre de confirmation avant de vous désabonner d’un compte
@@ -118,15 +120,19 @@ fr:
must_be_follower: Masquer les notifications des personnes qui ne vous suivent pas
must_be_following: Masquer les notifications des personnes que vous ne suivez pas
must_be_following_dm: Bloquer les messages directs des personnes que vous ne suivez pas
+ invite_request:
+ text: Pourquoi voulez-vous vous inscrire ?
notification_emails:
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
mention: Envoyer un courriel lorsque quelqu’un me mentionne
+ pending_account: Envoyer un courriel lorsqu’un nouveau compte est en attente d’approbation
reblog: Envoyer un courriel lorsque quelqu’un partage mes statuts
report: Envoyer un courriel lorsqu’un nouveau rapport est soumis
'no': Non
+ recommended: Recommandé
required:
mark: "*"
text: Champs requis
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 434b8caff..22389051f 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -27,20 +27,21 @@ gl:
phrase: Concordará independentemente das maiúsculas ou avisos de contido no toot
scopes: A que APIs terá acceso a aplicación. Si selecciona un ámbito de alto nivel, non precisa seleccionar elementos individuais.
setting_aggregate_reblogs: Non mostrar novas promocións de toots que foron promocionados recentemente (só afecta a promocións recén recibidas)
- setting_default_language: Pódese detectar automáticamente o idioma dos seus toots, mais non sempre é preciso
+ setting_default_sensitive: Medios sensibles marcados como ocultos por defecto e móstranse cun click
setting_display_media_default: Ocultar medios marcados como sensibles
setting_display_media_hide_all: Ocultar sempre os medios
setting_display_media_show_all: Mostrar sempre os medios marcados como sensibles
setting_hide_network: Non se mostrará no seu perfil quen a segue e quen a está a seguir
setting_noindex: Afecta ao seu perfil público e páxinas de estado
setting_show_application: A aplicación que está a utilizar para enviar toots mostrarase na vista detallada do toot
- setting_theme: Afecta ao aspecto de Mastodon en calquer dispositivo cando está conectada.
username: O seu nome de usuaria será único en %{domain}
whole_word: Se a chave ou frase de paso é só alfanumérica, só se aplicará se concorda a palabra completa
featured_tag:
name: 'Podería utilizar algunha de estas:'
imports:
data: Ficheiro CSV exportado desde outro servidor Mastodon
+ invite_request:
+ text: Esto axudaranos a revisar a súa aplicación
sessions:
otp: 'Introduza o código de doble-factor xerado no aplicativo do seu móbil ou utilice un dos seus códigos de recuperación:'
user:
@@ -88,6 +89,7 @@ gl:
otp_attempt: Código de Doble-Factor
password: Contrasinal
phrase: Palabra chave ou frase
+ setting_advanced_layout: Activar interface web avanzada
setting_aggregate_reblogs: Agrupar promocións nas liñas temporais
setting_auto_play_gif: Reprodución automática de GIFs animados
setting_boost_modal: Pedir confirmación antes de promocionar
@@ -118,15 +120,19 @@ gl:
must_be_follower: Bloquear as notificacións de non-seguidoras
must_be_following: Bloquea as notificacións de personas que non segue
must_be_following_dm: Bloquea as mensaxes directas de personas que non segue
+ invite_request:
+ text: Por que quere unirse?
notification_emails:
digest: Enviar correos con resumos
favourite: Enviar un correo cando alguén marca como favorita unha das súas publicacións
follow: Enviar un correo cando alguén a segue
follow_request: Enviar un correo cando alguén solicita seguila
mention: Enviar un correo cando alguén a menciona
+ pending_account: Enviar correo-e cando unha nova conta precisa revisión
reblog: Enviar un correo cando alguén promociona a súa mensaxe
report: Enviar un correo cando se envíe un novo informe
'no': Non
+ recommended: Recomendado
required:
mark: "*"
text: requerido
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index c86498c66..36d7cbf67 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -8,7 +8,6 @@ he:
header: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן %{dimensions}px
locked: מחייב אישור עוקבים באופן ידני. פרטיות ההודעות תהיה עוקבים-בלבד אלא אם יצוין אחרת
setting_noindex: משפיע על הפרופיל הציבורי שלך ועמודי ההודעות
- setting_theme: משפיע על המראה של מסטודון בעת החיבור המזוהה מכל מכשיר שהוא.
imports:
data: קובץ CSV שיוצא משרת מסטודון אחר
sessions:
@@ -57,6 +56,5 @@ he:
reblog: שליחת דוא"ל כשמהדהדים חצרוץ שלך
'no': לא
required:
- mark: "*"
text: שדה חובה
'yes': כן
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index 4b1d2b1e0..083343307 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -10,18 +10,15 @@ hr:
data: CSV fajl izvezen iz druge Mastodon instance
labels:
defaults:
- avatar: Avatar
confirm_new_password: Potvrdi novu lozinku
confirm_password: Potvrdi lozinku
current_password: Trenutna lozinka
data: Podaci
display_name: Ime koje ću prikazati
email: E-mail adresa
- header: Header
locale: Jezik
locked: Učini račun privatnim
new_password: Nova lozinka
- note: Bio
otp_attempt: Dvo-faktorski kod
password: Lozinka
setting_auto_play_gif: Automatski pokreni animirane GIFove
@@ -40,6 +37,5 @@ hr:
reblog: Pošalji mi e-mail kad netko rebloga moj status
'no': Ne
required:
- mark: "*"
text: traženo
'yes': Da
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index f36fabda1..7e5e4e79d 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -2,60 +2,137 @@
hu:
simple_form:
hints:
+ account_warning_preset:
+ text: Használhatod a tülkökben szokásos szintaxist, URL-eket, hashtageket, megemlítéseket
+ admin_account_action:
+ send_email_notification: A felhasználó magyarázatot kap arra, mi történt a fiókjával
+ text_html: Opcionális. A tülk szintaxis használható. Egyszerűsítés végett létre is hozhatsz figyelmeztetéseket
+ type_html: Megmondhatod, mi legyen vele %{acct}
+ warning_preset_id: Opcionális. A figyelmeztetés végére saját szöveget is írhatsz
defaults:
- avatar: PNG, GIF vagy JPG. Maximum %{size}. Át lesz méretezve %{dimensions} pixelre
- digest: Csak hosszú távollét esetén küldve és csak ha személyes üzenetet kaptál távollétedben
- header: PNG, GIF vagy JPG. Maximum %{size}. Át lesz méretezve %{dimensions} pixelre
+ autofollow: Akik meghívón keresztül regisztrálnak, automatikusan követni fognak téged
+ avatar: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
+ bot: Ez a fiók automatikus műveleteket végez és valószínűleg nem figyeljük
+ context: Kontextusok, ahol a szűrőnek működnie kell
+ digest: Csak hosszú távollét esetén küldődik és csak ha személyes üzenetet kaptál távollétedben
+ discoverable_html: A profilok adatbázisa lehetővé teszi, hogy embereket közös érdeklődés vagy tevékenység alapján találj meg. Legalább %{min_followers} követőre van szükség az adatbázisba való bekerüléshez
+ email: Kapsz egy megerősítő e-mailt
+ fields: A profilodon legfeljebb 4 bejegyzés szerepelhet táblázatos formában
+ header: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
+ inbox_url: Másold ki a használandó relé szerver kezdőoldalának URL-jét
+ irreversible: A kiszűrt tülkök visszafordíthatatlanul eltűnnek, a szűrő későbbi törlése esetén is
+ locale: A felhasználói felület, e-mailek, push üzenetek nyelve
locked: Egyenként engedélyezned kell a követőidet
- setting_noindex: A publikus profilodra és státusz oldalra vonatkozik
- setting_theme: A bármely eszközről bejelentkezett felület kinézetére vonatkozik.
+ password: Legalább 8 karakter
+ phrase: Illeszkedni fog kis/nagybetű függetlenül, és tartalom-figyelmeztetések mögött is
+ scopes: Mely API-kat érheti el az alkalmazás. Ha felső szintű hatáskört választasz, nem kell egyesével kiválasztanod az alatta lévőeket.
+ setting_aggregate_reblogs: Ne mutassunk megtolásokat olyan tülkökhöz, melyeket nemrég toltak meg (csak új megtolásokra lép életbe)
+ setting_default_sensitive: A szenzitív médiát alapesetben elrejtjük, de egyetlen kattintással előhozható
+ setting_display_media_default: Szenzitív tartalomként jelölt média elrejtése
+ setting_display_media_hide_all: Mindig minden média elrejtése
+ setting_display_media_show_all: Mindig mutasd a szenzitív tartalomként jelölt médiát
+ setting_hide_network: Nem látszik majd a profilodon, kik követnek és te kiket követsz
+ setting_noindex: A nyilvános profilodra és a tülkjeidre vonatkozik
+ setting_show_application: A tülkök részletes nézetében látszani fog, milyen alkalmazást használtál a tülköléshez
+ username: A felhasználói neved egyedi lesz a %{domain} domainen
+ whole_word: Ha a kulcsszó alfanumerikus, csak akkor minősül majd találatnak, ha teljes szóra illeszkedik
+ featured_tag:
+ name: 'Ezeket esetleg használhatod:'
imports:
data: Egy másik Mastodon szerverről exportált CSV fájl
+ invite_request:
+ text: Ez segít nekünk átnézni a jelentkezésedet
sessions:
- otp: Add meg a Második-faktor kódodat a telefonodról vagy használd az egyik tartalék bejelentkező kódodat.
+ otp: 'Add meg a telefonodon generált kétlépcsős azonosító kódodat vagy használd az egyik tartalék bejelentkező kódot:'
+ user:
+ chosen_languages: Ha aktív, csak a kiválasztott nyelvű tülkök jelennek majd meg a nyilvános idővonalon
labels:
+ account:
+ fields:
+ name: Címke
+ value: Tartalom
+ account_warning_preset:
+ text: Figyelmeztető szöveg
+ admin_account_action:
+ send_email_notification: Figyelmeztessük a felhasználót e-mailben
+ text: Egyedi figyelmeztetés
+ type: Művelet
+ types:
+ disable: Letiltás
+ none: Ne csinálj semmit
+ silence: Elnémítás
+ suspend: Fiók felfüggesztése, adatok törlése visszaállíthatatlanul
+ warning_preset_id: Figyelmeztetés használata
defaults:
+ autofollow: Meghívás a fiókod követésére
avatar: Profilkép
+ bot: Ez a fiók egy bot
+ chosen_languages: Nyelvek szűrése
confirm_new_password: Új jelszó megerősítése
confirm_password: Jelszó megerősítése
+ context: Szűrés kontextusai
current_password: Jelenlegi jelszó
data: Adatok
+ discoverable: Fiók listázása a profilok adatbázisában
display_name: Megjelenített név
email: E-mail cím
expires_in: Elévül
+ fields: Profil metaadatok
header: Fejléc
- locale: Nyelv
- locked: Zárt felhasználói fiók
- max_uses: Felhasználhatóság
+ inbox_url: Relé inbox-hoz tartozó URL
+ irreversible: Eldobás elrejtés helyett
+ locale: Felhasználói felület nyelve
+ locked: Felhasználói fiók lezárása
+ max_uses: Hányszor használható
new_password: Új jelszó
- note: Önéletrajz
- otp_attempt: Második-faktor kód
+ note: Bemutatkozás
+ otp_attempt: Kétlépcsős azonosító kód
password: Jelszó
+ phrase: Kulcsszó vagy kifejezés
+ setting_advanced_layout: Haladó webes felület engedélyezése
+ setting_aggregate_reblogs: Megtolások csoportosítása az idővonalakon
setting_auto_play_gif: GIF-ek automatikus lejátszása
- setting_boost_modal: Megerősítés kérése reblogolás előtt
- setting_default_privacy: Tülkök alapártelmezett adatvédelmi szintje
+ setting_boost_modal: Megerősítés kérése megtolás előtt
+ setting_default_language: Tülkölés nyelve
+ setting_default_privacy: Tülkök alapértelmezett láthatósága
setting_default_sensitive: Minden médiafájl megjelölése szenzitívként
setting_delete_modal: Megerősítés kérése tülk törlése előtt
+ setting_display_media: Média megjelenítése
+ setting_display_media_default: Alapértelmezés
+ setting_display_media_hide_all: Mindent elrejt
+ setting_display_media_show_all: Mindent mutat
+ setting_expand_spoilers: Tartalom figyelmeztetéssel ellátott tülkök automatikus kinyitása
+ setting_hide_network: Hálózatod elrejtése
setting_noindex: Megtiltom a keresőmotoroknak, hogy indexeljék a tülkjeimet
setting_reduce_motion: Animációk mozgásának csökkentése
+ setting_show_application: A tülkölésre használt alkalmazás feltüntetése
setting_system_font_ui: Rendszer betűtípusának használata
- setting_theme: Oldalsablon
+ setting_theme: Megjelenítési sablon
setting_unfollow_modal: Megerősítés kérése mielőtt abbahagyod valaki követését
severity: Súlyosság
type: Importálás típusa
username: Felhasználónév
+ username_or_email: Felhasználónév vagy E-mail
+ whole_word: Teljes szó
+ featured_tag:
+ name: Hashtag
interactions:
must_be_follower: Nem követőidtől érkező értesítések tiltása
must_be_following: Nem követettjeidtől érkező értesítések tiltása
must_be_following_dm: Nem követettjeidtől érkező üzenetek tiltása
+ invite_request:
+ text: Miért akarsz csatlakozni?
notification_emails:
digest: Összevont e-mailek küldése
- favourite: E-mail küldése amikor valaki kedvencnek jelöli az állapotod
- follow: E-mail küldése amikor valaki követni kezd téged
- follow_request: E-mail küldése amikor valaki követni szeretne téged
- mention: E-mail küldése amikor valaki megemlít téged
- reblog: E-mail küldése amikor valaki reblogolja az állapotod
+ favourite: E-mail küldése, amikor valaki kedvencnek jelöli a tülködet
+ follow: E-mail küldése, amikor valaki követni kezd téged
+ follow_request: E-mail küldése, amikor valaki követni szeretne téged
+ mention: E-mail küldése, amikor valaki megemlít téged
+ pending_account: E-mail küldése, ha új fiókot kell engedélyezni
+ reblog: E-mail küldése, amikor valaki megtolja a tülködet
+ report: E-mail küldése, ha új bejelentés érkezett
'no': Nem
+ recommended: Ajánlott
required:
mark: "*"
text: kötelező
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
new file mode 100644
index 000000000..c40654016
--- /dev/null
+++ b/config/locales/simple_form.hy.yml
@@ -0,0 +1 @@
+hy:
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index c6da2beff..ba9fbb4e8 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -12,18 +12,14 @@ id:
otp: Masukkan kode dua-faktor dari handphone atau gunakan kode pemulihan anda.
labels:
defaults:
- avatar: Avatar
confirm_new_password: Konfirmasi kata sandi baru
confirm_password: Konfirmasi kata sandi
current_password: Kata sandi sekarang
- data: Data
display_name: Nama yang ditampilkan
email: Alamat e-mail
- header: Header
locale: Bahasa
locked: Buat akun menjadi pribadi
new_password: Password baru
- note: Bio
otp_attempt: Kode dua-faktor
password: Kata sandi
setting_boost_modal: Tampilkan dialog konfirmasi dialog sebelum boost
@@ -43,6 +39,5 @@ id:
reblog: Kirim email saat seseorang mem-boost status anda
'no': Tidak
required:
- mark: "*"
text: wajib
'yes': Ya
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index c9fd9899e..4d640fd9a 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -26,10 +26,7 @@ io:
note: Suprizento
otp_attempt: Dufaktora identigilo
password: Pasvorto
- setting_auto_play_gif: Auto-play animated GIFs
- setting_boost_modal: Show confirmation dialog before boosting
setting_default_privacy: Videbleso di la mesaji
- severity: Severity
type: Tipo di importaco
username: Uzernomo
interactions:
@@ -42,8 +39,5 @@ io:
follow_request: Sendar retpost-mesajo, kande ulu diskonocigas mesajo da tu
mention: Sendar retpost-mesajo, kande ulu mencionas tu
reblog: Sendar retpost-mesajo, kande ulu diskonocigas mesajo da tu
- 'no': 'No'
required:
- mark: "*"
text: bezonata
- 'yes': 'Yes'
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 9061844fe..377a55293 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -27,20 +27,21 @@ it:
phrase: Il confronto sarà eseguito ignorando minuscole/maiuscole e i content warning
scopes: A quali API l'applicazione potrà avere accesso. Se selezionate un ambito di alto livello, non c'è bisogno di selezionare quelle singole.
setting_aggregate_reblogs: Non mostrare nuove condivisioni per toot che sono stati condivisi di recente (ha effetto solo sulle nuove condivisioni)
- setting_default_language: La lingua dei tuoi toot può essere individuata automaticamente, ma il risultato non è sempre accurato
+ setting_default_sensitive: Media con contenuti sensibili sono nascosti in modo predefinito e possono essere rivelati con un click
setting_display_media_default: Nascondi media segnati come sensibili
setting_display_media_hide_all: Nascondi sempre tutti i media
setting_display_media_show_all: Nascondi sempre i media segnati come sensibili
setting_hide_network: Chi segui e chi segue te non saranno mostrati sul tuo profilo
setting_noindex: Ha effetto sul tuo profilo pubblico e sulle pagine degli status
setting_show_application: L'applicazione che usi per pubblicare i toot sarà mostrata nella vista di dettaglio dei tuoi toot
- setting_theme: Ha effetto sul modo in cui Mastodon verrà visualizzato quando sarai collegato da qualsiasi dispositivo.
username: Il tuo nome utente sarà unico su %{domain}
whole_word: Quando la parola chiave o la frase è solo alfanumerica, si applica solo se corrisponde alla parola intera
featured_tag:
name: 'Eccone alcuni che potresti usare:'
imports:
data: File CSV esportato da un altro server Mastodon
+ invite_request:
+ text: Questo ci aiuterà ad esaminare la tua richiesta
sessions:
otp: 'Inserisci il codice a due fattori generato dall''app del tuo telefono o usa uno dei codici di recupero:'
user:
@@ -64,7 +65,7 @@ it:
warning_preset_id: Usa un avviso preimpostato
defaults:
autofollow: Invita a seguire il tuo account
- avatar: Avatar
+ avatar: Immagine di profilo
bot: Questo account è un bot
chosen_languages: Filtra lingue
confirm_new_password: Conferma nuova password
@@ -88,6 +89,7 @@ it:
otp_attempt: Codice due-fattori
password: Password
phrase: Parola chiave o frase
+ setting_advanced_layout: Abilita interfaccia web avanzata
setting_aggregate_reblogs: Raggruppa condivisioni in timeline
setting_auto_play_gif: Play automatico GIF animate
setting_boost_modal: Mostra dialogo di conferma prima del boost
@@ -113,20 +115,24 @@ it:
username_or_email: Nome utente o email
whole_word: Parola intera
featured_tag:
- name: Hashtag
+ name: Etichetta
interactions:
must_be_follower: Blocca notifiche da chi non ti segue
must_be_following: Blocca notifiche dalle persone che non segui
must_be_following_dm: Blocca i messaggi diretti dalle persone che non segui
+ invite_request:
+ text: Perchè vuoi unirti?
notification_emails:
digest: Invia email riassuntive
favourite: Invia email quando segna come preferito al tuo stato
follow: Invia email quando qualcuno ti segue
follow_request: Invia email quando qualcuno richiede di seguirti
mention: Invia email quando qualcuno ti menziona
+ pending_account: Invia e-mail quando un nuovo account richiede l'approvazione
reblog: Invia email quando qualcuno da un boost al tuo stato
report: Manda una mail quando viene inviato un nuovo rapporto
'no': 'No'
+ recommended: Consigliato
required:
mark: "*"
text: richiesto
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 05933e016..ccc6c5ca1 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -27,14 +27,13 @@ ja:
phrase: トゥートの大文字小文字や閲覧注意に関係なく一致
scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
setting_aggregate_reblogs: 最近ブーストされたトゥートが新たにブーストされても表示しません (設定後受信したものにのみ影響)
- setting_default_language: トゥートの言語は自動的に検出されますが、必ずしも正確とは限りません
+ setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
setting_display_media_hide_all: 全てのメディアを常に隠す
setting_display_media_show_all: 閲覧注意としてマークされたメディアも常に表示する
setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
setting_noindex: 公開プロフィールおよび各投稿ページに影響します
setting_show_application: トゥートするのに使用したアプリがトゥートの詳細ビューに表示されるようになります
- setting_theme: ログインしている全てのデバイスで適用されるデザインです。
username: あなたのユーザー名は %{domain} の中で重複していない必要があります
whole_word: キーワードまたはフレーズが英数字のみの場合、単語全体と一致する場合のみ適用されるようになります
featured_tag:
@@ -90,6 +89,7 @@ ja:
otp_attempt: 二段階認証コード
password: パスワード
phrase: キーワードまたはフレーズ
+ setting_advanced_layout: 上級者向け UI を有効にする
setting_aggregate_reblogs: ブーストをまとめる
setting_auto_play_gif: アニメーションGIFを自動再生する
setting_boost_modal: ブーストする前に確認ダイアログを表示する
@@ -105,7 +105,7 @@ ja:
setting_hide_network: 繋がりを隠す
setting_noindex: 検索エンジンによるインデックスを拒否する
setting_reduce_motion: アニメーションの動きを減らす
- setting_show_application: トゥートの送信に使用したアプリを開示する
+ setting_show_application: 送信したアプリを開示する
setting_system_font_ui: システムのデフォルトフォントを使う
setting_theme: サイトテーマ
setting_unfollow_modal: フォローを解除する前に確認ダイアログを表示する
@@ -132,6 +132,7 @@ ja:
reblog: トゥートがブーストされた時にメールで通知する
report: 通報を受けた時にメールで通知する
'no': いいえ
+ recommended: おすすめ
required:
mark: "*"
text: 必須
diff --git a/config/locales/simple_form.ka.yml b/config/locales/simple_form.ka.yml
index 6bccb3134..2df3db45b 100644
--- a/config/locales/simple_form.ka.yml
+++ b/config/locales/simple_form.ka.yml
@@ -16,10 +16,8 @@ ka:
locked: საჭიროებს თქვენ მიერ მიმდევრების ხელით დადასტურებას
phrase: დამთხვევა მოხდება დიდი და პატარა ასოების ან კონტენტის გაფრთხილების გათვალისწინების გარეშე
scopes: რომელი აპიებისადმი ექნება აპლიკაციას ცვდომა. თუ არიჩევთ უმთავრეს ფარგლებს, არ დაგჭირდებათ ინდივიდუალურების ამორჩევა.
- setting_default_language: თქვენი ტუტების ენა შეიძლება დადგინდეს ავტომატურად, მაგრამ ეს არაა ყოველთვის ზუსტი
setting_hide_network: ვის მიყვებით და ვინ მოგყვებათ არ გამოჩნდება აქ
setting_noindex: გავლენას ახდენს თქვენს ღია პროფილისა და სტატუსის გვერდებზე
- setting_theme: გავლენას ახდენს თუ როგორ გამოიყურება მასტოდონი, როდესაც შესული ხართ რომელიმე მოწყობილობიდან.
whole_word: როდესაც სიტყვა ან ფრაზა მხოლოდ ალფა-ნუმერიკულია, ის დაფიქსირდება თუ ემთხვევა სრულ სიტყვას
imports:
data: ცსვ ფაილის ექსპორტი მოხდა მასტოდონის სხვა ინსტანციიდან
@@ -87,6 +85,5 @@ ka:
reblog: გამოიგზავნოს წერილი როდესაც ვინმე გაზრდის თქვენს სტატუსს
'no': არა
required:
- mark: "*"
text: აუცილებელი
'yes': კი
diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml
index 0967ef424..1dcc9b127 100644
--- a/config/locales/simple_form.kk.yml
+++ b/config/locales/simple_form.kk.yml
@@ -1 +1 @@
-{}
+kk:
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 9c5fc413d..8147cde5d 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -27,14 +27,13 @@ ko:
phrase: 툿 내용이나 CW 내용 안에서 대소문자 구분 없이 매칭 됩니다
scopes: 애플리케이션에 허용할 API들입니다. 최상위 스코프를 선택하면 개별적인 것은 선택하지 않아도 됩니다.
setting_aggregate_reblogs: 내가 부스트 했던 툿은 새로 부스트 되어도 보여주지 않습니다
- setting_default_language: 작성한 툿의 언어는 자동으로 인식할 수 있지만, 언제나 정확한 건 아닙니다
+ setting_default_sensitive: 민감한 미디어는 기본적으로 가려져 있으며 클릭해서 볼 수 있습니다
setting_display_media_default: 민감함으로 설정 된 미디어 가리기
setting_display_media_hide_all: 항상 모든 미디어를 가리기
setting_display_media_show_all: 민감함으로 설정 된 미디어를 항상 보이기
setting_hide_network: 나를 팔로우 하는 사람들과 내가 팔로우 하는 사람들이 내 프로필에 표시되지 않게 합니다
setting_noindex: 공개 프로필 및 각 툿페이지에 영향을 미칩니다
setting_show_application: 당신이 툿을 작성하는데에 사용한 앱이 툿의 상세정보에 표시 됩니다
- setting_theme: 로그인중인 모든 디바이스에 적용되는 디자인입니다.
username: 당신의 유저네임은 %{domain} 안에서 유일해야 합니다
whole_word: 키워드가 영문과 숫자로만 이루어 진 경우, 단어 전체에 매칭 되었을 때에만 작동하게 합니다
featured_tag:
@@ -90,6 +89,7 @@ ko:
otp_attempt: 2단계 인증 코드
password: 암호
phrase: 키워드 또는 문장
+ setting_advanced_layout: 고급 웹 UI 활성화
setting_aggregate_reblogs: 타임라인의 부스트를 그룹화
setting_auto_play_gif: 애니메이션 GIF를 자동 재생
setting_boost_modal: 부스트 전 확인 창을 표시
@@ -132,7 +132,7 @@ ko:
reblog: 누군가 내 툿을 부스트 했을 때 이메일 보내기
report: 새 신고 등록시 이메일로 알리기
'no': 아니오
+ recommended: 추천함
required:
- mark: "*"
text: 필수 항목
'yes': 네
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
new file mode 100644
index 000000000..6c5cb837a
--- /dev/null
+++ b/config/locales/simple_form.lt.yml
@@ -0,0 +1 @@
+lt:
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
new file mode 100644
index 000000000..1be0eabc0
--- /dev/null
+++ b/config/locales/simple_form.lv.yml
@@ -0,0 +1 @@
+lv:
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
new file mode 100644
index 000000000..2925688a0
--- /dev/null
+++ b/config/locales/simple_form.ms.yml
@@ -0,0 +1 @@
+ms:
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 09bd4e856..58d29ce12 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -27,14 +27,13 @@ nl:
phrase: Komt overeen ongeacht hoofd-/kleine letters of tekstwaarschuwingen
scopes: Tot welke API's heeft de toepassing toegang. Wanneer je een toestemming van het bovenste niveau kiest, hoef je geen individuele toestemmingen meer te kiezen.
setting_aggregate_reblogs: Geen nieuwe boosts tonen voor toots die recentelijk nog zijn geboost (heeft alleen effect op nieuw ontvangen boosts)
- setting_default_language: De taal van jouw toots kan automatisch worden gedetecteerd, maar het is niet altijd accuraat
+ setting_default_sensitive: Gevoelige media wordt standaard verborgen en kan met één klik worden getoond
setting_display_media_default: Als gevoelig gemarkeerde media verbergen
setting_display_media_hide_all: Media altijd verbergen
setting_display_media_show_all: Als gevoelig gemarkeerde media altijd verbergen
setting_hide_network: Wie jij volgt en wie jou volgen wordt niet op jouw profiel getoond
setting_noindex: Heeft invloed op jouw openbare profiel en toots
setting_show_application: De toepassing de je gebruikt om te tooten wordt in de gedetailleerde weergave van de toot getoond
- setting_theme: Heeft invloed op hoe de webapp van Mastodon eruitziet (op elk apparaat waarmee je inlogt).
username: Jouw gebruikersnaam is uniek op %{domain}
whole_word: Wanneer het trefwoord of zinsdeel alfanumeriek is, wordt het alleen gefilterd wanneer het hele woord overeenkomt
featured_tag:
@@ -90,6 +89,7 @@ nl:
otp_attempt: Tweestaps-aanmeldcode
password: Wachtwoord
phrase: Trefwoord of zinsdeel
+ setting_advanced_layout: Geavanceerde webomgeving inschakelen
setting_aggregate_reblogs: Boosts in tijdlijnen groeperen
setting_auto_play_gif: Speel geanimeerde GIF's automatisch af
setting_boost_modal: Vraag voor het boosten van een toot een bevestiging
@@ -132,6 +132,7 @@ nl:
reblog: Een e-mail versturen wanneer iemand jouw toot heeft geboost
report: Verstuur een e-mail wanneer een nieuw rapportage is ingediend
'no': Nee
+ recommended: Aanbevolen
required:
mark: "*"
text: vereist
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index fc339c3f2..9393e37d1 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -8,18 +8,15 @@
header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
locked: Krever at du manuelt godkjenner følgere
setting_noindex: Påvirker din offentlige profil og statussider
- setting_theme: Påvirker hvordan Mastodon ser ut når du er logget inn fra uansett enhet.
imports:
data: CSV-fil eksportert fra en annen Mastodon-instans
sessions:
otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder.
labels:
defaults:
- avatar: Avatar
confirm_new_password: Bekreft nytt passord
confirm_password: Bekreft passord
current_password: Nåværende passord
- data: Data
display_name: Visningsnavn
email: E-postadresse
expires_in: Utløper etter
@@ -57,6 +54,5 @@
reblog: Send e-post når noen fremhever din status
'no': Nei
required:
- mark: "*"
text: obligatorisk
'yes': Ja
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 3efaa34df..e0bfcfef9 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -27,14 +27,12 @@ oc:
phrase: Serà pres en compte que siá en majuscula o minuscula o dins un avertiment de contengut sensible
scopes: A quinas APIs poiràn accedir las aplicacions. Se seleccionatz un encastre de naut nivèl, fa pas mestièr de seleccionar los nivèls mai basses.
setting_aggregate_reblogs: Mostrar pas los nòus partatges que son estats partejats recentament (afecta pas que los nòus partatges recebuts)
- setting_default_language: La lenga de vòstres tuts pòt èsser detectada automaticament, mas de còps es pas corrèctament determinada
setting_display_media_default: Rescondre los mèdias marcats coma sensibles
setting_display_media_hide_all: Totjorn rescondre los mèdias
setting_display_media_show_all: Totjorn mostrar los mèdias marcats coma sensibles
setting_hide_network: Vòstre perfil mostrarà pas los que vos sègon e lo monde que seguètz
setting_noindex: Aquò es destinat a vòstre perfil public e vòstra pagina d’estatuts
setting_show_application: Lo nom de l’aplicacion qu’utilizatz per publicar serà mostrat dins la vista detalhada de vòstres tuts
- setting_theme: Aquò càmbia lo tèma grafic de Mastodon quand sètz connectat qual que siasque lo periferic.
username: Vòstre nom d’utilizaire serà unic sus %{domain}
whole_word: Quand lo mot-clau o frasa es solament alfranumeric, serà pas qu’aplicat se correspond al mot complèt
featured_tag:
@@ -66,7 +64,6 @@ oc:
warning_preset_id: Utilizar un avertiment predefinit
defaults:
autofollow: Convidar a sègre vòstre compte
- avatar: Avatar
bot: Aquò es lo compte a un robòt
chosen_languages: Filtrar las lengas
confirm_new_password: Confirmacion del nòu senhal
@@ -86,7 +83,6 @@ oc:
locked: Far venir lo compte privat
max_uses: Limit d’utilizacions
new_password: Nòu senhal
- note: Bio
otp_attempt: Còdi Two-factor
password: Senhal
phrase: Senhal o frasa
@@ -133,6 +129,5 @@ oc:
report: Enviar un corrièl pels nòus senhalaments
'no': Non
required:
- mark: "*"
text: requesit
'yes': Òc
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index e1cbee91c..2f9bf5329 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -27,20 +27,21 @@ pl:
phrase: Zostanie wykryte nawet, gdy znajduje się za ostrzeżeniem o zawartości
scopes: Wybór API, do których aplikacja będzie miała dostęp. Jeżeli wybierzesz nadrzędny zakres, nie musisz wybierać jego elementów.
setting_aggregate_reblogs: Nie pokazuj nowych podbić dla wpisów, które zostały niedawno podbite (dotyczy tylko nowo otrzymanych podbić)
- setting_default_language: Język Twoich wpisów może być wykrywany automatycznie, ale nie zawsze jest to dokładne
+ setting_default_sensitive: Wrażliwe multimedia są domyślnie schowane i mogą być odkryte kliknięciem
setting_display_media_default: Ukrywaj zawartość oznaczoną jako wrażliwa
setting_display_media_hide_all: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
setting_display_media_show_all: Nie ukrywaj zawartości multimedialnej oznaczonej jako wrażliwa
setting_hide_network: Informacje o tym, kto Cię śledzi i kogo śledzisz nie będą widoczne
setting_noindex: Wpływa na widoczność strony profilu i Twoich wpisów
setting_show_application: W informacjach o wpisie będzie widoczna informacja o aplikacji, z której został wysłany
- setting_theme: Zmienia wygląd Mastodona po zalogowaniu z dowolnego urządzenia.
username: Twoja nazwa użytkownika będzie niepowtarzalna na %{domain}
whole_word: Jeśli słowo lub fraza składa się jedynie z liter lub cyfr, filtr będzie zastosowany tylko do pełnych wystąpień
featured_tag:
name: 'Sugerujemy użycie jednego z następujących:'
imports:
data: Plik CSV wyeksportowany z innego serwera Mastodona
+ invite_request:
+ text: To pomoże nam w recenzji Twojej aplikacji
sessions:
otp: 'Wprowadź kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodów zapasowych:'
user:
@@ -88,7 +89,7 @@ pl:
otp_attempt: Kod uwierzytelnienia dwustopniowego
password: Hasło
phrase: Słowo kluczowe lub fraza
- scopes: Do których API aplikacja będzie miała dostęp. Jeżeli wybierzesz zakres wyższego poziomu, nie musisz zaznaczać bardziej szczegółowych.
+ setting_advanced_layout: Włącz zaawansowany interfejs użytkownika
setting_aggregate_reblogs: Grupuj podbicia na osiach czasu
setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
@@ -114,20 +115,24 @@ pl:
username_or_email: Nazwa użytkownika lub adres e-mail
whole_word: Całe słowo
featured_tag:
- name: Hashtag
+ name: Hasztag
interactions:
must_be_follower: Nie wyświetlaj powiadomień od osób, które Cię nie śledzą
must_be_following: Nie wyświetlaj powiadomień od osób, których nie śledzisz
must_be_following_dm: Nie wyświetlaj wiadomości bezpośrednich od osób, których nie śledzisz
+ invite_request:
+ text: Czemu chcesz dołączyć?
notification_emails:
digest: Wysyłaj podsumowania e-mailem
favourite: Powiadamiaj mnie e-mailem, gdy ktoś polubi mój wpis
follow: Powiadamiaj mnie e-mailem, gdy ktoś zacznie mnie śledzić
follow_request: Powiadamiaj mnie e-mailem, gdy ktoś poprosi o pozwolenie na śledzenie mnie
mention: Powiadamiaj mnie e-mailem, gdy ktoś o mnie wspomni
+ pending_account: Wyślij e-mail kiedy nowe konto potrzebuje recenzji
reblog: Powiadamiaj mnie e-mailem, gdy ktoś podbije mój wpis
report: Powiadamiaj mnie e-mailem, gdy zostanie utworzone nowe zgłoszenie
'no': Nie
+ recommended: Polecane
required:
mark: "*"
text: pole wymagane
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 734bd21d0..10475e515 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -27,14 +27,12 @@ pt-BR:
phrase: Vai coincidir, independente de maiúsculas ou minúsculas, no texto ou no aviso de conteúdo de um toot
scopes: Quais APIs a aplicação vai ter permissão de acessar. Se você selecionar um escopo de alto nível, você não precisa selecionar individualmente os outros.
setting_aggregate_reblogs: Não mostrar novos compartilhamentos para toots que foram compartilhados recentemente (afeta somente novos compartilhamentos recebidos)
- setting_default_language: O idioma de seus toots pode ser detectado automaticamente, mas isso nem sempre é preciso
setting_display_media_default: Esconder mídia marcada como sensível
setting_display_media_hide_all: Sempre esconder todas as mídias
setting_display_media_show_all: Sempre mostrar mídia marcada como sensível
setting_hide_network: Quem você segue e quem segue você não serão exibidos no seu perfil
setting_noindex: Afeta seu perfil público e as páginas de suas postagens
setting_show_application: A aplicação que você usar para enviar seus toots vai aparecer na visão detalhada dos seus toots
- setting_theme: Afeta a aparência do Mastodon quando em sua conta em qualquer aparelho.
username: Seu nome de usuário será único em %{domain}
whole_word: Quando a palavra ou frase é inteiramente alfanumérica, ela será aplicada somente se corresponder a palavra inteira
featured_tag:
@@ -66,7 +64,6 @@ pt-BR:
warning_preset_id: Usar um aviso pré-definido
defaults:
autofollow: Convite para seguir a sua conta
- avatar: Avatar
bot: Esta é uma conta-robô
chosen_languages: Filtros de idioma
confirm_new_password: Confirmar nova senha
@@ -86,7 +83,6 @@ pt-BR:
locked: Trancar conta
max_uses: Número máximo de usos
new_password: Nova senha
- note: Bio
otp_attempt: Código de autenticação em dois passos
password: Senha
phrase: Palavra-chave ou frase
@@ -114,8 +110,6 @@ pt-BR:
username: Nome de usuário
username_or_email: Nome de usuário ou e-mail
whole_word: Palavra inteira
- featured_tag:
- name: Hashtag
interactions:
must_be_follower: Bloquear notificações de não-seguidores
must_be_following: Bloquear notificações de pessoas que você não segue
@@ -133,6 +127,5 @@ pt-BR:
report: Mandar um e-mail quando uma nova denúncia é submetida
'no': Não
required:
- mark: "*"
text: obrigatório
'yes': Sim
diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml
index 589f5cf5c..bf6381889 100644
--- a/config/locales/simple_form.pt.yml
+++ b/config/locales/simple_form.pt.yml
@@ -27,14 +27,12 @@ pt:
phrase: Será correspondido independentemente da capitalização ou do aviso de conteúdo duma publicação
scopes: Quais as APIs a que será concedido acesso. Se escolheres uma abrangência de nível superior, não precisarás de as seleccionar individualmente.
setting_aggregate_reblogs: Não mostrar novas partilhas que foram partilhadas recentemente (só afecta as novas partilhas)
- setting_default_language: A língua das tuas publicações pode ser detectada automaticamente, mas isso nem sempre é preciso
setting_display_media_default: Esconder media marcada como sensível
setting_display_media_hide_all: Esconder sempre toda a media
setting_display_media_show_all: Mostrar sempre a media marcada como sensível
setting_hide_network: Quem tu segues e quem te segue não será mostrado no teu perfil
setting_noindex: Afecta o teu perfil público e as páginas das tuas publicações
setting_show_application: A aplicação que tu usas para publicar será mostrada na vista detalhada das tuas publicações
- setting_theme: Afecta a aparência do Mastodon quando entras na tua conta em qualquer dispositivo.
username: O teu nome de utilizador será único em %{domain}
whole_word: Quando a palavra-chave ou expressão-chave é somente alfanumérica, ela só será aplicada se corresponder à palavra completa
featured_tag:
@@ -112,8 +110,6 @@ pt:
username: Nome de utilizador
username_or_email: Nome de utilizador ou e-mail
whole_word: Palavra completa
- featured_tag:
- name: Hashtag
interactions:
must_be_follower: Bloquear notificações de não-seguidores
must_be_following: Bloquear notificações de pessoas que não segues
@@ -128,6 +124,5 @@ pt:
report: Enviar um e-mail quando um novo relatório é submetido
'no': Não
required:
- mark: "*"
text: obrigatório
'yes': Sim
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 757b87204..4df2fe161 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -27,13 +27,11 @@ ro:
phrase: Vor fi potrivite indiferent de textul din casetă sau advertismentul unei postări
scopes: La care API-uri aplicația are nevoie de acces. Dacă selectezi un scop principal nu mai e nevoie să selectezi fiecare sub-scop al acestuia.
setting_aggregate_reblogs: Nu afișa redistribuirile noi pentru postările care au fost deja recent redistribuite (afectează doar noile redistribuiri primite)
- setting_default_language: Limba postărilor tale poate fi detectată automat, dar nu este întotdeauna precisă
setting_display_media_default: Ascunde conținutul media marcat ca sensibil (NSFW)
setting_display_media_hide_all: Întotdeauna ascunde tot conținutul media
setting_display_media_show_all: Întotdeauna afișează conținutul media marcat ca sensibil
setting_hide_network: Pe cine urmărești și cine te urmărește nu vor fi afișați pe profilul tău
setting_noindex: Afecteazâ profilul tău public și statusurile tale
- setting_theme: Afecteazâ modul în care arată interfața pe toate dispozitivele pe care ești conectat.
username: Numele tău de utilizator va fi unic pe %{domain}
whole_word: Când fraza sau cuvântul este doar alfanumeric, acesta se aplică doar dacă există o potrivire completă
imports:
@@ -68,7 +66,6 @@ ro:
confirm_password: Confirmă parola
context: Contextele filtrului
current_password: Parola actuală
- data: Data
discoverable: Listează acest cont in director
display_name: Numele afișat
email: Adresa de e-mail
@@ -117,6 +114,5 @@ ro:
report: Trimite e-mail când un raport nou este trimis
'no': Nu
required:
- mark: "*"
text: obligatoriu
'yes': Da
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 4196076a9..26a73c3c6 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -27,20 +27,21 @@ ru:
phrase: Будет сопоставлено независимо от присутствия в тексте или предупреждения о содержании статуса
scopes: Какие API приложению будет позволено использовать. Если вы выберете самый верхний, нижестоящие будут выбраны автоматически.
setting_aggregate_reblogs: Не показывать новые продвижения статусов, которые уже были недавно продвинуты (относится только к новым продвижениям)
- setting_default_language: Язык ваших статусов может быть определён автоматически, но не всегда правильно
+ setting_default_sensitive: Чувствительные медиафайлы скрыты по умолчанию и могут быть показаны по нажатию на них
setting_display_media_default: Скрывать чувствительные медиафайлы
setting_display_media_hide_all: Всегда скрывать любые медиафайлы
setting_display_media_show_all: Всегда показывать чувствительные медиафайлы
setting_hide_network: Те, на кого вы подписаны и кто подписан на Вас, не будут отображены в вашем профиле
setting_noindex: Относится к вашему публичному профилю и страницам статусов
setting_show_application: В окне просмотра вашего статуса будет видно, с какого приложения он был отправлен
- setting_theme: Влияет на внешний вид Mastodon при выполненном входе в аккаунт.
username: Ваш юзернейм будет уникальным на %{domain}
whole_word: Если слово или фраза состоит только из букв и цифр, сопоставление произойдёт только по полному совпадению
featured_tag:
name: 'Возможно, вы захотите выбрать из них:'
imports:
data: Файл CSV, экспортированный с другого узла Mastodon
+ invite_request:
+ text: Это поможет нам рассмотреть вашу заявку
sessions:
otp: 'Введите код двухфакторной аутентификации, сгенерированный в мобильном приложении, или используйте один из ваших кодов восстановления:'
user:
@@ -88,6 +89,7 @@ ru:
otp_attempt: Двухфакторный код
password: Пароль
phrase: Слово или фраза
+ setting_advanced_layout: Включить многоколоночный интерфейс
setting_aggregate_reblogs: Группировать продвижения в лентах
setting_auto_play_gif: Автоматически проигрывать анимированные GIF
setting_boost_modal: Показывать диалог подтверждения перед продвижением
@@ -118,15 +120,19 @@ ru:
must_be_follower: Заблокировать уведомления не от подписчиков
must_be_following: Заблокировать уведомления от людей, на которых вы не подписаны
must_be_following_dm: Заблокировать личные сообщения от людей, на которых вы не подписаны
+ invite_request:
+ text: Почему вы хотите присоединиться к нам?
notification_emails:
digest: Присылать дайджест по e-mail
favourite: Уведомлять по e-mail, когда кому-то нравится ваш статус
follow: Уведомлять по e-mail, когда кто-то подписался на вас
follow_request: Уведомлять по e-mail, когда кто-то запрашивает разрешение на подписку
mention: Уведомлять по e-mail, когда кто-то упомянул вас
+ pending_account: Отправлять e-mail при наличии новых заявок на присоединение
reblog: Уведомлять по e-mail, когда кто-то продвинул ваш статус
report: Уведомлять по e-mail при создании жалобы
'no': Нет
+ recommended: Рекомендуется
required:
mark: "*"
text: обязательно
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 17be44e67..8470f7939 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -27,24 +27,25 @@ sk:
phrase: Zhoda sa nájde nezávisle od toho, či je text napísaný, veľkými, alebo malými písmenami, či už v tele, alebo v hlavičke
scopes: Ktoré API budú povolené aplikácii pre prístup. Ak vyberieš vrcholný stupeň, nemusíš už potom vyberať po jednom.
setting_aggregate_reblogs: Nezobrazuj nové vyzdvihnutia pre príspevky, ktoré už boli len nedávno povýšené (týka sa iba nanovo získaných povýšení)
- setting_default_language: Jazyk tvojích príspevkov môže byť zistený automaticky, ale nieje to vždy presné
- setting_display_media_default: Skryť médiá označené ako citlivé
- setting_display_media_hide_all: Vždy ukryť všetky médiá
- setting_display_media_show_all: Stále ukazuj médiá označené ako citlivé
- setting_hide_network: Koho následuješ, a kto následuje teba nebude zobrazené na tvojom profile
+ setting_default_sensitive: Chúlostivé médiá sú štandardne ukryté, a môžu byť zobrazené kliknutím
+ setting_display_media_default: Ukry médiá označené ako citlivé
+ setting_display_media_hide_all: Vždy ukry všetky médiá
+ setting_display_media_show_all: Stále zobrazuj médiá označené ako citlivé
+ setting_hide_network: Koho následuješ, a kto následuje teba, nebude zobrazené na tvojom profile
setting_noindex: Ovplyvňuje verejný profil a stránky s príspevkami
- setting_show_application: Aplikácia, ktorú používaš na písanie príspevkov, bude zobrazená v detailnom náhľade jednotlivých tvojích príspevkov
- setting_theme: Ovplyvňuje ako Mastodon vyzerá pri prihlásení z hociakého zariadenia.
+ setting_show_application: Aplikácia, ktorú používaš na písanie príspevkov, bude zobrazená v podrobnom náhľade jednotlivých tvojích príspevkov
username: Tvoja prezývka bude unikátna pre server %{domain}
whole_word: Ak je kľúčové slovo, alebo fráza poskladaná iba s písmen a čísel, bude použité iba ak sa zhoduje s celým výrazom
featured_tag:
name: 'Možno by si chcel/a použiť niektoré z týchto:'
imports:
data: CSV súbor vyexportovaný z iného Mastodon serveru
+ invite_request:
+ text: Toto pomôže s vyhodnocovaním tvojej žiadosti
sessions:
otp: 'Napíš sem dvoj-faktorový kód z telefónu, alebo použi jeden z tvojích obnovovacích kódov:'
user:
- chosen_languages: Keď je zaškrtnuté, tak iba príspevky vo vybraných jazykoch budú zobrazené vo verejnej osi
+ chosen_languages: Keď je zaškrtnuté, vo verejnej osi budú zobrazené iba príspevky vo vybraných jazykoch
labels:
account:
fields:
@@ -53,18 +54,18 @@ sk:
account_warning_preset:
text: Text predlohy
admin_account_action:
- send_email_notification: Oznám užívateľovi cez email
+ send_email_notification: Oznam užívateľovi cez email
text: Špecifické varovanie
type: Úkon
types:
disable: Deaktivuj
none: Neurob nič
- silence: Utíšenie
+ silence: Utíš
suspend: Vylúč a nenávratne vymaž dáta na účte
warning_preset_id: Použi varovnú predlohu
defaults:
autofollow: Pozvi k následovaniu tvojho profilu
- avatar: Avatar
+ avatar: Maskot
bot: Toto je automatizovaný bot účet
chosen_languages: Filtruj jazyky
confirm_new_password: Znovu tvoje nové heslo, pre potvrdenie
@@ -75,19 +76,20 @@ sk:
discoverable: Zaraď tento účet do databázy profilov
display_name: Zobrazované meno
email: Emailová adresa
- expires_in: Expirovať po
+ expires_in: Expiruj po
fields: Metadáta profilu
header: Obrázok v hlavičke
inbox_url: URL adresa prechodnej schránky
- irreversible: Zahoď, namiesto skritia
+ irreversible: Zahoď, namiesto ukrytia
locale: Jazyk rozhrania
locked: Zamknúť účet
- max_uses: Maximálne možno použiť
+ max_uses: Najviac možno použiť
new_password: Nové heslo
note: O tebe
otp_attempt: Dvoj-faktorový overovací (2FA) kód
password: Heslo
phrase: Kľúčové slovo, alebo fráza
+ setting_advanced_layout: Zapni pokročilé užívateľské rozhranie
setting_aggregate_reblogs: Zoskupuj vyzdvihnutia v časovej osi
setting_auto_play_gif: Automaticky prehrávaj animované GIFy
setting_boost_modal: Zobrazuj potvrdzovacie okno pred povýšením
@@ -97,10 +99,10 @@ sk:
setting_delete_modal: Zobrazuj potvrdzovacie okno pred vymazaním toot-u
setting_display_media: Zobrazovanie médií
setting_display_media_default: Štandard
- setting_display_media_hide_all: Skryť všetky
+ setting_display_media_hide_all: Ukry všetky
setting_display_media_show_all: Ukáž všetky
setting_expand_spoilers: Stále rozbaľ príspevky označené varovaním o obsahu
- setting_hide_network: Ukri svoju sieť kontaktov
+ setting_hide_network: Ukry svoju sieť kontaktov
setting_noindex: Nezaraďuj príspevky do indexu pre vyhľadávče
setting_reduce_motion: Mierni pohyb pri animáciách
setting_show_application: Zverejni akú aplikáciu používaš na posielanie príspevkov
@@ -110,7 +112,7 @@ sk:
severity: Závažnosť
type: Typ importu
username: Prezývka
- username_or_email: Prezívka, alebo email
+ username_or_email: Prezývka, alebo email
whole_word: Celé slovo
featured_tag:
name: Haštag
@@ -118,16 +120,19 @@ sk:
must_be_follower: Blokuj oboznámenia od užívateľov, ktorí ma nenásledujú
must_be_following: Blokuj oboznámenia od ľudí, ktorých nesledujem
must_be_following_dm: Blokuj súkromné správy od ľudí ktorých nesledujem
+ invite_request:
+ text: Prečo sa k nám chceš pridať?
notification_emails:
- digest: Posielaj súhrnné emaily
- favourite: Poslať email ak si niekto obľúbi tvoj príspevok
- follow: Poslať email, ak ťa niekto začne následovať
- follow_request: Zaslať email ak ti niekto pošle žiadosť o sledovanie
- mention: Poslať email ak ťa niekto spomenie v svojom príspevku
- reblog: Poslať email ak niekto re-tootne tvoj príspevok
- report: Poslať e-mail ak niekto dodá nové hlásenie
+ digest: Zasielať súhrnné emaily
+ favourite: Zaslať email, ak si niekto obľúbi tvoj príspevok
+ follow: Zaslať email, ak ťa niekto začne následovať
+ follow_request: Zaslať email, ak ti niekto pošle žiadosť o sledovanie
+ mention: Zaslať email, ak ťa niekto spomenie vo svojom príspevku
+ pending_account: Zaslať email, ak treba prehodnotiť nový účet
+ reblog: Zaslať email, ak niekto re-tootne tvoj príspevok
+ report: Zaslať email, ak niekto podá nové nahlásenie
'no': Nie
+ recommended: Odporúčané
required:
- mark: "*"
text: povinné
'yes': Áno
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 781485864..2e0495551 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -18,13 +18,11 @@ sl:
password: Uporabite najmanj 8 znakov
phrase: Se bo ujemal, ne glede na začetnice v tekstu ali opozorilo o vsebini troba
scopes: Do katerih API-jev bo imel program dostop. Če izberete obseg najvišje ravni, vam ni treba izbrati posameznih.
- setting_default_language: Jezik vaših trobov je lahko samodejno zaznan, vendar ni vedno pravilen
setting_display_media_default: Skrij medij, ki je označen kot občutljiv
setting_display_media_hide_all: Vedno skrij vse medije
setting_display_media_show_all: Vedno pokaži medij, ki je označen kot občutljiv
setting_hide_network: Kogar spremljate in kdo vas spremlja ne bo prikazano na vašem profilu
setting_noindex: Vpliva na vaš javni profil in na strani s stanjem
- setting_theme: Vpliva na to, kako izgleda Mastodon, ko ste prijavljeni s katero koli napravo.
username: Vaše uporabniško ime bo edinstveno na %{domain}
whole_word: Ko je ključna beseda ali fraza samo alfanumerična, se bo uporabljala le, če se bo ujemala s celotno besedo
imports:
@@ -59,7 +57,6 @@ sl:
locked: Zaklenjen račun
max_uses: Največje število uporabnikov
new_password: Novo geslo
- note: Bio
otp_attempt: Dvofaktorska koda
password: Geslo
phrase: Ključna beseda ali fraza
@@ -99,6 +96,5 @@ sl:
report: Pošlji e-pošto, ko je oddana nova prijava
'no': Ne
required:
- mark: "*"
text: zahtevano
'yes': Da
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index c3feee575..04ef12c9a 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -27,14 +27,12 @@ sq:
phrase: Do të kërkohet përputhje pavarësish se teksti ose sinjalizimi mbi lëndën e një mesazhi është shkruar me të mëdha apo me të vogla
scopes: Cilat API do të lejohet të përdorë aplikacioni. Nëse përzgjidhni një shkallë të epërme, nuk ju duhet të përzgjidhni individualet një nga një.
setting_aggregate_reblogs: Mos shfaq përforcime të reja për mesazhe që janë përforcuar tani së fundi (prek vetëm përforcime të marra rishtas)
- setting_default_language: Gjuha e mesazheve tuaj do të zbulohet vetvetiu, por mund të mos jetë përherë e saktë
setting_display_media_default: Fshih media me shenjën rezervat
setting_display_media_hide_all: Fshih përherë krejt mediat
setting_display_media_show_all: Mediat me shenjën rezervat shfaqi përherë
setting_hide_network: Cilët ndiqni dhe cilët ju ndjekin nuk do të shfaqen në profilin tuaj
setting_noindex: Prek faqet e profilit tuaj publik dhe gjendjeve
setting_show_application: Aplikacioni që përdorni për mesazhe do të shfaqet te pamja e hollësishme për mesazhet tuaj
- setting_theme: Lidhet me se si duket Mastodon-i kur jeni i futur nga çfarëdo pajisje.
username: Emri juaj i përdoruesit do të jetë unik në %{domain}
whole_word: Kur fjalëkyçi ose fraza është vetëm numerike, do të aplikohet vetëm nëse përputhet me krejt fjalën
featured_tag:
@@ -64,7 +62,6 @@ sq:
warning_preset_id: Përdor një sinjalizim të paracaktuar
defaults:
autofollow: Ftesë për ndjekje të llogarisë tuaj
- avatar: Avatar
bot: Kjo është një llogari robot
chosen_languages: Filtro gjuhë
confirm_new_password: Ripohoni fjalëkalimin e ri
@@ -112,8 +109,6 @@ sq:
username: Emër përdoruesi
username_or_email: Emër përdoruesi ose Email
whole_word: Krejt fjalën
- featured_tag:
- name: Hashtag
interactions:
must_be_follower: Blloko njoftime nga jo-ndjekës
must_be_following: Blloko njoftime nga persona që nuk i ndiqni
@@ -128,6 +123,5 @@ sq:
report: Dërgo email kur parashtrohet një raportim i ri
'no': Jo
required:
- mark: "*"
text: e domosdoshme
'yes': Po
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index eac64988f..66efa3db8 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -8,14 +8,12 @@ sr-Latn:
header: PNG, GIF ili JPG. Najviše %{size}. Biće smanjena na %{dimensions}px
locked: Zahteva da pojedinačno odobrite pratioce
setting_noindex: Utiče na Vaš javni profil i statusne strane
- setting_theme: Utiče kako će Mastodont izgledati kada ste prijavljeni sa bilo kog uređaja.
imports:
data: CSV fajl izvezen sa druge Mastodont instance
sessions:
otp: 'Unesite dvofaktorski kod sa Vašeg telefona ili koristite jedan od kodova za oporavak:'
labels:
defaults:
- avatar: Avatar
confirm_new_password: Potvrdite novu lozinku
confirm_password: Potvrdite lozinku
current_password: Trenutna lozinka
@@ -57,6 +55,5 @@ sr-Latn:
reblog: Šalji e-poštu kada neko podrži Vaš status
'no': Ne
required:
- mark: "*"
text: obavezno
'yes': Da
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 7e3c6685e..a097be5dd 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -27,13 +27,11 @@ sr:
phrase: Биће упарена без обзира на велико или мало слово у тексту или упозорења о садржају трубе
scopes: Којим API-јима ће апликација дозволити приступ. Ако изаберете опсег највишег нивоа, не морате одабрати појединачне.
setting_aggregate_reblogs: Не показуј нова дељења за трубе које су недавно подељене (утиче само на недавно примљена дељења)
- setting_default_language: Језик ваших труба може бити аутоматски откривен, али није увек прецизан
setting_display_media_default: Сакриј медије означене као осетљиве
setting_display_media_hide_all: Увек сакриј све медије
setting_display_media_show_all: Увек прикажи медије означене као осетљиве
setting_hide_network: Кога пратите и ко вас прати неће бити приказано на вашем профилу
setting_noindex: Утиче на Ваш јавни профил и статусне стране
- setting_theme: Утиче како ће Мастодонт изгледати када сте пријављени са било ког уређаја.
username: Ваш надимак ће бити јединствен на %{domain}
whole_word: Када је кључна реч или фраза искључиво алфанумеричка, биће примењена само ако се подудара са целом речи
imports:
@@ -122,6 +120,5 @@ sr:
report: Пошаљи Е-пошту када се поднесе нова пријава
'no': Не
required:
- mark: "*"
text: обавезно
'yes': Да
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 62d0b3769..171714ab0 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -19,10 +19,8 @@ sv:
locale: Användargränssnittets språk, e-post och push-aviseringar
locked: Kräver att du manuellt godkänner följare
password: Använd minst 8 tecken
- setting_default_language: Språket av dina inlägg kan upptäckas automatiskt, men det är inte alltid rätt
setting_hide_network: Vem du följer och vilka som följer dig kommer inte att visas på din profilsida
setting_noindex: Påverkar din offentliga profil och statussidor
- setting_theme: Påverkar hur Mastodon ser ut oavsett från vilken enhet du är inloggad.
imports:
data: CSV-fil som exporteras från en annan Mastodon-instans
sessions:
@@ -36,13 +34,11 @@ sv:
value: Innehåll
defaults:
autofollow: Bjud in till att följa ditt konto
- avatar: Avatar
bot: Detta är ett botkonto
chosen_languages: Filtrera språk
confirm_new_password: Bekräfta nytt lösenord
confirm_password: Bekräfta lösenord
current_password: Nuvarande lösenord
- data: Data
display_name: Visningsnamn
email: E-postadress
expires_in: Förfaller efter
@@ -84,6 +80,5 @@ sv:
reblog: Skicka e-post när någon knuffar din status
'no': Nej
required:
- mark: "*"
text: obligatorisk
'yes': Ja
diff --git a/config/locales/simple_form.ta.yml b/config/locales/simple_form.ta.yml
new file mode 100644
index 000000000..4320953ce
--- /dev/null
+++ b/config/locales/simple_form.ta.yml
@@ -0,0 +1 @@
+ta:
diff --git a/config/locales/simple_form.te.yml b/config/locales/simple_form.te.yml
new file mode 100644
index 000000000..34c54f18f
--- /dev/null
+++ b/config/locales/simple_form.te.yml
@@ -0,0 +1 @@
+te:
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index bce5eaac6..9d6b75ed0 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -17,7 +17,7 @@ th:
digest: ส่งเฉพาะหลังจากไม่มีการใช้งานเป็นเวลานานและในกรณีที่คุณได้รับข้อความส่วนบุคคลใด ๆ เมื่อคุณไม่อยู่เท่านั้น
discoverable_html: ไดเรกทอรี ช่วยให้ผู้คนค้นหาบัญชีตามความสนใจและกิจกรรม ต้องการอย่างน้อย %{min_followers} ผู้ติดตาม
email: คุณจะได้รับอีเมลยืนยัน
- fields: คุณสามารถมีได้มากถึง 4 รายการแสดงผลเป็นตารางในโปรไฟล์ของคุณ
+ fields: คุณสามารถมีได้มากถึง 4 รายการแสดงเป็นตารางในโปรไฟล์ของคุณ
header: PNG, GIF หรือ JPG สูงสุด %{size} จะถูกย่อขนาดเป็น %{dimensions}px
inbox_url: คัดลอก URL จากหน้าแรกของรีเลย์ที่คุณต้องการใช้
irreversible: โพสต์ที่กรองจะหายไปอย่างถาวร แม้ว่าจะเอาตัวกรองออกในภายหลัง
@@ -27,24 +27,25 @@ th:
phrase: จะถูกจับคู่โดยไม่คำนึงถึงตัวอักษรใหญ่เล็กในข้อความหรือคำเตือนเนื้อหาของโพสต์
scopes: API ใดที่แอปพลิเคชันจะได้รับอนุญาตให้เข้าถึง หากคุณเลือกขอบเขตระดับบนสุด คุณไม่จำเป็นต้องเลือกแต่ละขอบเขต
setting_aggregate_reblogs: ไม่แสดงการดันใหม่สำหรับโพสต์ที่เพิ่งดัน (มีผลต่อการดันที่ได้รับใหม่เท่านั้น)
- setting_default_language: สามารถตรวจพบภาษาของโพสต์ของคุณโดยอัตโนมัติ แต่อาจไม่แม่นยำเสมอไป
+ setting_default_sensitive: ซ่อนสื่อที่ละเอียดอ่อนโดยค่าเริ่มต้นและสามารถเปิดเผยได้ด้วยการคลิก
setting_display_media_default: ซ่อนสื่อที่ถูกทำเครื่องหมายว่าละเอียดอ่อน
setting_display_media_hide_all: ซ่อนสื่อทั้งหมดเสมอ
setting_display_media_show_all: แสดงสื่อที่ถูกทำเครื่องหมายว่าละเอียดอ่อนเสมอ
setting_hide_network: จะไม่แสดงผู้ที่คุณติดตามและผู้ที่ติดตามคุณในโปรไฟล์ของคุณ
setting_noindex: มีผลต่อโปรไฟล์สาธารณะและหน้าสถานะของคุณ
- setting_show_application: จะแสดงผลแอปพลิเคชันที่คุณใช้เพื่อโพสต์ในมุมมองโดยละเอียดของโพสต์ของคุณ
- setting_theme: มีผลต่อลักษณะของ Mastodon เมื่อคุณเข้าสู่ระบบจากอุปกรณ์ใด ๆ
+ setting_show_application: จะแสดงแอปพลิเคชันที่คุณใช้เพื่อโพสต์ในมุมมองโดยละเอียดของโพสต์ของคุณ
username: ชื่อผู้ใช้ของคุณจะไม่ซ้ำกันบน %{domain}
whole_word: เมื่อคำสำคัญหรือวลีมีแค่ตัวอักษรและตัวเลข จะถูกใช้หากตรงกันทั้งคำเท่านั้น
featured_tag:
name: 'คุณอาจต้องการใช้หนึ่งในนี้:'
imports:
data: ไฟล์ CSV ที่ส่งออกจากเซิร์ฟเวอร์ Mastodon อื่น
+ invite_request:
+ text: นี่จะช่วยให้เราตรวจทานใบสมัครของคุณ
sessions:
otp: 'ป้อนรหัสสองปัจจัยที่สร้างโดยแอปในโทรศัพท์ของคุณหรือใช้หนึ่งในรหัสกู้คืนของคุณ:'
user:
- chosen_languages: เมื่อกาเครื่องหมาย จะแสดงผลเฉพาะโพสต์ในภาษาที่เลือกในเส้นเวลาสาธารณะ
+ chosen_languages: เมื่อกาเครื่องหมาย จะแสดงเฉพาะโพสต์ในภาษาที่เลือกในเส้นเวลาสาธารณะ
labels:
account:
fields:
@@ -73,7 +74,7 @@ th:
current_password: รหัสผ่านปัจจุบัน
data: ข้อมูล
discoverable: แสดงรายการบัญชีนี้ในไดเรกทอรี
- display_name: ชื่อที่แสดงผล
+ display_name: ชื่อที่แสดง
email: ที่อยู่อีเมล
expires_in: หมดอายุหลังจาก
fields: ข้อมูลเมตาโปรไฟล์
@@ -88,6 +89,7 @@ th:
otp_attempt: รหัสสองปัจจัย
password: รหัสผ่าน
phrase: คำสำคัญหรือวลี
+ setting_advanced_layout: เปิดใช้งานส่วนติดต่อเว็บขั้นสูง
setting_aggregate_reblogs: จัดกลุ่มการดันในเส้นเวลา
setting_auto_play_gif: เล่น GIF แบบเคลื่อนไหวโดยอัตโนมัติ
setting_boost_modal: แสดงกล่องโต้ตอบการยืนยันก่อนดัน
@@ -95,7 +97,7 @@ th:
setting_default_privacy: ความเป็นส่วนตัวของโพสต์
setting_default_sensitive: ทำเครื่องหมายสื่อว่าละเอียดอ่อนเสมอ
setting_delete_modal: แสดงกล่องโต้ตอบการยืนยันก่อนลบโพสต์
- setting_display_media: การแสดงผลสื่อ
+ setting_display_media: การแสดงสื่อ
setting_display_media_default: ค่าเริ่มต้น
setting_display_media_hide_all: ซ่อนทั้งหมด
setting_display_media_show_all: แสดงทั้งหมด
@@ -118,15 +120,19 @@ th:
must_be_follower: ปิดกั้นการแจ้งเตือนจากที่ไม่ใช่ผู้ติดตาม
must_be_following: ปิดกั้นการแจ้งเตือนจากผู้คนที่คุณไม่ได้ติดตาม
must_be_following_dm: ปิดกั้นข้อความโดยตรงจากผู้คนที่คุณไม่ได้ติดตาม
+ invite_request:
+ text: ทำไมคุณจึงต้องการเข้าร่วม?
notification_emails:
digest: ส่งอีเมลสรุป
favourite: ส่งอีเมลเมื่อใครสักคนชื่นชอบสถานะของคุณ
follow: ส่งอีเมลเมื่อใครสักคนติดตามคุณ
follow_request: ส่งอีเมลเมื่อใครสักคนขอติดตามคุณ
mention: ส่งอีเมลเมื่อใครสักคนกล่าวถึงคุณ
+ pending_account: ส่งอีเมลเมื่อบัญชีใหม่ต้องการการตรวจทาน
reblog: ส่งอีเมลเมื่อใครสักคนดันสถานะของคุณ
report: ส่งอีเมลเมื่อมีการส่งรายงานใหม่
'no': ไม่
+ recommended: แนะนำ
required:
mark: "*"
text: ต้องระบุ
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 517b38ca5..68b4c24c9 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -48,6 +48,5 @@ tr:
reblog: Biri durumumu paylaştığında, bana e-posta gönder
'no': Hayır
required:
- mark: "*"
text: gerekli
'yes': Evet
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 05d57509e..35b20d8a9 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -45,6 +45,5 @@ uk:
reblog: Надсилати листа, коли хтось передмухує Ваш статус
'no': Ні
required:
- mark: "*"
text: обов'язкове
'yes': Так
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index cfa6840a6..b781deb32 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -2,21 +2,46 @@
zh-CN:
simple_form:
hints:
+ account_warning_preset:
+ text: 你可以使用嘟文格式,在嘟文中加入 URL、话题标签和提及“@”
+ admin_account_action:
+ send_email_notification: 用户将收到对其帐号上发生的事的解释
+ text_html: 可选。你可以使用嘟文格式。你可以预置警告以节省时间
+ type_html: 用%{acct}选择做什么
+ warning_preset_id: 可选。你可以在预置文本末尾添加自定义文本
defaults:
autofollow: 通过邀请链接注册的用户将会自动关注你
avatar: 文件大小限制 %{size},只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
bot: 来自这个帐户的绝大多数操作都是自动进行的,并且可能无人监控
+ context: 过滤器的应用场景
digest: 仅在你长时间未登录,且收到了私信时发送
+ discoverable_html: 目录 让大家能根据兴趣和活动寻找用户。需要至少 %{min_followers} 位关注者
+ email: 我们会向你发送一封确认邮件
fields: 这将会在个人资料页上以表格的形式展示,最多 4 个项目
header: 文件大小限制 %{size},只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
+ inbox_url: 从你想要使用的中继的主页上复制 URL
+ irreversible: 已过滤的嘟文会不可逆转地消失,即便移除过滤器之后也一样
locale: 用户界面、电子邮件和推送通知中使用的语言
locked: 你需要手动审核所有关注请求
- setting_default_language: 嘟文语言自动检测的结果有可能不准确(此设置仅影响你的嘟文)
+ password: 至少需要8个字符
+ phrase: 匹配将无视大小写和嘟文的内容警告
+ scopes: 哪些 API 被允许使用。如果你选中了更高一级的范围,就不能单个选中了。
+ setting_aggregate_reblogs: 请不要显示最近已经被转嘟过的转嘟(只会影响新收到的转嘟)
+ setting_default_sensitive: 敏感内容默认隐藏,并在点击后显示
+ setting_display_media_default: 隐藏被标记为敏感内容的媒体
+ setting_display_media_hide_all: 总是隐藏所有媒体
+ setting_display_media_show_all: 总是显示被标记为敏感内容的媒体
setting_hide_network: 你关注的人和关注你的人将不会在你的个人资料页上展示
setting_noindex: 此设置会影响到你的公开个人资料以及嘟文页面
- setting_theme: 此设置会影响到所有已登录设备上 Mastodon 的显示样式
+ setting_show_application: 你用来发表嘟文的应用程序将会在你嘟文的详细内容中显示
+ username: 你的用户名在 %{domain} 上是独特的
+ whole_word: 如果关键词只包含字母和数字,就只会在整个词被匹配时才会套用
+ featured_tag:
+ name: 你可能想要使用以下之一:
imports:
- data: 请上传从其他 Mastodon 实例导出的 CSV 文件
+ data: 从其他 Mastodon 服务器导出的 CSV 文件
+ invite_request:
+ text: 这会有助于我们处理你的申请
sessions:
otp: 输入你手机应用上生成的双重认证码,或者任意一个恢复代码:
user:
@@ -26,6 +51,18 @@ zh-CN:
fields:
name: 标签
value: 内容
+ account_warning_preset:
+ text: 预置文本
+ admin_account_action:
+ send_email_notification: 通过邮件提醒此用户
+ text: 内容警告
+ type: 动作
+ types:
+ disable: 禁用
+ none: 忽略
+ silence: 静音
+ suspend: 停用并永久删除账户数据
+ warning_preset_id: 使用预置警告
defaults:
autofollow: 让被邀请人关注你的帐户
avatar: 头像
@@ -33,13 +70,17 @@ zh-CN:
chosen_languages: 语言过滤
confirm_new_password: 确认新密码
confirm_password: 确认密码
+ context: 过滤器场景
current_password: 当前密码
data: 数据文件
+ discoverable: 在本站用户资料目录中列出此账户
display_name: 昵称
email: 电子邮件地址
expires_in: 失效时间
fields: 个人资料附加信息
header: 个人资料页横幅图片
+ inbox_url: 中继收件箱的 URL
+ irreversible: 放弃而非隐藏
locale: 界面语言
locked: 保护你的帐户(锁嘟)
max_uses: 最大使用次数
@@ -47,15 +88,24 @@ zh-CN:
note: 简介
otp_attempt: 双重认证代码
password: 密码
+ phrase: 关键词
+ setting_advanced_layout: 启用高级 web 界面
+ setting_aggregate_reblogs: 在时间轴中合并转嘟
setting_auto_play_gif: 自动播放 GIF 动画
setting_boost_modal: 在转嘟前询问我
setting_default_language: 发布语言
setting_default_privacy: 嘟文默认可见范围
setting_default_sensitive: 总是将我发送的媒体文件标记为敏感内容
setting_delete_modal: 在删除嘟文前询问我
+ setting_display_media: 媒体展示
+ setting_display_media_default: 默认
+ setting_display_media_hide_all: 隐藏全部
+ setting_display_media_show_all: 显示全部
+ setting_expand_spoilers: 始终展开具有内容警告的嘟文
setting_hide_network: 隐藏你的社交网络
setting_noindex: 禁止搜索引擎建立索引
setting_reduce_motion: 降低过渡动画效果
+ setting_show_application: 展示你用来发嘟的应用
setting_system_font_ui: 使用系统默认字体
setting_theme: 站点主题
setting_unfollow_modal: 在取消关注前询问我
@@ -63,19 +113,26 @@ zh-CN:
type: 导入数据类型
username: 用户名
username_or_email: 用户名或电子邮件地址
+ whole_word: 整个词条
+ featured_tag:
+ name: 话题标签
interactions:
must_be_follower: 屏蔽来自未关注我的用户的通知
must_be_following: 屏蔽来自我未关注的用户的通知
must_be_following_dm: 屏蔽来自我未关注的用户的私信
+ invite_request:
+ text: 你为什么想要加入?
notification_emails:
digest: 发送摘要邮件
favourite: 当有用户收藏了我的嘟文时,发送电子邮件提醒我
follow: 当有用户关注我时,发送电子邮件提醒我
follow_request: 当有用户向我发送关注请求时,发送电子邮件提醒我
mention: 当有用户在嘟文中提及我时,发送电子邮件提醒我
+ pending_account: 在有账户需要审核时,发送电子邮件提醒我
reblog: 当有用户转嘟了我的嘟文时,发送电子邮件提醒我
+ report: 在提交新举报时,发送电子邮件提醒我
'no': 否
+ recommended: 推荐
required:
- mark: "*"
text: 必填
'yes': 是
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index e28f935c2..2cb2d75b2 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -11,10 +11,8 @@ zh-HK:
header: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 %{size},會縮裁成 %{dimensions}px
locale: 使用者介面、電郵和通知的語言
locked: 你必須人手核准每個用戶對你的關注請求,而你的文章私隱會被預設為「只有關注你的人能看」
- setting_default_language: 你文章的語言會被自動偵測,但不一定完全準確
setting_hide_network: 你關注的人和關注你的人將不會在你的個人資料頁上顯示
setting_noindex: 此設定會影響到你的公開個人資料以及文章頁面
- setting_theme: 此設置會影響到你從任意設備登入時 Mastodon 的顯示樣式。
imports:
data: 自其他服務站匯出的 CSV 檔案
sessions:
@@ -76,6 +74,5 @@ zh-HK:
reblog: 當有用戶轉推你的文章時,發電郵通知
'no': 否
required:
- mark: "*"
text: 必須填寫
'yes': 是
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 61d07825c..4da117b61 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -27,14 +27,12 @@ zh-TW:
phrase: 無論是嘟文的本文或是內容警告都會被過濾
scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍,則無須選擇個別項目。
setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟(只影響最新收到的嘟文)
- setting_default_language: 您嘟文的語言可被自動偵測,但不一定每次都準確
setting_display_media_default: 隱藏標為敏感的媒體
setting_display_media_hide_all: 總是隱藏所有媒體
setting_display_media_show_all: 總是顯示標為敏感的媒體
setting_hide_network: 你關注的人與關注你的人將不會在你的個人資料頁上顯示
setting_noindex: 會影響您的公開個人資料與嘟文頁面
setting_show_application: 您用來發嘟文的應用程式將會在您嘟文的詳細檢視顯示
- setting_theme: 會影響從任何裝置登入所看到的 Mastodon 樣式。
username: 您的使用者名稱將在 %{domain} 是獨一無二的
whole_word: 如果關鍵字或詞組僅有字母與數字,則其將只在符合整個單字的時候才會套用
featured_tag:
@@ -128,6 +126,5 @@ zh-TW:
report: 當提交新檢舉時傳送電子郵件
'no': 否
required:
- mark: "*"
text: 必須填寫
'yes': 是
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index d859d16b1..75a43e322 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -14,7 +14,7 @@ sk:
browse_public_posts: Prebádaj naživo prúd verejných príspevkov na Mastodone
contact: Kontakt
contact_missing: Nezadaný
- contact_unavailable: Neuvedený
+ contact_unavailable: Neuvedený/á
discover_users: Objavuj užívateľov
documentation: Dokumentácia
extended_description_html: |
@@ -31,6 +31,7 @@ sk:
source_code: Zdrojový kód
status_count_after:
few: príspevkov
+ many: príspevkov
one: príspevok
other: príspevky
status_count_before: Ktorí napísali
@@ -38,8 +39,9 @@ sk:
terms: Podmienky užívania
user_count_after:
few: užívateľov
+ many: užívateľov
one: užívateľ
- other: užívatelia
+ other: uživatelia
user_count_before: Domov pre
what_is_mastodon: Čo je Mastodon?
accounts:
@@ -47,9 +49,10 @@ sk:
follow: Následuj
followers:
few: Sledovateľov
- one: Sledovateľ
+ many: Sledovateľov
+ one: Sledujúci
other: Sledovatelia
- following: Sledovaní
+ following: Následujem
joined: Pridal/a sa v %{date}
last_active: naposledy aktívny
link_verified_on: Vlastníctvo tohto odkazu bolo skontrolované %{date}
@@ -63,13 +66,14 @@ sk:
following: Musíš už následovať toho človeka, ktorého si praješ zviditeľniť
posts:
few: Príspevkov
+ many: Príspevkov
one: Príspevok
other: Príspevky
posts_tab_heading: Príspevky
posts_with_replies: Príspevky s odpoveďami
- reserved_username: Prihlasovacie meno je rezervované
+ reserved_username: Prihlasovacie meno je vyhradené
roles:
- admin: Administrátor
+ admin: Správca
bot: Bot
moderator: Moderátor
unavailable: Profil nieje dostupný
@@ -111,11 +115,11 @@ sk:
email_status: Stav emailu
enable: Povoľ
enabled: Povolený
- feed_url: URL adresa časovej osi
+ feed_url: adresa časovej osi
followers: Sledujúci
followers_url: URL adresa sledujúcich
follows: Sledovania
- header: Hlavička
+ header: Záhlavie
inbox_url: URL adresa prijatých správ
invited_by: Pozvaný/á užívateľom
ip: IP adresa
@@ -138,6 +142,7 @@ sk:
moderation_notes: Moderátorské poznámky
most_recent_activity: Posledná aktivita
most_recent_ip: Posledná IP adresa
+ no_account_selected: Nedošlo k žiadnému pozmeneniu účtov, keďže žiadne neboli vybrané
no_limits_imposed: Nie sú stanovené žiadné obmedzenia
not_subscribed: Neodoberá
outbox_url: URL poslaných
@@ -152,7 +157,7 @@ sk:
reject: Zamietni
reject_all: Zamietni všetky
remove_avatar: Vymaž avatar
- remove_header: Vymaž hlavičku
+ remove_header: Vymaž záhlavie
resend_confirmation:
already_confirmed: Tento užívateľ je už potvrdený
send: Odošli potvrdzovací email znovu
@@ -162,7 +167,7 @@ sk:
resubscribe: Znovu odoberaj
role: Oprávnenia
roles:
- admin: Administrátor
+ admin: Správca
moderator: Moderátor
staff: Člen
user: Užívateľ
@@ -173,10 +178,11 @@ sk:
created_reports: Vytvorené hlásenia
targeted_reports: Nahlásenia od ostatných
silence: Stíš
- silenced: Utíšený/é
+ silenced: Stíšený/é
statuses: Príspevky
subscribe: Odoberaj
- suspended: Zablokovaní
+ suspended: Vylúčený/á
+ time_in_queue: Čakajúci %{time} v poradí
title: Účty
unconfirmed_email: Nepotvrdený email
undo_silenced: Zruš stíšenie
@@ -213,7 +219,7 @@ sk:
silence_account: "%{name} utíšil/a účet %{target}"
suspend_account: "%{name} zablokoval/a účet používateľa %{target}"
unassigned_report: "%{name} odobral/a report od %{target}"
- unsilence_account: "%{name} zrušil/a utíšenie účtu používateľa %{target}"
+ unsilence_account: "%{name} zrušil/a stíšenie účtu používateľa %{target}"
unsuspend_account: "%{name} zrušil/a blokovanie účtu používateľa %{target}"
update_custom_emoji: "%{name} aktualizoval/a emoji %{target}"
update_status: "%{name} aktualizoval/a status pre %{target}"
@@ -225,9 +231,9 @@ sk:
copy: Kopíruj
copy_failed_msg: Nebolo možné vytvoriť miestnu kópiu tohto emoji
created_msg: Emoji úspešne vytvorené!
- delete: Zmazať
- destroyed_msg: Emojo úspešne zničený!
- disable: Zakázať
+ delete: Zmaž
+ destroyed_msg: Emoji úspešne zničené!
+ disable: Zakáž
disabled_msg: Emoji bolo úspešne zakázané
emoji: Emotikony
enable: Povoľ
@@ -287,18 +293,19 @@ sk:
reject_reports: Zamietni hlásenia
reject_reports_hint: Ignoruj všetky hlásenia prichádzajúce z tejto domény. Nevplýva na blokovania
rejecting_media: odmietanie médiálnych súborov
- rejecting_reports: odmietané hlásenia
+ rejecting_reports: odmietanie hlásení
severity:
- silence: stíšený
- suspend: vylúčený
+ silence: stíšené
+ suspend: vylúčené
show:
affected_accounts:
- few: "%{count} účty v databáze ovplyvnených"
- one: Jeden účet v databáze bol ovplyvnený
- other: "%{count} účtov v databáze bolo ovplyvnených"
+ few: "%{count} účtov v databázi ovplyvnených"
+ many: "%{count} účtov v databázi ovplyvnených"
+ one: Jeden účet v databázi ovplyvnený
+ other: "%{count} účty v databázi ovplyvnené"
retroactive:
- silence: Zruš stíšenie všetkých existujúcich účtov z tejto domény
- suspend: Zruš suspendáciu všetkých existujúcich účtov z tejto domény
+ silence: Zruš stíšenie všetkých momentálne utíšených účtov z tejto domény
+ suspend: Zruš suspendáciu všetkých momentálne ovplyvnených účtov z tejto domény
title: Zruš blokovanie domény %{domain}
undo: Vráť späť
undo: Odvolaj blokovanie domény
@@ -314,12 +321,13 @@ sk:
title: Blokované emailové adresy
followers:
back_to_account: Späť na účet
- title: Následovatielia užívateľa %{acct}
+ title: Sledovatielia užívateľa %{acct}
instances:
by_domain: Doména
delivery_available: Je v dosahu doručovania
known_accounts:
- few: "%{count} známe účty"
+ few: "%{count} známych účtov"
+ many: "%{count} známych účtov"
one: "%{count} známy účet"
other: "%{count} známe účty"
moderation:
@@ -340,18 +348,20 @@ sk:
expired: Vypršalo
title: Filtruj
title: Pozvánky
+ pending_accounts:
+ title: Čakajúcich účtov (%{count})
relays:
add_new: Pridaj nový federovací mostík
delete: Vymaž
- description_html: "Federovací mostík je prechodný server ktorý obmieňa veľké množstvá verejných príspevkov medzi tými servermi ktoré na od neho odoberajú, aj doňho prispievajú. Môže to pomôcť malým a stredným instanciám objavovať federovaný obsah, čo inak vyžaduje aby miestni užívatelia ručne následovali iných ľudí zo vzdialených instancií."
- disable: Pozastav
- disabled: Zastavené
+ description_html: "Federovací mostík je prechodný server, ktorý obmieňa veľké množstvá verejných príspevkov medzi tými servermi ktoré na od neho odoberajú, aj doňho prispievajú. Môže to pomôcť malým a stredným instanciám objavovať federovaný obsah, čo inak vyžaduje aby miestni užívatelia ručne následovali iných ľudí zo vzdialených instancií."
+ disable: Vypni
+ disabled: Vypnutý
enable: Povoľ
enable_hint: Ak povolíš, tvoj server bude odoberať všetky verejné príspevky z tohto mostu, a začne posielať verejné príspevky tvojho servera na tento most.
enabled: Povolené
inbox_url: URL adresa mostu
- pending: Čakám na povolenie od prechodného mostu
- save_and_enable: Uložiť a povoliť
+ pending: Čaká sa na povolenie od prechodného mostu
+ save_and_enable: Ulož a povoľ
setup: Nastav prepojenie s mostom
status: Stav
title: Mosty
@@ -385,15 +395,15 @@ sk:
resolved_msg: Hlásenie úspešne vyriešené!
status: Stav
title: Hlásenia
- unassign: Odobrať
+ unassign: Odober
unresolved: Nevyriešené
updated_at: Aktualizované
settings:
activity_api_enabled:
- desc_html: Sčítanie lokálne publikovaných príspevkov, aktívnych užívateľov, a nových registrácii, v týždenných intervaloch
+ desc_html: Sčítanie miestne uverejnených príspevkov, aktívnych užívateľov, a nových registrácii, v týždenných intervaloch
title: Vydať hromadné štatistiky o užívateľskej aktivite
bootstrap_timeline_accounts:
- desc_html: Ak je prezývok viacero, každú oddeľte čiarkou. Možno zadať iba miestne, odomknuté účty. Pokiaľ necháte prázdne, je to pre všetkých miestnych administrátorov.
+ desc_html: Ak je prezývok viacero, každú oddeľ čiarkou. Je možné zadať iba miestne, odomknuté účty. Pokiaľ necháš prázdne, je to pre všetkých miestnych správcov.
title: Štandardní následovníci nových užívateľov
contact_information:
email: Pracovný email
@@ -402,30 +412,30 @@ sk:
desc_html: Uprav vzhľad pomocou CSS, ktoré je načítané na každej stránke
title: Vlastné CSS
hero:
- desc_html: Zobrazuje sa na hlavnej stránke. Doporučuje sa rozlišenie aspoň 600x100px Pokiaľ nič nieje dodané, bude nastavený základný orázok serveru
+ desc_html: Zobrazuje sa na hlavnej stránke. Doporučené je rozlišenie aspoň 600x100px. Pokiaľ nič nieje dodané, bude nastavený základný orázok serveru.
title: Obrázok hrdinu
mascot:
- desc_html: Zobrazované na viacerých stránkach. Odporúčaná veľkosť aspoň 293×205px. Pokiaľ nieje nahraté, bude zobrazený základný maskot
+ desc_html: Zobrazované na viacerých stránkach. Odporúčaná veľkosť aspoň 293×205px. Pokiaľ nieje nahraté, bude zobrazený základný maskot.
title: Obrázok maskota
peers_api_enabled:
- desc_html: Domény, na ktoré tento server už v rámci fediverse natrafil
+ desc_html: Domény, na ktoré tento server už v rámci fediversa natrafil
title: Zverejni zoznam objavených serverov
preview_sensitive_media:
- desc_html: Náhľad odkazov z iných serverov, bude zobrazený aj vtedy, keď sú médiá označené ako senzitívne
+ desc_html: Náhľad odkazov z iných serverov, bude zobrazený aj vtedy, keď sú médiá označené ako citlivé
title: Ukazuj aj chúlostivé médiá v náhľadoch OpenGraph
profile_directory:
desc_html: Povoľ užívateľom, aby mohli byť nájdení
title: Zapni profilový katalóg
registrations:
closed_message:
- desc_html: Toto sa zobrazí na hlavnej stránke v prípade že sú registrácie uzavreté. Možno tu použiť aj HTML kód
+ desc_html: Toto sa zobrazí na hlavnej stránke v prípade, že sú registrácie uzavreté. Možno tu použiť aj HTML kód
title: Správa o uzavretých registráciách
deletion:
- desc_html: Dovoľiť každému aby si mohli zmazať svok účet
- title: Sprístupniť možnosť vymazať si účet
+ desc_html: Dovoľ každému aby si mohli zmazať svok účet
+ title: Sprístupni možnosť vymazať si účet
min_invite_role:
disabled: Nikto
- title: Povoliť pozvánky od
+ title: Povoľ pozvánky od
registrations_mode:
modes:
approved: Pre registráciu je nutné povolenie
@@ -433,11 +443,11 @@ sk:
open: Ktokoľvek sa môže zaregistrovať
title: Režím registrácií
show_known_fediverse_at_about_page:
- desc_html: Pokiaľ je zapnuté, bude v ukážke osi možné nahliadnúť príspevky z celého známeho fediversa. Inak budú ukázané iba príspevky z miestnej osi.
+ desc_html: Ak je zapnuté, bude v ukážke osi možné nahliadnúť príspevky z celého známeho fediversa. Inak budú ukázané iba príspevky z miestnej osi.
title: Ukáž celé známe fediverse na náhľade osi
show_staff_badge:
- desc_html: Zobraz moderátorsky odznak na užívateľovom profile
- title: Zobraz značku moderátora
+ desc_html: Ukáž moderátorsky odznak na užívateľovom profile
+ title: Ukáž značku moderátora
site_description:
desc_html: Oboznamujúci paragraf na hlavnej stránke a pri meta tagoch. Opíš, čo robí tento Mastodon server špecifickým, a ďalej hocičo iné, čo považuješ za dôležité. Môžeš použiť HTML kód, hlavne <a> a <em>.
title: Popis servera
@@ -461,7 +471,7 @@ sk:
statuses:
back_to_account: Späť na účet
batch:
- delete: Vymazať
+ delete: Vymaž
nsfw_off: Označ ako nechúlostivé
nsfw_on: Označ ako chúlostivé
failed_to_execute: Nepodarilo sa vykonať
@@ -496,13 +506,18 @@ sk:
admin_mailer:
new_pending_account:
body: Podrobnosti o novom účte sú uvedené nižšie. Môžeš túto registračnú požiadavku buď prijať, alebo zamietnúť.
+ subject: Nový účet očakáva preverenie na %{instance} (%{username})
new_report:
body: "%{reporter} nahlásil/a %{target}"
body_remote: Niekto z %{domain} nahlásil/a %{target}
subject: Nové hlásenie pre %{instance} (#%{id})
+ appearance:
+ advanced_web_interface: Pokročilé webové rozhranie
+ animations_and_accessibility: Animácie a prístupnosť
+ confirmation_dialogs: Potvrdzovacie dialógy
+ sensitive_content: Chúlostivý obsah
application_mailer:
- notification_preferences: Zmeniť e-mailové voľby
- salutation: "%{name},"
+ notification_preferences: Zmeň emailové voľby
settings: 'Zmeň emailové voľby: %{link}'
view: 'Zobraziť:'
view_profile: Zobraz profil
@@ -530,10 +545,8 @@ sk:
migrate_account: Presúvam sa na iný účet
migrate_account_html: Ak si želáš presmerovať tento účet na nejaký iný, môžeš si to nastaviť tu.
or_log_in_with: Alebo prihlás s
- providers:
- cas: CAS
- saml: SAML
register: Zaregistruj sa
+ registration_closed: "%{instance} neprijíma nových členov"
resend_confirmation: Zašli potvrdzujúce pokyny znovu
reset_password: Obnov heslo
security: Zabezpečenie
@@ -580,7 +593,8 @@ sk:
explore_mastodon: Prebádaj %{title}
how_to_enable: Momentálne niesi zaradený/á do verejnej profilovej databázy. Prihlásiť sa môžeš nižšie. Použi haštagy vo svojom biografickom popise na profile, ak chceš byť uvedený/á aj pod konkrétnými haštagmi!
people:
- few: "%{count} ľudia"
+ few: "%{count} ľudí"
+ many: "%{count} ľudí"
one: "%{count} človek"
other: "%{count} ľudia"
errors:
@@ -595,6 +609,9 @@ sk:
content: Ospravedlňujem sa. Niečo sa pokazilo na našom konci.
title: Táto stránka nieje v poriadku
noscript_html: Aby bolo možné používať Mastodon web aplikáciu, povoľ prosím JavaScript. Alebo skús jednu z aplikácii dostupných pre vašu platformu.
+ existing_username_validator:
+ not_found: nepodarilo sa nájsť miestného užívateľa s takouto prezývkou
+ not_found_multiple: nepodarilo sa nájsť %{usernames}
exports:
archive_takeout:
date: Dátum
@@ -635,13 +652,24 @@ sk:
more: Viac…
resources: Podklady
generic:
+ all: Všetko
changes_saved_msg: Zmeny boli úspešne uložené!
copy: Kopíruj
+ order_by: Zoraď podľa
save_changes: Ulož zmeny
- validation_errors:
- few: Niečo ešte stále nieje v poriadku! Prosím skontroluj všetky %{count} chyby
- one: Niečo nieje úplne v poriadku! Prosím skontroluj danú chybu
- other: Niečo ešte stále nieje v poriadku! Prosím skontroluj všetky %{count} nižšie uvedené pochybenia
+ identity_proofs:
+ active: Aktívne
+ authorize: Áno, povoľ
+ authorize_connection_prompt: Povoliť toto kryptografické prepojenie?
+ errors:
+ failed: Kryptografické prepojenie sa nepodarilo. Prosím skús to znova z %{provider}.
+ i_am_html: Na %{service} som %{username}.
+ identity: Identita
+ inactive: Neaktívne
+ publicize_checkbox: 'A poslať toto:'
+ publicize_toot: 'Je to dokázané! Na %{service} som %{username}: %{url}'
+ status: Stav overenia
+ view_proof: Ukáž overenie
imports:
modes:
merge: Spoj dohromady
@@ -671,9 +699,10 @@ sk:
generate: Vygeneruj
invited_by: 'Bol/a si pozvaný/á užívateľom:'
max_uses:
- few: "%{count} použitia"
- one: jedno použitie
- other: "%{count} použití"
+ few: "%{count} využití"
+ many: "%{count} využití"
+ one: 1 využitie
+ other: "%{count} využitia"
max_uses_prompt: Bez obmedzení
prompt: Vygeneruj a zdieľaj linky s ostatnými, aby mali umožnený prístup k tomuto serveru
table:
@@ -699,14 +728,6 @@ sk:
action: Zobraziť všetky notifikácie
body: Tu nájdete krátky súhrn správ ktoré ste zmeškali od svojej poslednj návštevi od %{since}
mention: "%{name} ťa spomenul/a v:"
- new_followers_summary:
- few: Tiež si získal/a %{count} nových následovateľov za tú dobu čo si bol/a preč. Yay!
- one: Tiež si získal/a jedného nového následovateľa zatiaľ čo si bol/a preč. Yay!
- other: Tiež si získal/a %{count} nových následovateľov za tú dobu čo si bol/a preč. Yay!
- subject:
- few: "%{count} nové notifikácie od tvojej poslednej návštevy \U0001F418"
- one: "1 nové oboznámenie od tvojej poslednej návštevy \U0001F418"
- other: "%{count} nových oboznámení od tvojej poslednej návštevy \U0001F418"
title: Zatiaľ čo si bol/a preč…
favourite:
body: 'Tvoj príspevok bol uložený medzi obľúbené užívateľa %{name}:'
@@ -730,22 +751,11 @@ sk:
body: 'Tvoj príspevok bol vyzdvihnutý užívateľom %{name}:'
subject: "%{name} vyzdvihli tvoj príspevok"
title: Novo vyzdvyhnuté
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
pagination:
newer: Novšie
next: Ďalšie
older: Staršie
prev: Predchádzajúce
- truncate: "…"
polls:
errors:
already_voted: V tejto ankete si už hlasoval/a
@@ -757,10 +767,20 @@ sk:
too_few_options: musí mať viac ako jednu položku
too_many_options: nemôže zahŕňať viac ako %{max} položiek
preferences:
- languages: Jazyky
other: Ostatné
- publishing: Publikovanie
- web: Web
+ public_timelines: Verejné časové osi
+ relationships:
+ activity: Aktivita účtu
+ dormant: Spiace
+ last_active: Naposledy aktívny
+ most_recent: Najnovšie
+ moved: Presunuli sa
+ mutual: Spoločné
+ primary: Hlavné
+ relationship: Vzťah
+ remove_selected_followers: Odstráň vybraných následovatrľov
+ remove_selected_follows: Prestaň sledovať vybraných užívateľov
+ status: Stav účtu
remote_follow:
acct: Napíš svoju prezývku@doménu z ktorej chceš následovať
missing_resource: Nemožno nájsť potrebnú presmerovaciu adresu k tvojmu účtu
@@ -790,40 +810,26 @@ sk:
activity: Najnovšia aktivita
browser: Prehliadač
browsers:
- alipay: Alipay
blackberry: RIM Blackberry
chrome: Google Chrome
- edge: Microsoft Edge
- electron: Electron
firefox: Mozilla Firefox
generic: Neznámy prehliadač
- ie: Internet Explorer
- micro_messenger: MicroMessenger
nokia: Nokia Ovi Browser
- opera: Opera
otter: Prehliadač Otter
- phantom_js: PhantomJS
qq: QQ Prehliadač
safari: Apple Safari
- uc_browser: UCBrowser
weibo: Sina/Tencent Weibo
current_session: Aktuálna sezóna
description: "%{browser} na %{platform}"
explanation: Tieto sú prehliadače ktoré sú teraz prihlásené na tvoj Mastodon účet.
ip: IP adresa
platforms:
- adobe_air: Adobe Air
- android: Android
- blackberry: Blackberry
chrome_os: Google ChromeOS
- firefox_os: Firefox OS
ios: Apple iOS
linux: GNU/Linux
mac: MacOSX
other: neznáma platforma
windows: Microsoft Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Zamietni
revoke_success: Sezóna úspešne zamietnutá
title: Sezóny
@@ -838,6 +844,7 @@ sk:
edit_profile: Uprav profil
export: Exportuj dáta
featured_tags: Zvýraznené haštagy
+ identity_proofs: Overenia identity
import: Importuj
import_and_export: Import a export
migrate: Presuň účet
@@ -849,20 +856,8 @@ sk:
statuses:
attached:
description: 'Priložené: %{attached}'
- image:
- few: "%{count} obrázky"
- one: "%{count} obrázok"
- other: "%{count} obrázkov"
- video:
- few: "%{count} videá"
- one: "%{count} video"
- other: "%{count} videí"
- boosted_from_html: Povýšené od %{acct_link}
+ boosted_from_html: Vyzdvihnuté od %{acct_link}
content_warning: 'Varovanie o obsahu: %{warning}'
- disallowed_hashtags:
- few: 'obsahoval nepovolené haštagy: %{tags}'
- one: 'obsahoval nepovolený haštag: %{tags}'
- other: 'obsahoval nepovolené haštagy: %{tags}'
language_detection: Zisti automaticky
open_in_web: Otvor v okne na webe
over_character_limit: limit %{max} znakov bol presiahnutý
@@ -872,10 +867,6 @@ sk:
private: Neverejné príspevky nemôžu byť pripnuté
reblog: Vyzdvihnutie sa nedá pripnúť
poll:
- total_votes:
- few: "%{count} hlas(y)ov"
- one: "%{count} hlas"
- other: "%{count} hlas(y)ov"
vote: Hlasuj
show_more: Ukáž viac
sign_in_to_participate: Prihlás sa pre zapojenie do diskusie
@@ -905,7 +896,7 @@ sk:
V dobrej viere robíme všetko preto, aby bol prístup k tímto príspevkom vymedzený iba pre oprávnených používateľov, ale môže sa stať, že iné servery v tomto ohľade zlyhajú. Preto je dôležité prezrieť si a zhodnotiť, na aké servery patria tvoji následovatelia. V nastaveniach si môžeš zapnúť voľbu ručne povoľovať a odmietať nových následovateľov.
Prosím maj na pamäti, že správcovia tvojho, aj vzdialeného obdŕžiavajúceho servera majú možnosť vidieť dané príspevky a správy, ale aj, že obdŕžitelia týchto správ si ich môzu odfotiť, skopírovať, alebo ich inak zdieľať. Nezdieľaj žiadne nebezpečné, alebo ohrozujúce správy pomocou Mastodonu!
-
IPky a iné metadáta: Keď sa prihlásiš, zaznamenáva sa IP adresa z ktorej si sa prihlásil/a, takisto ako aj názov tvojho prehliadača. Všetky zaznamenané sezóny sú pre teba dostupné na konktolu, alebo na zamietnutie prístupu v nastaveniach. Posledná použitá IP adresa je uložená až po dobu dvanástich mesiacov. Môžeme si tiež ponechať serverové záznamy, ktoré obsahujú IP adresu každej požiadavky na tento server.
+
IPky a iné metadáta: Keď sa prihlásiš, zaznamenáva sa IP adresa z ktorej si sa prihlásil/a, takisto ako aj názov tvojho prehliadača. Všetky zaznamenané sezóny sú pre teba dostupné na konktolu, alebo na zamietnutie prístupu v nastaveniach. Posledná použitá IP adresa je uložená až po dobu dvanástich mesiacov. Môžeme si tiež ponechať serverové záznamy, ktoré obsahujú IP adresu každej požiadavky na tento server.
@@ -914,9 +905,9 @@ sk:
Hociktorá z informácií, ktoré sú o tebe zozbierané, môže byť použité následujúcimi spôsobmi:
-
Pre zabezpečenie základného fungovania Mastodonu. Narábať s užívateľským obsahom iných, ako aj prispievať svoj vlastný obsah, možeš len keď si prihlásený/á. Môžeš napríklad následovať iných ľudí, aby si potom videl/a ich príspevky v rámci svojej osobne prispôsobenej domácej osi.
-
Pre lepšie moderovanie komunity sa napríklad môže tvoja IP adresa porovnať s ostatnými už známimi adresami, aby bolo možné zistiť, či nedochádza napríklad k obchádzaniu pravidiel vylúčenia, aleb k iným porušeniam zásad.
-
Emailová adresa, ktorú poskytneš, môže byť použitá na zasielanie informácií, oboznámení keď ostatní užívatelia interaktujú s tvojím obsahom, alebo na posielanie správ, odpovedí na otázky a iné požiadavky.
+
Pre zabezpečenie základného fungovania Mastodonu. Narábať s užívateľským obsahom iných, ako aj prispievať svoj vlastný obsah, možeš len keď si prihlásený/á. Môžeš napríklad následovať iných ľudí, aby si potom videl/a ich príspevky v rámci svojej osobne prispôsobenej domácej osi.
+
Pre lepšie moderovanie komunity sa napríklad môže tvoja IP adresa porovnať s ostatnými už známimi adresami, aby bolo možné zistiť, či nedochádza napríklad k obchádzaniu pravidiel vylúčenia, aleb k iným porušeniam zásad.
+
Emailová adresa, ktorú poskytneš, môže byť použitá na zasielanie informácií, oboznámení keď ostatní užívatelia interaktujú s tvojím obsahom, alebo na posielanie správ, odpovedí na otázky a iné požiadavky.
title: Podmienky užívania, a pravidlá súkromia pre %{instance}
themes:
@@ -926,7 +917,6 @@ sk:
time:
formats:
default: "%b %d, %R, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: Pre potvrdenie teraz zadaj kód vygenerovaný pomocou tvojej overovacej aplikácie
description_html: Ak povolíš dvoj-faktorové overovanie, na prihlásenie potom budeš potrebovať svoj telefón, ktorý vygeneruje prístupové kódy, čo musíš zadať.
@@ -989,5 +979,5 @@ sk:
seamless_external_login: Si prihlásená/ý cez externú službu, takže nastavenia hesla a emailu ti niesú prístupné.
signed_in_as: 'Prihlásená/ý ako:'
verification:
- explanation_html: 'Môžeš sa overiť ako majiteľ odkazov v metadátach tvojho profilu. Na to musí ale odkazovaná stránka obsahovať odkaz späť na tvoj Mastodon profil. Tento spätný odkaz musí mať prívlastok rel="me". Na texte odkazu nezáleží. Tu je príklad:'
+ explanation_html: 'Môžeš sa overiť ako majiteľ odkazov v metadátach tvojho profilu. Na to ale musí odkazovaná stránka obsahovať odkaz späť na tvoj Mastodon profil. Tento spätný odkaz musí mať prívlastok rel="me". Na texte odkazu nezáleží. Tu je príklad:'
verification: Overenie
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 3d99f7708..85e167ca9 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -5,7 +5,6 @@ sl:
about_mastodon_html: Mastodon je socialno omrežje, ki temelji na odprtih spletnih protokolih in prosti ter odprtokodni programski opremi. Je decentraliziran, kot e-pošta.
about_this: O Mastodonu
administered_by: 'Upravlja:'
- api: API
apps: Mobilne aplikacije
contact: Kontakt
contact_missing: Ni nastavljeno
@@ -64,7 +63,6 @@ sl:
roles:
admin: Skrbnik
bot: Robot
- moderator: Mod
unfollow: Prenehaj slediti
admin:
account_actions:
@@ -77,7 +75,6 @@ sl:
destroyed_msg: Moderirana opomba je uspešno uničena!
accounts:
are_you_sure: Ali si prepričan?
- avatar: Avatar
by_domain: Domena
change_email:
changed_msg: E-pošta računa je uspešno spremenjena!
@@ -108,7 +105,6 @@ sl:
header: Glava
inbox_url: URl v mapi "Prejeto"
invited_by: Povabljen od
- ip: IP
joined: Pridružil
location:
all: Vse
@@ -149,10 +145,8 @@ sl:
role: Dovoljenja
roles:
admin: Skrbnik
- moderator: Moderator
staff: Osebje
user: Uporabnik
- salmon_url: Salmon URL
search: Poišči
shared_inbox_url: URL mape "Prejeto v skupni rabi"
show:
@@ -323,7 +317,6 @@ sl:
all: Vse
available: Razpoložljivo
expired: Potekel
- title: Filter
title: Povabila
relays:
add_new: Dodaj nov rele
@@ -386,6 +379,21 @@ sl:
custom_css:
desc_html: Spremeni videz z naloženim CSS na vsaki strani
title: CSS po meri
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
statuses:
pin_errors:
ownership: Trob nekoga drugega ne more biti pripet
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ea36a2189..6cab03332 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -5,11 +5,9 @@ sq:
about_mastodon_html: Mastodon-i është një rrjet shoqëror i bazuar në protokolle web të hapur dhe në software të lirë, me burim të hapur. Është i decentralizuar, si email-ii.
about_this: Mbi
administered_by: 'Administruar nga:'
- api: API
apps: Aplikacione për celular
contact: Kontakt
contact_missing: I parregulluar
- contact_unavailable: N/A
documentation: Dokumentim
extended_description_html: |
Një vend i mirë për rregulla
@@ -38,7 +36,6 @@ sq:
joined: U bë pjesë më %{date}
last_active: aktiv së fundi
link_verified_on: Pronësia e kësaj lidhjeje qe kontrolluar më %{date}
- media: Media
moved_html: "%{name} ka kaluar te %{new_profile_link}:"
network_hidden: Këto të dhëna nuk mund të kihen
nothing_here: S’ka gjë këtu!
@@ -54,8 +51,6 @@ sq:
reserved_username: Emri i përdoruesit është i ruajtur për dikë
roles:
admin: Përgjegjës
- bot: Bot
- moderator: Mod
unfollow: Resht së ndjekuri
admin:
account_actions:
@@ -68,7 +63,6 @@ sq:
destroyed_msg: Shënimi i moderimit u asgjësua me sukses!
accounts:
are_you_sure: A jeni i sigurt?
- avatar: Avatar
by_domain: Përkatësi
change_email:
changed_msg: Email-i i llogarisë u ndryshua me sukses!
@@ -88,7 +82,6 @@ sq:
display_name: Emër në ekran
domain: Përkatësi
edit: Përpunojeni
- email: Email
email_status: Gjendje email-i
enable: Aktivizoje
enabled: E aktivizuar
@@ -99,7 +92,6 @@ sq:
header: Krye
inbox_url: URL Mesazhesh të Marrë
invited_by: Ftuar nga
- ip: IP
joined: U bë pjesë
location:
all: Krejt
@@ -119,7 +111,7 @@ sq:
most_recent_activity: Veprimtaria më e freskët
most_recent_ip: IP-ja më e freskët
no_limits_imposed: Pa imponim kufijsh
- not_subscribed: Jo i pajtuar
+ not_subscribed: Jo i pajtuar
outbox_url: URL Mesazhesh të Dërguar
perform_full_suspension: Pezulloje
profile_url: URL profili
@@ -140,7 +132,6 @@ sq:
role: Leje
roles:
admin: Përgjegjës
- moderator: Moderator
staff: Staf
user: Përdorues
search: Kërkoni
@@ -160,7 +151,6 @@ sq:
unsubscribe: Shpajtohuni
username: Emër përdoruesi
warn: Sinjalizoje
- web: Web
action_logs:
actions:
assigned_to_self_report: "%{name} ia kaloi raportimin %{target} në ngarkim vetvetes"
@@ -234,7 +224,6 @@ sq:
recent_users: Përdorues së fundi
search: Kërko tekstin e plotë
single_user_mode: Mënyrë me përdorues të vetëm
- software: Software
space: Përdorim hapësire
title: Pult
total_users: përdorues gjithsej
@@ -430,8 +419,6 @@ sq:
nsfw_off: Vëri shenjë si jo rezervat
nsfw_on: Vëri shenjë si rezervat
failed_to_execute: S’u arrit të përmbushej
- media:
- title: Media
no_media: S’ka media
no_status_selected: S’u ndryshua ndonjë gjendje, ngaqë s’u përzgjodh ndonjë e tillë
title: Gjendje llogarish
@@ -441,13 +428,11 @@ sq:
confirmed: U ripohua
expires_in: Skadon më
last_delivery: Dorëzimi e fundit
- title: WebSub
topic: Temë
tags:
accounts: Llogari
hidden: Fshehur
hide: Fshihe prej drejtorie
- name: Hashtag
title: Hashtage
unhide: Shfaqe në drejtori
visible: E dukshme
@@ -465,7 +450,6 @@ sq:
subject: Raport i ri për %{instance} (#%{id})
application_mailer:
notification_preferences: Ndryshoni parapëlqime email-i
- salutation: "%{name},"
settings: 'Ndryshoni parapëlqime email-i: %{link}'
view: 'Parje:'
view_profile: Shihni Profilin
@@ -491,9 +475,6 @@ sq:
migrate_account: Kaloni në një tjetër llogari
migrate_account_html: Nëse doni ta ridrejtoni këtë llogari te një tjetër, këtë mund ta formësoni këtu.
or_log_in_with: Ose bëni hyrjen me
- providers:
- cas: CAS
- saml: SAML
register: Regjistrohuni
resend_confirmation: Ridërgo udhëzime ripohimi
reset_password: Ricaktoni fjalëkalimin
@@ -517,13 +498,9 @@ sq:
about_x_years: "%{count}v"
almost_x_years: "%{count}v"
half_a_minute: Mu tani
- less_than_x_minutes: "%{count}m"
less_than_x_seconds: Mu tani
over_x_years: "%{count}v"
- x_days: "%{count}d"
- x_minutes: "%{count}m"
x_months: "%{count}mj"
- x_seconds: "%{count}s"
deletes:
bad_password_msg: Provë e bukur, trimosha! Fjalëkalim i pasaktë
confirm_password: Jepni fjalëkalimin tuaj të tanishëm që të verifikohet identiteti juaj
@@ -539,9 +516,6 @@ sq:
explanation: Zbuloni përdorues bazuar në interesat e tyre
explore_mastodon: Eksploroni %{title}
how_to_enable: S’keni zgjedhur të jeni i pranishëm te drejtoria. Mund ta bëni më poshtë. Përdorni te teksti i jetëshkrimit tuaj hashtagë, për t’u përfshirë nën hashtagë specifikë!
- people:
- one: "%{count} person"
- other: "%{count} persona"
errors:
'403': S’keni leje të shihni këtë faqe.
'404': Faqja që po kërkonit, s’gjendet këtu.
@@ -563,7 +537,6 @@ sq:
request: Kërkoni arkivin tuaj
size: Madhësi
blocks: Bllokoni
- csv: CSV
domain_blocks: Bllokime përkatësish
follows: Ndiqni
lists: Lista
@@ -614,7 +587,6 @@ sq:
following: Listë ndjekjesh
muting: Listë heshtimesh
upload: Ngarkoje
- in_memoriam_html: In Memoriam.
invites:
delete: Çaktivizoje
expired: Ka skaduar
@@ -688,24 +660,15 @@ sq:
number:
human:
decimal_units:
- format: "%n%u"
units:
- billion: B
- million: M
quadrillion: K
- thousand: K
- trillion: T
pagination:
newer: Më të ri
next: Pasuesi
older: Më të vjetër
prev: I mëparshmi
- truncate: "…"
preferences:
- languages: Gjuhë
other: Tjetër
- publishing: Publikim
- web: Web
remote_follow:
acct: Jepni çiftin tuaj emërpërdoruesi@përkatësi prej të cilit doni që të veprohet
missing_resource: S’u gjet dot URL-ja e domosdoshme e ridrejtimit për llogarinë tuaj
@@ -735,40 +698,13 @@ sq:
activity: Veprimtaria e fundit
browser: Shfletues
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Shfletues i panjohur
- ie: Internet Explorer
- micro_messenger: MicroMessenger
nokia: Shfletues Nokia S40 Ovi
- opera: Opera
- otter: Otter
- phantom_js: PhantomJS
- qq: QQ Browser
- safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Sesioni i tanishëm
description: "%{browser} në %{platform}"
explanation: Këta janë shfletuesit e futur në këtë çast te llogaria juaj 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: platformë e panjohur
- windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Shfuqizoje
revoke_success: Sesioni u shfuqizua me sukses
title: Sesione
@@ -791,9 +727,6 @@ sq:
image:
one: "%{count} figurë"
other: "%{count} figura"
- video:
- one: "%{count} video"
- other: "%{count} video"
boosted_from_html: Përforcuar nga %{acct_link}
content_warning: 'Sinjalizim lënde: %{warning}'
disallowed_hashtags:
@@ -809,7 +742,6 @@ sq:
reblog: S’mund të fiksohet një përforcim
show_more: Shfaq më tepër
sign_in_to_participate: Bëni hyrjen, që të merrni pjesë te biseda
- title: '%{name}: "%{quote}"'
visibilities:
private: Vetëm ndjekësve
private_long: Shfaqua vetëm ndjekësve
@@ -827,10 +759,10 @@ sq:
Ç’të dhëna grumbullojmë?
-
Të dhëna bazë llogarie: Nëse regjistroheni në këtë shërbyes, mund t’ju kërkohet të jepni një emër përdoruesi, një adresë email dhe një fjalëkalim. Mundet të jepni edhe të dhëna shtesë profili, të tilla si emër në ekran dhe jetëshkrim, dhe të ngarkoni një foto profili dhe figurë kryesh. Emri i përdoruesit, emri për në ekran, jetëshkrimi, fotoja e profilit dhe figura për kryet shfaqen përherë publikisht.
-
Postime, ndjekje dhe të tjera të dhëna publike: Lista e personave që ndiqni shfaqet publikisht, po njësoj edhe ajo e ndjekësve tuaj. Kur parashtroni një mesazh, depozitohet data dhe koha, si dhe aplikacioni prej nga u parashtrua mesazhi. Mesazhet mund të përmbajnë bashkëngjitje media, bie fjala, foto dhe video. Postimet publike dhe ato të pashfaqura janë të passhme publikisht. Kur një postim e vini të zgjedhur në profilin tuaj, edhe ky është informacion i passhëm publikisht. Postimet tuaja janë u dërgohen ndjekësve tuaj, në disa raste kjo do të thotë se dërgohen në shërbyes të ndryshëm dhe në ta depozitohen kopje të tyre. Kur fshini postime, edhe kjo u dërgohet ndjekësve tuaj. Veprimi i riblogimit apo i parapëlqimit të një postimi tjetër është përherë publik.
-
Postime të drejtpërdrejta dhe ato vetëm për ndjekësit: Krejt postimet depozitohen dhe trajtohen te shërbyesi. Postimet vetëm për ndjekës u dërgohen ndjekësve tuaj të cilët përmenden në to, dhe postimet e drejtpërdrejta u dërgohen vetëm përdoruesve të përmendur në to. Në disa raste kjo do të thotë se dërgohen në shërbyes të ndryshëm dhe në ta depozitohen kopje të tyre. Përpiqemi pa hile të kufizojmë hyrjen në këto postime vetëm të personave të autorizuar, por shërbyesit e tjerë mund të mos bëjnë të njëjtën gjë. Ndaj është e rëndësishme të shqyrtoni shërbyesit pjesë e të cilëve janë ndjekësit tuaj. Te rregullimet mund të përdorni një mundësi për të miratuar ose hedhur poshtë dorazi ndjekës të rinj. Ju lutemi, mbani parasysh se operatorët e shërbyesit dhe cilido shërbyes marrës mund t’i shohin mesazhe të tillë, dhe që marrësit mund të bëjnë për ta foto ekrani, t’i kopjojnë ose t’i rindajnë ato me të tjerët. Mos u jepni të tjerëve të dhëna të rrezikshme përmes Mastodon-it.
-
IP dhe të tjera tejtëdhëna: Kur bëni hyrjen, regjistrojmë adresën IP prej nga hytë, si dhe emrin e shfletuesit tuaj. Krejt sesionet e hyrjeve janë të shqyrtueshme nga ju dhe shfuqizim, që nga rregullimet. Adresa e fundit IP e përdorur depozitohet për 12 muaj. Mund të mbajmë edhe regjistra shërbyesi të cilët përfshijnë adresën IP të çdo kërkese ndaj shërbyesit tonë.
+
Të dhëna bazë llogarie: Nëse regjistroheni në këtë shërbyes, mund t’ju kërkohet të jepni një emër përdoruesi, një adresë email dhe një fjalëkalim. Mundet të jepni edhe të dhëna shtesë profili, të tilla si emër në ekran dhe jetëshkrim, dhe të ngarkoni një foto profili dhe figurë kryesh. Emri i përdoruesit, emri për në ekran, jetëshkrimi, fotoja e profilit dhe figura për kryet shfaqen përherë publikisht.
+
Postime, ndjekje dhe të tjera të dhëna publike: Lista e personave që ndiqni shfaqet publikisht, po njësoj edhe ajo e ndjekësve tuaj. Kur parashtroni një mesazh, depozitohet data dhe koha, si dhe aplikacioni prej nga u parashtrua mesazhi. Mesazhet mund të përmbajnë bashkëngjitje media, bie fjala, foto dhe video. Postimet publike dhe ato të pashfaqura janë të passhme publikisht. Kur një postim e vini të zgjedhur në profilin tuaj, edhe ky është informacion i passhëm publikisht. Postimet tuaja janë u dërgohen ndjekësve tuaj, në disa raste kjo do të thotë se dërgohen në shërbyes të ndryshëm dhe në ta depozitohen kopje të tyre. Kur fshini postime, edhe kjo u dërgohet ndjekësve tuaj. Veprimi i riblogimit apo i parapëlqimit të një postimi tjetër është përherë publik.
+
Postime të drejtpërdrejta dhe ato vetëm për ndjekësit: Krejt postimet depozitohen dhe trajtohen te shërbyesi. Postimet vetëm për ndjekës u dërgohen ndjekësve tuaj të cilët përmenden në to, dhe postimet e drejtpërdrejta u dërgohen vetëm përdoruesve të përmendur në to. Në disa raste kjo do të thotë se dërgohen në shërbyes të ndryshëm dhe në ta depozitohen kopje të tyre. Përpiqemi pa hile të kufizojmë hyrjen në këto postime vetëm të personave të autorizuar, por shërbyesit e tjerë mund të mos bëjnë të njëjtën gjë. Ndaj është e rëndësishme të shqyrtoni shërbyesit pjesë e të cilëve janë ndjekësit tuaj. Te rregullimet mund të përdorni një mundësi për të miratuar ose hedhur poshtë dorazi ndjekës të rinj. Ju lutemi, mbani parasysh se operatorët e shërbyesit dhe cilido shërbyes marrës mund t’i shohin mesazhe të tillë, dhe që marrësit mund të bëjnë për ta foto ekrani, t’i kopjojnë ose t’i rindajnë ato me të tjerët. Mos u jepni të tjerëve të dhëna të rrezikshme përmes Mastodon-it.
+
IP dhe të tjera tejtëdhëna: Kur bëni hyrjen, regjistrojmë adresën IP prej nga hytë, si dhe emrin e shfletuesit tuaj. Krejt sesionet e hyrjeve janë të shqyrtueshme nga ju dhe shfuqizim, që nga rregullimet. Adresa e fundit IP e përdorur depozitohet për 12 muaj. Mund të mbajmë edhe regjistra shërbyesi të cilët përfshijnë adresën IP të çdo kërkese ndaj shërbyesit tonë.
@@ -840,9 +772,9 @@ sq:
Cilado prej të dhënave që grumbullojmë prej jush mund të përdoret në rrugët vijuese:
-
Për të mundësuar funksionimin bazë të Mastodon-it. Mundeni të ndërveproni me lëndën e personave të tjerë dhe të postoni lëndë tuajën vetëm kur jeni i futur në llogarinë tuaj. Për shembull, mund të ndiqni njerëz të tjerë për të parë postimet e tyre të ndërthurura te rrjedha juaj kohore e përshtatur.
-
Për të ndihmuar moderimin e bashkësisë, për shembull, duke krahasuar adresën tuaj IP me të tjera të njohura, për të përcaktuar shmangie nga dëbime ose cenime të tjera.
-
Adresa email që jepni mund të përdoret për t’ju dërguar informacion, njoftime mbi persona të tjerë që ndërveprojnë me lëndën tuaj ose që ju dërgojnë mesazhe, dhe për t’iu përgjigju pyetjeve dhe/ose kërkesave të tjera.
+
Për të mundësuar funksionimin bazë të Mastodon-it. Mundeni të ndërveproni me lëndën e personave të tjerë dhe të postoni lëndë tuajën vetëm kur jeni i futur në llogarinë tuaj. Për shembull, mund të ndiqni njerëz të tjerë për të parë postimet e tyre të ndërthurura te rrjedha juaj kohore e përshtatur.
+
Për të ndihmuar moderimin e bashkësisë, për shembull, duke krahasuar adresën tuaj IP me të tjera të njohura, për të përcaktuar shmangie nga dëbime ose cenime të tjera.
+
Adresa email që jepni mund të përdoret për t’ju dërguar informacion, njoftime mbi persona të tjerë që ndërveprojnë me lëndën tuaj ose që ju dërgojnë mesazhe, dhe për t’iu përgjigju pyetjeve dhe/ose kërkesave të tjera.
@@ -858,8 +790,8 @@ sq:
Do të përpiqemi pa hile:
-
Të mbajmë regjistra shërbyesi që përmbajnë adresën IP të krejt kërkesave te ky shërbyes, sa kohë që regjistra të tillë mbahen, për jo më shumë se 90 ditë.
-
Të mbajmë adresat IP përshoqëruar me përdoruesit e regjistruar, për jo më shumë se 12 muaj.
+
Të mbajmë regjistra shërbyesi që përmbajnë adresën IP të krejt kërkesave te ky shërbyes, sa kohë që regjistra të tillë mbahen, për jo më shumë se 90 ditë.
+
Të mbajmë adresat IP përshoqëruar me përdoruesit e regjistruar, për jo më shumë se 12 muaj.
Mund të kërkoni dhe të shkarkoni një arkiv të lëndës tuaj, përfshi postimet tuaja, bashkëngjitje media, foto profili, dhe figurë kryesh.
@@ -911,7 +843,6 @@ sq:
time:
formats:
default: "%d %b, %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: Që të bëhet ripohimi, jepni kodin e prodhuar nga aplikacioni juaj i mirëfilltësimeve
description_html: Nëse aktivizoni mirëfilltësimin dyfaktorësh, hyrja do të kërkojë të jeni në zotërim të telefonit tuaj, i cili do të prodhojë kod që duhet ta jepni.
diff --git a/config/locales/sr-Latn.rb b/config/locales/sr-Latn.rb
new file mode 100644
index 000000000..fc2dafc94
--- /dev/null
+++ b/config/locales/sr-Latn.rb
@@ -0,0 +1,3 @@
+require 'rails_i18n/common_pluralizations/romanian'
+
+::RailsI18n::Pluralization::Romanian.with_locale(:'sr-Latn')
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 2292b6a7f..3310716e0 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -6,7 +6,6 @@ sr-Latn:
about_this: O instanci
contact: Kontakt
contact_missing: Nije postavljeno
- contact_unavailable: N/A
extended_description_html: |
Dobro mesto za pravila
Prošireni opis koji još nije postavljen.
@@ -14,21 +13,15 @@ sr-Latn:
hosted_on: Mastodont hostovan na %{domain}
learn_more: Saznajte više
source_code: Izvorni kod
- status_count_after: statusa
status_count_before: Koji su napisali
- user_count_after: korisnika
user_count_before: Dom za
what_is_mastodon: Šta je Mastodont?
accounts:
- follow: Follow
- followers: Followers
- following: Following
media: Multimedija
moved_html: "%{name} je pomeren na %{new_profile_link}:"
nothing_here: Ovde nema ništa!
people_followed_by: Ljudi koje %{name} prati
people_who_follow: Ljudi koji prate %{name}
- posts: Tutovi
posts_with_replies: Tutovi i odgovori
reserved_username: Korisničko ime je rezervisano
roles:
@@ -63,7 +56,6 @@ sr-Latn:
followers_url: Adresa pratioca
follows: Praćeni
inbox_url: Adresa sandučeta
- ip: IP
location:
all: Sve
local: Lokalne
@@ -87,7 +79,6 @@ sr-Latn:
promote: Unapredi
protocol: Protokol
public: Javno
- push_subscription_expires: PuSH subscription expires
redownload: Osveži avatar
resend_confirmation:
already_confirmed: Ovaj korisnik je već potvrđen
@@ -98,8 +89,6 @@ sr-Latn:
resubscribe: Ponovo se pretplati
role: Ovlašćenja
roles:
- admin: Administrator
- moderator: Moderator
staff: Osoblje
user: Korisnik
salmon_url: Salmon adresa
@@ -187,7 +176,6 @@ sr-Latn:
show:
affected_accounts:
few: Utiče na %{count} naloga u bazi
- many: Utiče na %{count} naloga u bazi
one: Utiče na jedan nalog u bazi
other: Utiče na %{count} naloga u bazi
retroactive:
@@ -213,7 +201,6 @@ sr-Latn:
all: Sve
available: Aktivne
expired: Istekle
- title: Filter
title: Pozivnice
reports:
action_taken_by: Akciju izveo
@@ -225,7 +212,6 @@ sr-Latn:
reported_account: Prijavljeni nalog
reported_by: Prijavio
resolved: Rešeni
- status: Status
title: Prijave
unresolved: Nerešeni
settings:
@@ -278,19 +264,15 @@ sr-Latn:
title: Statusi naloga
with_media: Sa multimedijom
subscriptions:
- callback_url: Callback URL
confirmed: Potvrđeno
expires_in: Ističe za
last_delivery: Poslednja dostava
- title: WebSub
- topic: Topic
title: Administracija
admin_mailer:
new_report:
body: "%{reporter} je prijavio %{target}"
subject: Nova prijava za %{instance} (#%{id})
application_mailer:
- salutation: "%{name},"
settings: 'Promeni podešavanja e-pošte: %{link}'
view: 'Pogledaj:'
applications:
@@ -328,18 +310,13 @@ sr-Latn:
title: Zaprati %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
about_x_months: "%{count}mesec"
about_x_years: "%{count}god"
almost_x_years: "%{count}god"
half_a_minute: Upravo sad
- less_than_x_minutes: "%{count}m"
less_than_x_seconds: Upravo sad
over_x_years: "%{count}god"
- x_days: "%{count}d"
- x_minutes: "%{count}m"
x_months: "%{count}mesec"
- x_seconds: "%{count}s"
deletes:
bad_password_msg: Dobar pokušaj, hakeri! Neispravna lozinka
confirm_password: Unesite trenutnu lozinku da bismo proverili Vaš identitet
@@ -352,9 +329,7 @@ sr-Latn:
'403': Nemate dozvola da vidite ovu stranu.
'404': Strana koju ste tražili ne postoji.
'410': Strana koju ste tražili više ne postoji.
- '422':
- content: Security verification failed. Are you blocking cookies?
- title: Security verification failed
+ '422':
'429': Uspored
'500':
content: Izvinjavamo se, nešto je pošlo po zlu sa ove strane.
@@ -362,7 +337,6 @@ sr-Latn:
noscript_html: Da biste koristili Mastodont veb aplikaciju, omogućite JavaScript. U suprotnom, probajte neku od originalnih aplikacija za Mastodont za Vašu platformu.
exports:
blocks: Blokirali ste
- csv: CSV
follows: Pratite
mutes: Ućutkali ste
storage: Multimedijalno skladište
@@ -371,7 +345,6 @@ sr-Latn:
save_changes: Snimi izmene
validation_errors:
few: Nešto nije baš kako treba! Pregledajte %{count} greške ispod
- many: Nešto nije baš kako treba! Pregledajte %{count} grešaka ispod
one: Nešto nije baš kako treba! Pregledajte greške ispod
other: Nešto nije baš kako treba! Pregledajte %{count} grešaka ispod
imports:
@@ -382,7 +355,6 @@ sr-Latn:
following: Lista pratilaca
muting: Lista ućutkanih
upload: Otpremi
- in_memoriam_html: In Memoriam.
invites:
delete: Deaktiviraj
expired: Isteklo
@@ -391,12 +363,12 @@ sr-Latn:
'21600': 6 sati
'3600': 1 sad
'43200': 12 sati
+ '604800': 1 week
'86400': 1 dan
expires_in_prompt: Nikad
generate: Generiši
max_uses:
few: "%{count} korišćenja"
- many: "%{count} korišćenja"
one: 1 korišćenje
other: "%{count} korišćenja"
max_uses_prompt: Bez ograničenja
@@ -425,12 +397,10 @@ sr-Latn:
mention: "%{name} Vas je pomenuo u:"
new_followers_summary:
few: Dobili ste %{count} nova pratioca! Sjajno!
- many: Dobili ste %{count} novih pratioca! Sjajno!
one: Dobili ste jednog novog pratioca! Jeee!
other: Dobili ste %{count} novih pratioca! Sjajno!
subject:
few: "%{count} nova obaveštenja od poslednje posete \U0001F418"
- many: "%{count} novih obaveštenja od poslednje posete \U0001F418"
one: "1 novo obaveštenje od poslednje posete \U0001F418"
other: "%{count} novih obaveštenja od poslednje posete \U0001F418"
favourite:
@@ -448,26 +418,11 @@ sr-Latn:
reblog:
body: "%{name} Vam je podržao(la) status:"
subject: "%{name} je podržao(la) Vaš status"
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
next: Sledeći
prev: Prethodni
- truncate: "…"
preferences:
- languages: Jezici
other: Ostali
- publishing: Objavljivanje
- web: Veb
remote_follow:
acct: Unesite Vaš korisnik@domen sa koga želite da pratite
missing_resource: Ne mogu da nađem zahtevanu adresu preusmeravanja za Vaš nalog
@@ -477,32 +432,18 @@ sr-Latn:
activity: Poslednja aktivnost
browser: Veb čitač
browsers:
- alipay: Alipay
blackberry: Blekberi
chrome: Hrom
- edge: Microsoft Edge
- firefox: Firefox
generic: Nepoznati veb čitač
- 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: Trenutna sesija
description: "%{browser} sa %{platform}"
explanation: Ovo su trenutno prijavljeni veb čitači na Vaš Mastodont nalog.
- ip: IP
platforms:
adobe_air: Adobe Air-a
android: Androida
blackberry: Blekberija
chrome_os: Hrom OS-a
firefox_os: Fajerfoks OS-a
- ios: iOS
linux: Linuksa
mac: Mac-a
other: nepoznate platforme
@@ -533,7 +474,6 @@ sr-Latn:
private: Tutovi koji nisu javni ne mogu da se prikače
reblog: Podrška ne može da se prikači
show_more: Prikaži još
- title: '%{name}: "%{quote}"'
visibilities:
private: Samo pratioci
private_long: Samo prikaži pratiocima
@@ -549,9 +489,6 @@ sr-Latn:
title: Uslovi korišćenja i politika privatnosti instance %{instance}
themes:
default: Mastodont
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
two_factor_authentication:
code_hint: Unesite kod sa Vaše aplikacije za proveru identiteta da potvrdite
description_html: Ako uključite dvofaktorsku identifikaciju, moraćete da imate telefon sa sobom da biste mogli da se prijavite. Telefon će onda generisati tokene za Vašu prijavu.
diff --git a/config/locales/sr.rb b/config/locales/sr.rb
new file mode 100644
index 000000000..86b89a07e
--- /dev/null
+++ b/config/locales/sr.rb
@@ -0,0 +1,3 @@
+require 'rails_i18n/common_pluralizations/romanian'
+
+::RailsI18n::Pluralization::Romanian.with_locale(:sr)
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2bf9001ce..1555fb235 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -5,11 +5,9 @@ sr:
about_mastodon_html: Мастодон је друштвена мрежа базирана на отвореним протоколима и слободном софтверу отвореног кода. Децентрализована је као што је децентрализована е-пошта.
about_this: О инстанци
administered_by: 'Администрирано од стране:'
- api: API
apps: Мобилне апликације
contact: Контакт
contact_missing: Није постављено
- contact_unavailable: N/A
documentation: Документација
extended_description_html: |
Добро место за правила
@@ -21,14 +19,12 @@ sr:
source_code: Изворни код
status_count_after:
few: статуси
- many: статуси
one: статус
other: статуса
status_count_before: Који су написали
terms: Услови коришћења
user_count_after:
few: корисници
- many: корисници
one: корисник
other: корисника
user_count_before: Дом за
@@ -38,7 +34,6 @@ sr:
follow: Запрати
followers:
few: Пратиоци
- many: Пратиоци
one: Пратиоц
other: Пратиоци
following: Пратим
@@ -55,7 +50,6 @@ sr:
following: Морате пратити ову особу ако хоћете да потврдите
posts:
few: Трубе
- many: Трубе
one: Труба
other: Трубе
posts_tab_heading: Трубе
@@ -108,7 +102,6 @@ sr:
header: Заглавље
inbox_url: Адреса сандучета
invited_by: Позван од стране
- ip: IP
joined: Придружио се
location:
all: Све
@@ -278,7 +271,6 @@ sr:
show:
affected_accounts:
few: Утиче на %{count} налога у бази
- many: Утиче на %{count} налога у бази
one: Један налог у бази података је под утицајем
other: Утиче на %{count} налога у бази података
retroactive:
@@ -304,7 +296,6 @@ sr:
delivery_available: Достава је доступна
known_accounts:
few: "%{count} знаних налога"
- many: "%{count} знаних налога"
one: "%{count} знан налог"
other: "%{count} знаних налога"
moderation:
@@ -450,12 +441,9 @@ sr:
title: Статуси налога
with_media: Са мултимедијом
subscriptions:
- callback_url: Callback URL
confirmed: Потврђено
expires_in: Истиче за
last_delivery: Последња достава
- title: WebSub
- topic: Topic
tags:
accounts: Налози
hidden: Скривено
@@ -478,7 +466,6 @@ sr:
subject: Нова пријава за %{instance} (#%{id})
application_mailer:
notification_preferences: Промени преференце Е-поште
- salutation: "%{name},"
settings: 'Промени подешавања е-поште: %{link}'
view: 'Погледај:'
view_profile: Погледај профил
@@ -525,18 +512,14 @@ sr:
title: Запрати %{acct}
datetime:
distance_in_words:
- about_x_hours: "%{count}h"
about_x_months: "%{count}месец"
about_x_years: "%{count}год"
almost_x_years: "%{count}год"
half_a_minute: Управо сад
- less_than_x_minutes: "%{count}m"
less_than_x_seconds: Управо сад
over_x_years: "%{count}год"
x_days: "%{count}д"
- x_minutes: "%{count}m"
x_months: "%{count}месец"
- x_seconds: "%{count}s"
deletes:
bad_password_msg: Добар покушај, хакери! Неисправна лозинка
confirm_password: Унесите тренутну лозинку да бисмо проверили Ваш идентитет
@@ -552,7 +535,6 @@ sr:
explore_mastodon: Истражи %{title}
people:
few: "%{count} људе"
- many: "%{count} људе"
one: "%{count} особа/е"
other: "%{count} људи"
errors:
@@ -576,7 +558,6 @@ sr:
request: Затражите Вашу архиву
size: Величина
blocks: Блокирали сте
- csv: CSV
domain_blocks: Блокови домена
follows: Пратите
lists: Листе
@@ -608,7 +589,6 @@ sr:
save_changes: Сними измене
validation_errors:
few: Нешто није баш како треба! Прегледајте %{count} грешке испод
- many: Нешто није баш како треба! Прегледајте %{count} грешака испод
one: Нешто није баш како треба! Прегледајте грешке испод
other: Нешто није баш како треба! Прегледајте %{count} грешака испод
imports:
@@ -619,7 +599,6 @@ sr:
following: Листа пратилаца
muting: Листа ућутканих
upload: Отпреми
- in_memoriam_html: In Memoriam.
invites:
delete: Деактивирај
expired: Истекло
@@ -635,7 +614,6 @@ sr:
invited_by: 'Позвао Вас је:'
max_uses:
few: "%{count} коришћења"
- many: "%{count} коришћења"
one: 1 коришћење
other: "%{count} коришћења"
max_uses_prompt: Без ограничења
@@ -665,12 +643,10 @@ sr:
mention: "%{name} Вас је поменуо у:"
new_followers_summary:
few: Добили сте %{count} нова пратиоца! Сјајно!
- many: Добили сте %{count} нових пратиоца! Сјајно!
one: Добили сте једног новог пратиоца! Јеее!
other: Добили сте %{count} нових пратиоца! Сјајно!
subject:
few: "%{count} нова обавештења од последње посете \U0001F418"
- many: "%{count} нових обавештења од последње посете \U0001F418"
one: "1 ново обавештење од последње посете \U0001F418"
other: "%{count} нових обавештења од последње посете \U0001F418"
title: Док нисте били ту...
@@ -696,28 +672,13 @@ sr:
body: "%{name} Вам је подржао/ла статус:"
subject: "%{name} је подржао/ла Ваш статус"
title: Нова подршка
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
newer: Новије
next: Следеће
older: Старије
prev: Претходни
- truncate: "…"
preferences:
- languages: Језици
other: Остало
- publishing: Објављивање
- web: Веб
remote_follow:
acct: Унесите Ваш корисник@домен са кога желите да пратите
missing_resource: Не могу да нађем захтевану адресу преусмеравања за Ваш налог
@@ -764,7 +725,6 @@ sr:
current_session: Тренутна сесија
description: "%{browser} са %{platform}"
explanation: Ово су веб претраживачи који су тренутно пријављени на Ваш Мастодон налог.
- ip: IP
platforms:
adobe_air: Адоб Ер-а
android: Андроида
@@ -798,19 +758,16 @@ sr:
description: 'У прилогу: %{attached}'
image:
few: "%{count} слика"
- many: "%{count} слика"
one: "%{count} слику"
other: "%{count} слика"
video:
few: "%{count} видео записа"
- many: "%{count} видео записа"
one: "%{count} видео запис"
other: "%{count} видео записа"
boosted_from_html: Подржано од %{acct_link}
content_warning: 'Упозорење на садржај: %{warning}'
disallowed_hashtags:
few: 'садржи забрањене хештегове: %{tags}'
- many: 'садржи забрањене хештегове: %{tags}'
one: 'садржи забрањени хештег: %{tags}'
other: 'садржи забрањене хештегове: %{tags}'
language_detection: Аутоматскo откривање језика
@@ -823,7 +780,6 @@ sr:
reblog: Подршка не може да се прикачи
show_more: Прикажи још
sign_in_to_participate: Пријавите се да учествујете у разговору
- title: '%{name}: "%{quote}"'
visibilities:
private: Само пратиоци
private_long: Прикажи само пратиоцима
@@ -841,10 +797,6 @@ sr:
contrast: Велики контраст
default: Мастодон
mastodon-light: Мастодон (светло)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
code_hint: Да бисте потврдили, унесите код генерисан од стране ваше апликације за потврду идентитета
description_html: Ако укључите двофакторску идентификацију, мораћете да имате телефон са собом да бисте могли да се пријавите. Телефон ће онда генерисати токене за Вашу пријаву.
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 91d4c2496..d3d0cb888 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -5,9 +5,9 @@ sv:
about_mastodon_html: Mastodon är ett socialt nätverk baserat på öppna webbprotokoll och gratis, öppen källkodsprogramvara. Det är decentraliserat som e-post.
about_this: Om
administered_by: 'Administreras av:'
+ api: API
contact: Kontakt
contact_missing: Inte inställd
- contact_unavailable: N/A
extended_description_html: |
En bra plats för regler
Den utökade beskrivningen har inte konfigurerats ännu.
@@ -15,14 +15,12 @@ sv:
hosted_on: Mastodon värd på %{domain}
learn_more: Lär dig mer
source_code: Källkod
- status_count_after: statusar
status_count_before: Som skapat
- user_count_after: användare
+ terms: Användarvillkor
user_count_before: Hem till
what_is_mastodon: Vad är Mastodon?
accounts:
follow: Följa
- followers: Följare
following: Följer
media: Media
moved_html: "%{name} har flyttat till %{new_profile_link}:"
@@ -30,12 +28,9 @@ sv:
nothing_here: Det finns inget här!
people_followed_by: Personer som %{name} följer
people_who_follow: Personer som följer %{name}
- posts: Toots
posts_with_replies: Toots med svar
reserved_username: Användarnamnet är reserverat
roles:
- admin: Admin
- bot: Bot
moderator: Moderator
unfollow: Sluta följa
admin:
@@ -46,7 +41,6 @@ sv:
destroyed_msg: Modereringsnotering borttagen utan problem!
accounts:
are_you_sure: Är du säker?
- avatar: Avatar
by_domain: Domän
change_email:
changed_msg: E-postadressen har ändrats!
@@ -74,7 +68,6 @@ sv:
followers_url: Följare URL
follows: Följs
inbox_url: Inkorgs URL
- ip: IP
location:
all: Alla
local: Lokal
@@ -111,7 +104,6 @@ sv:
role: Behörigheter
roles:
admin: Administratör
- moderator: Moderator
staff: Personal
user: Användare
salmon_url: Lax URL
@@ -171,7 +163,6 @@ sv:
destroyed_msg: Emojo borttagen utan problem!
disable: Inaktivera
disabled_msg: Inaktiverade emoji utan problem
- emoji: Emoji
enable: Aktivera
enabled_msg: Aktiverade den emoji utan problem
image_hint: PNG upp till 50KB
@@ -259,7 +250,6 @@ sv:
reported_by: Anmäld av
resolved: Löst
resolved_msg: Anmälan har lösts framgångsrikt!
- status: Status
title: Anmälningar
unassign: Otilldela
unresolved: Olösta
@@ -320,8 +310,6 @@ sv:
nsfw_off: Markera som ej känslig
nsfw_on: Markera som känslig
failed_to_execute: Misslyckades att utföra
- media:
- title: Media
no_media: Ingen media
title: Kontostatus
with_media: med media
@@ -330,9 +318,7 @@ sv:
confirmed: Bekräftad
expires_in: Utgår om
last_delivery: Sista leverans
- title: WebSub
topic: Ämne
- title: Administration
admin_mailer:
new_report:
body: "%{reporter} har rapporterat %{target}"
@@ -340,7 +326,6 @@ sv:
subject: Ny rapport för %{instance} (#%{id})
application_mailer:
notification_preferences: Ändra e-postinställningar
- salutation: "%{name},"
settings: 'Ändra e-postinställningar: %{link}'
view: 'Granska:'
view_profile: Visa profil
@@ -395,7 +380,6 @@ sv:
less_than_x_minutes: "%{count}min"
less_than_x_seconds: Just nu
over_x_years: "%{count}år"
- x_days: "%{count}d"
x_minutes: "%{count}min"
x_months: "%{count}mån"
x_seconds: "%{count}sek"
@@ -517,28 +501,13 @@ sv:
body: 'Din status knuffades av %{name}:'
subject: "%{name} knuffade din status"
title: Ny knuff
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: " "
pagination:
newer: Nyare
next: Nästa
older: Äldre
prev: Tidigare
- truncate: "…"
preferences:
- languages: Språk
other: Annat
- publishing: Publicering
- web: Webb
remote_follow:
acct: Ange ditt användarnamn@domän du vill följa från
missing_resource: Det gick inte att hitta den begärda omdirigeringsadressen för ditt konto
@@ -552,23 +521,16 @@ sv:
activity: Senaste aktivitet
browser: Webbläsare
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
edge: Microsoft Edge
electron: Electron
firefox: Firefox
generic: Okänd browser
ie: Internet Explorer
micro_messenger: MicroMessenger
- nokia: Nokia S40 Ovi Browser
opera: Opera
otter: Otter
phantom_js: PhantomJS
- qq: QQ Browser
safari: Safari
- uc_browser: UCBrowser
- weibo: Weibo
current_session: Nuvarande session
description: "%{browser} på %{platform}"
explanation: Detta är inloggade webbläsare på Mastodon just nu.
@@ -584,8 +546,6 @@ sv:
mac: Mac
other: okänd plattform
windows: Windows
- windows_mobile: Windows Mobile
- windows_phone: Windows Phone
revoke: Återkalla
revoke_success: Sessionen återkallas framgångsrikt
title: Sessioner
@@ -596,7 +556,6 @@ sv:
development: Utveckling
edit_profile: Redigera profil
export: Exportera data
- import: Import
migrate: Kontoflytt
notifications: Meddelanden
preferences: Inställningar
@@ -607,9 +566,6 @@ sv:
image:
one: "%{count} bild"
other: "%{count} bilder"
- video:
- one: "%{count} video"
- other: "%{count} videor"
boosted_from_html: Boosted från %{acct_link}
content_warning: 'Innehållsvarning: %{warning}'
disallowed_hashtags:
@@ -624,7 +580,6 @@ sv:
private: Icke-offentliga toot kan inte fästas
reblog: Knuffar kan inte fästas
show_more: Visa mer
- title: '%{name}: "%{quote}"'
visibilities:
private: Endast följare
private_long: Visa endast till följare
@@ -642,10 +597,10 @@ sv:
Vilken information samlar vi in?
-
Grundläggande kontoinformation: Det användarnamn du väljer, visningsnamn, biografi, avatar/profilbild och bakgrundsbild kommer alltid vara tillgängliga för alla som kan nå webbsidan.
-
Inlägg, vem du följer och annan tillgänglig information: Dina följare och de konton du följer är alltid tillgängliga. När du skapar ett nytt inlägg sparas datum och tid för meddelandet, samt vilket program du använde för att skapa inlägget. Detta gäller även bilder och media som inlägg kan innehålla.Både "Publika" och "Olistade" inlägg kan vara tillgängliga för alla som har åtkomst till webbsidan. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
-
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
-
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
+
Grundläggande kontoinformation: Det användarnamn du väljer, visningsnamn, biografi, avatar/profilbild och bakgrundsbild kommer alltid vara tillgängliga för alla som kan nå webbsidan.
+
Inlägg, vem du följer och annan tillgänglig information: Dina följare och de konton du följer är alltid tillgängliga. När du skapar ett nytt inlägg sparas datum och tid för meddelandet, samt vilket program du använde för att skapa inlägget. Detta gäller även bilder och media som inlägg kan innehålla.Både "Publika" och "Olistade" inlägg kan vara tillgängliga för alla som har åtkomst till webbsidan. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
+
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Mastodon.
+
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
@@ -655,9 +610,9 @@ sv:
Any of the information we collect from you may be used in the following ways:
-
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
-
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
-
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
+
To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
+
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
+
The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
@@ -673,8 +628,8 @@ sv:
We will make a good faith effort to:
-
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
-
Retain the IP addresses associated with registered users no more than 12 months.
+
Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
+
Retain the IP addresses associated with registered users no more than 12 months.
You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
@@ -723,9 +678,6 @@ sv:
contrast: Hög kontrast
default: Mastodon
mastodon-light: Mastodon (ljust)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
two_factor_authentication:
code_hint: Ange koden som genererats av din autentiseringsapp för att bekräfta
description_html: Om du aktiverar tvåstegsautentisering kommer inloggningen kräva att du har din telefon tillgänglig, vilket kommer att generera tokens för dig att uppge.
@@ -762,7 +714,6 @@ sv:
tip_following: Du följer din servers administratör(er) som standard. För att hitta fler intressanta personer, kolla de lokala och förenade tidslinjerna.
tip_local_timeline: Den lokala tidslinjen är en störtflodsvy av personer på %{instance}. Det här är dina närmaste grannar!
tip_mobile_webapp: Om din mobila webbläsare erbjuder dig att lägga till Mastodon till ditt hemskärm kan du få push-meddelanden. Det fungerar som en inbyggd app på många sätt!
- tips: Tips
title: Välkommen ombord, %{name}!
users:
invalid_email: E-postadressen är ogiltig
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
new file mode 100644
index 000000000..eef06fa7c
--- /dev/null
+++ b/config/locales/ta.yml
@@ -0,0 +1,17 @@
+---
+ta:
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 1dfc87060..d4a2f507d 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -5,7 +5,6 @@ te:
about_mastodon_html: మాస్టొడాన్ అనేది ఒక సామాజిక మాధ్యమం. ఇది పూర్తిగా ఉచితం మరియు స్వేచ్ఛా సాఫ్టువేరు. ఈమెయిల్ లాగానే ఇది వికేంద్రీకరించబడినది.
about_this: గురించి
administered_by: 'నిర్వహణలో:'
- api: API
apps: మొబైల్ యాప్స్
contact: సంప్రదించండి
contact_missing: ఇంకా సెట్ చేయలేదు
@@ -96,9 +95,7 @@ te:
followers: అనుచరులు
followers_url: అనుచరుల URL
follows: అనుసరిస్తున్నారు
- header: Header
inbox_url: ఇన్ బాక్స్ URL
- ip: IP
location:
all: అన్నీ
local: లోకల్
@@ -106,7 +103,6 @@ te:
title: లొకేషన్
login_status: లాగిన్ స్థితి
media_attachments: మీడియా అటాచ్మెంట్లు
- memorialize: Turn into memoriam
moderation:
active: యాక్టివ్
all: అన్నీ
@@ -116,3 +112,18 @@ te:
moderation_notes: మోడరేషన్ నోట్స్
most_recent_activity: ఇటీవల యాక్టివిటీ
most_recent_ip: ఇటీవలి IP
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you are looking for isn't here.
+ '410': The page you were looking for doesn't exist here anymore.
+ '422':
+ '429': Throttled
+ '500':
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2ebd6c7f1..7a16bc2f3 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -23,21 +23,21 @@ th:
get_apps: ลองแอปสำหรับมือถือ
learn_more: เรียนรู้เพิ่มเติม
privacy_policy: นโยบายความเป็นส่วนตัว
+ see_whats_happening: ดูสิ่งที่กำลังเกิดขึ้น
server_stats: 'สถิติเซิร์ฟเวอร์:'
source_code: โค้ดต้นฉบับ
status_count_after:
- one: สถานะ
other: สถานะ
status_count_before: ผู้สร้าง
+ terms: เงื่อนไขการให้บริการ
user_count_after:
- one: ผู้ใช้
other: ผู้ใช้
user_count_before: บ้านของ
what_is_mastodon: Mastodon คืออะไร?
accounts:
+ choices_html: 'ทางเลือกของ %{name}:'
follow: ติดตาม
followers:
- one: ผู้ติดตาม
other: ผู้ติดตาม
following: กำลังติดตาม
joined: เข้าร่วมเมื่อ %{date}
@@ -49,7 +49,6 @@ th:
people_followed_by: ผู้คนที่ %{name} ติดตาม
people_who_follow: ผู้คนที่ติดตาม %{name}
posts:
- one: โพสต์
other: โพสต์
posts_tab_heading: โพสต์
posts_with_replies: โพสต์และการตอบกลับ
@@ -57,6 +56,7 @@ th:
admin: ผู้ดูแล
bot: บอต
moderator: ผู้ควบคุม
+ unavailable: ไม่มีโปรไฟล์
unfollow: เลิกติดตาม
admin:
account_moderation_notes:
@@ -65,6 +65,7 @@ th:
destroyed_msg: ทำลายหมายเหตุการควบคุมสำเร็จ!
accounts:
approve: อนุมัติ
+ approve_all: อนุมัติทั้งหมด
are_you_sure: คุณแน่ใจหรือไม่?
avatar: ภาพประจำตัว
by_domain: โดเมน
@@ -83,7 +84,7 @@ th:
disable: ปิดใช้งาน
disable_two_factor_authentication: ปิดใช้งาน 2FA
disabled: ปิดใช้งานอยู่
- display_name: ชื่อที่แสดงผล
+ display_name: ชื่อที่แสดง
domain: โดเมน
edit: แก้ไข
email: อีเมล
@@ -93,7 +94,7 @@ th:
feed_url: URL ฟีด
followers: ผู้ติดตาม
followers_url: URL ผู้ติดตาม
- follows: ติดตาม
+ follows: การติดตาม
header: ส่วนหัว
inbox_url: URL กล่องขาเข้า
invited_by: เชิญโดย
@@ -121,7 +122,9 @@ th:
protocol: โปรโตคอล
public: สาธารณะ
push_subscription_expires: การบอกรับ PuSH หมดอายุเมื่อ
+ redownload: รีเฟรชโปรไฟล์
reject: ปฏิเสธ
+ reject_all: ปฏิเสธทั้งหมด
remove_avatar: เอาภาพประจำตัวออก
remove_header: เอาส่วนหัวออก
resend_confirmation:
@@ -130,12 +133,12 @@ th:
success: ส่งอีเมลยืนยันสำเร็จ!
reset_password: ตั้งรหัสผ่านใหม่
resubscribe: บอกรับใหม่
+ role: สิทธิอนุญาต
roles:
admin: ผู้ดูแล
moderator: ผู้ควบคุม
staff: พนักงาน
user: ผู้ใช้
- salmon_url: Salmon URL
search: ค้นหา
show:
created_reports: รายงานที่สร้าง
@@ -160,9 +163,13 @@ th:
copy: คัดลอก
created_msg: สร้างอีโมจิสำเร็จ!
delete: ลบ
+ destroyed_msg: ทำลายอีโมโจสำเร็จ!
disable: ปิดใช้งาน
+ disabled_msg: ปิดใช้งานอีโมจินั้นสำเร็จ
emoji: อีโมจิ
enable: เปิดใช้งาน
+ enabled_msg: เปิดใช้งานอีโมจินั้นสำเร็จ
+ image_hint: PNG สูงสุด 50KB
new:
title: เพิ่มอีโมจิที่กำหนดเองใหม่
overwrite: เขียนทับ
@@ -178,6 +185,7 @@ th:
feature_invites: ลิงก์เชิญ
feature_profile_directory: ไดเรกทอรีโปรไฟล์
feature_registrations: การลงทะเบียน
+ feature_timeline_preview: ตัวอย่างเส้นเวลา
features: คุณลักษณะ
open_reports: รายงานที่เปิด
recent_users: ผู้ใช้ล่าสุด
@@ -213,7 +221,6 @@ th:
suspend: ระงับอยู่
show:
affected_accounts:
- one: มีผลต่อหนึ่งบัญชีในฐานข้อมูล
other: มีผลต่อ %{count} บัญชีในฐานข้อมูล
retroactive:
silence: เลิกเงียบบัญชีที่มีอยู่ทั้งหมดจากโดเมนนี้
@@ -249,6 +256,7 @@ th:
enable: เปิดใช้งาน
enabled: เปิดใช้งานอยู่
inbox_url: URL รีเลย์
+ save_and_enable: บันทึกแล้วเปิดใช้งาน
status: สถานะ
title: รีเลย์
report_notes:
@@ -288,7 +296,7 @@ th:
title: เปิดใช้งานไดเรกทอรีโปรไฟล์
registrations:
closed_message:
- desc_html: แสดงผลในหน้าแรกเมื่อปิดการลงทะเบียน คุณสามารถใช้แท็ก HTML
+ desc_html: แสดงในหน้าแรกเมื่อปิดการลงทะเบียน คุณสามารถใช้แท็ก HTML
title: ข้อความการปิดการลงทะเบียน
deletion:
desc_html: อนุญาตให้ใครก็ตามลบบัญชีของเขา
@@ -305,7 +313,7 @@ th:
desc_html: แสดงป้ายพนักงานในหน้าผู้ใช้
title: แสดงป้ายพนักงาน
site_description:
- desc_html: ย่อหน้าเกริ่นนำในหน้าแรก อธิบายถึงสิ่งที่ทำให้เซิร์ฟเวอร์ Mastodon นี้พิเศษและสิ่งอื่นใดที่สำคัญ คุณสามารถใช้แท็ก HTML โดยเฉพาะอย่างยิ่ง <a> และ <em>
+ desc_html: ย่อหน้าเกริ่นนำใน API อธิบายถึงสิ่งที่ทำให้เซิร์ฟเวอร์ Mastodon นี้พิเศษและสิ่งอื่นใดที่สำคัญ คุณสามารถใช้แท็ก HTML โดยเฉพาะอย่างยิ่ง <a> และ <em>
title: คำอธิบายเซิร์ฟเวอร์
site_description_extended:
desc_html: สถานที่ที่ดีสำหรับแนวทางปฏิบัติ, กฎ, หลักเกณฑ์ และสิ่งอื่น ๆ ของคุณที่ทำให้เซิร์ฟเวอร์ของคุณแตกต่าง คุณสามารถใช้แท็ก HTML
@@ -349,6 +357,10 @@ th:
edit: แก้ไข
edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
title: จัดการคำเตือนที่ตั้งไว้ล่วงหน้า
+ appearance:
+ advanced_web_interface: ส่วนติดต่อเว็บขั้นสูง
+ animations_and_accessibility: ภาพเคลื่อนไหวและการช่วยการเข้าถึง
+ sensitive_content: เนื้อหาที่ละเอียดอ่อน
application_mailer:
notification_preferences: เปลี่ยนการกำหนดลักษณะอีเมล
settings: 'เปลี่ยนการกำหนดลักษณะอีเมล: %{link}'
@@ -362,7 +374,6 @@ th:
change_password: รหัสผ่าน
confirm_email: ยืนยันอีเมล
delete_account: ลบบัญชี
- didnt_get_confirmation: Didn't receive confirmation instructions?
forgot_password: ลืมรหัสผ่านของคุณ?
login: เข้าสู่ระบบ
logout: ออกจากระบบ
@@ -379,8 +390,8 @@ th:
trouble_logging_in: มีปัญหาในการเข้าสู่ระบบ?
authorize_follow:
already_following: คุณกำลังติดตามบัญชีนี้อยู่แล้ว
- error: Unfortunately, there was an error looking up the remote account
follow: ติดตาม
+ follow_request: 'คุณได้ส่งคำขอติดตามไปยัง:'
following: 'สำเร็จ! คุณกำลังติดตาม:'
post_follow:
return: แสดงโปรไฟล์ของผู้ใช้
@@ -408,7 +419,7 @@ th:
explanation: ค้นพบผู้ใช้ตามความสนใจของเขา
explore_mastodon: สำรวจ %{title}
errors:
- '403': คุณไม่มีสิทธิดูหน้านี้
+ '403': คุณไม่มีสิทธิอนุญาตเพื่อดูหน้านี้
'404': หน้าที่คุณกำลังมองหาไม่ได้อยู่ที่นี่
'410': หน้าที่คุณกำลังมองหาไม่มีอยู่ที่นี่อีกต่อไป
'422':
@@ -454,15 +465,13 @@ th:
changes_saved_msg: บันทึกการเปลี่ยนแปลงสำเร็จ!
copy: คัดลอก
save_changes: บันทึกการเปลี่ยนแปลง
- validation_errors:
- one: Something isn't quite right yet! Please review the error below
- other: Something isn't quite right yet! Please review %{count} errors below
+ identity_proofs:
+ authorize: ใช่ อนุญาต
imports:
modes:
merge: ผสาน
overwrite: เขียนทับ
preface: You can import certain data like all the people you are following or blocking into your account on this instance, from files created by an export on another instance.
- success: Your data was successfully uploaded and will now be processed in due time
types:
blocking: รายการปิดกั้น
following: รายการติดตาม
@@ -495,14 +504,10 @@ th:
notification_mailer:
digest:
action: ดูการแจ้งเตือนทั้งหมด
- body: Here is a brief summary of the messages you missed since your last visit on %{since}
mention: "%{name} ได้กล่าวถึงคุณใน:"
new_followers_summary:
- one: นอกจากนี้คุณยังมีหนึ่งผู้ติดตามใหม่ขณะที่ไม่อยู่! เย่!
other: You have gotten %{count} new followers! Amazing!
- subject:
- one: "1 new notification since your last visit \U0001F418"
- other: "%{count} new notifications since your last visit \U0001F418"
+ title: เมื่อคุณไม่อยู่...
favourite:
body: 'สถานะของคุณได้รับการชื่นชอบโดย %{name}:'
subject: "%{name} ได้ชื่นชอบสถานะของคุณ"
@@ -525,17 +530,6 @@ th:
body: 'สถานะของคุณได้รับการดันโดย %{name}:'
subject: "%{name} ได้ดันสถานะของคุณ"
title: การดันใหม่
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
newer: ใหม่กว่า
next: ถัดไป
@@ -543,12 +537,11 @@ th:
prev: ก่อนหน้า
truncate: "…"
preferences:
- languages: ภาษา
- other: อื่น ๆ
- publishing: การเผยแพร่
- web: เว็บ
+ posting_defaults: ค่าเริ่มต้นการโพสต์
+ public_timelines: เส้นเวลาสาธารณะ
relationships:
activity: กิจกรรมบัญชี
+ last_active: ใช้งานล่าสุด
relationship: ความสัมพันธ์
remove_selected_domains: เอาผู้ติดตามทั้งหมดออกจากโดเมนที่เลือก
remove_selected_followers: เอาผู้ติดตามที่เลือกออก
@@ -556,7 +549,6 @@ th:
status: สถานะบัญชี
remote_follow:
acct: ป้อน username@domain ของคุณที่คุณต้องการกระทำจาก
- missing_resource: Could not find the required redirect URL for your account
no_account_html: ไม่มีบัญชี? คุณสามารถ ลงทะเบียนที่นี่
proceed: ดำเนินการต่อเพื่อติดตาม
prompt: 'คุณกำลังจะติดตาม:'
@@ -577,9 +569,44 @@ th:
sessions:
activity: กิจกรรมล่าสุด
browser: เบราว์เซอร์
+ browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ electron: Electron
+ firefox: Firefox
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
+ opera: Opera
+ otter: Otter
+ phantom_js: PhantomJS
+ qq: QQ Browser
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ current_session: เซสชันปัจจุบัน
ip: IP
+ platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
revoke: เพิกถอน
+ revoke_success: เพิกถอนเซสชันสำเร็จ
+ title: เซสชัน
settings:
+ account: บัญชี
+ account_settings: การตั้งค่าบัญชี
+ appearance: ลักษณะที่ปรากฏ
authorized_apps: แอปที่ได้รับอนุญาต
back: กลับไปที่ Mastodon
delete: การลบบัญชี
@@ -587,27 +614,25 @@ th:
edit_profile: แก้ไขโปรไฟล์
export: การส่งออกข้อมูล
import: นำเข้า
+ import_and_export: การนำเข้าและการส่งออก
notifications: การแจ้งเตือน
preferences: การกำหนดลักษณะ
+ profile: โปรไฟล์
relationships: การติดตามและผู้ติดตาม
two_factor_authentication: การรับรองความถูกต้องด้วยสองปัจจัย
statuses:
attached:
description: 'แนบ: %{attached}'
image:
- one: "%{count} ภาพ"
other: "%{count} ภาพ"
video:
- one: "%{count} วิดีโอ"
other: "%{count} วิดีโอ"
content_warning: 'คำเตือนเนื้อหา: %{warning}'
open_in_web: เปิดในเว็บ
- over_character_limit: character limit of %{max} exceeded
pin_errors:
reblog: ไม่สามารถปักหมุดการดัน
poll:
total_votes:
- one: "%{count} การลงคะแนน"
other: "%{count} การลงคะแนน"
show_more: แสดงเพิ่มเติม
sign_in_to_participate: ลงชื่อเข้าเพื่อเข้าร่วมการสนทนา
@@ -618,10 +643,8 @@ th:
public: สาธารณะ
public_long: ทุกคนสามารถเห็น
unlisted: ไม่อยู่ในรายการ
- unlisted_long: Everyone can see, but not listed on public timelines
stream_entries:
pinned: โพสต์ที่ปักหมุด
- reblogged: boosted
sensitive_content: เนื้อหาที่ละเอียดอ่อน
themes:
contrast: Mastodon (ความคมชัดสูง)
@@ -630,19 +653,12 @@ th:
time:
formats:
default: "%d %b %Y, %H:%M"
- month: "%b %Y"
two_factor_authentication:
- code_hint: Enter the code generated by your authenticator app to confirm
- description_html: If you enable two-factor authentication, logging in will require you to be in possession of your phone, which will generate tokens for you to enter.
disable: ปิดใช้งาน
enable: เปิดใช้งาน
enabled: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว
enabled_success: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำเร็จ
generate_recovery_codes: สร้างรหัสกู้คืน
- instructions_html: "Scan this QR code into Google Authenticator or a similiar TOTP app on your phone. From now on, that app will generate tokens that you will have to enter when logging in."
- lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated.
- manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
- recovery_codes_regenerated: Recovery codes successfully regenerated
recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe, for example by printing them and storing them with other important documents.
setup: ตั้งค่า
wrong_code: รหัสที่ป้อนไม่ถูกต้อง! เวลาเซิร์ฟเวอร์และเวลาอุปกรณ์ถูกต้องหรือไม่?
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index e3e27e3ef..3113e7a08 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -5,7 +5,6 @@ tr:
about_mastodon_html: 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
administered_by: 'Tarafından yönetildi:'
- api: API
apps: Mobil uygulamalar
contact: İletişim
contact_missing: Ayarlanmadı
@@ -46,15 +45,11 @@ tr:
people_who_follow: Kullanıcı %{name}'i takip edenler
pin_errors:
following: Onaylamak istediğiniz kişiyi zaten takip ediyor olmalısınız
- posts:
- one: Toot
- other: Tootlar
posts_tab_heading: Tootlar
posts_with_replies: Tootlar ve yanıtlar
reserved_username: Kullanıcı adı saklıdır
roles:
admin: Yönetici
- bot: Bot
moderator: Denetleyici
unfollow: Takibi bırak
admin:
@@ -96,7 +91,6 @@ tr:
header: Üstbilgi
inbox_url: Gelen kutusu bağlantısı
invited_by: Tarafından davet edildi
- ip: IP
joined: Katıldı
location:
all: Hepsi
@@ -155,7 +149,6 @@ tr:
unsubscribe: Abonelikten çık
username: Kullanıcı adı
warn: Uyar
- web: Web
action_logs:
actions:
confirm_user: "%{name} %{target} kullanıcısının e-posta adresini onayladı"
@@ -165,7 +158,6 @@ tr:
add_new: Yeni ekle
created_msg: Domain bloğu şu an işleniyor
destroyed_msg: Domain bloğu silindi
- domain: Domain
new:
create: Yeni blok oluştur
hint: Domain bloğu, veri tabanında hesap kayıtlarının oluşturulmasını engellemez, fakat o hesapların üzerine otomatik olarak belirli yönetim metodlarını olarak uygular.
@@ -220,7 +212,6 @@ tr:
confirmed: Onaylandı
expires_in: Bitiş Tarihi
last_delivery: Son gönderim
- title: WebSub
topic: Konu
tags:
accounts: Hesaplar
@@ -271,9 +262,10 @@ tr:
'422':
content: Güvenlik doğrulaması başarısız oldu. Site cookie'lerini engellemiş olabilirsiniz.
title: Güvenlik doğrulamasu başarısız
+ '429': Throttled
+ '500':
exports:
blocks: Blokladıklarınız
- csv: CSV
follows: Takip ettikleriniz
mutes: Susturduklarınız
storage: Ortam deposu
@@ -291,6 +283,14 @@ tr:
following: Takip edilenler listesi
muting: Susturulanlar listesi
upload: Yükle
+ invites:
+ expires_in:
+ '1800': 30 minutes
+ '21600': 6 hours
+ '3600': 1 hour
+ '43200': 12 hours
+ '604800': 1 week
+ '86400': 1 day
media_attachments:
validations:
images_and_video: Halihazırda görsel içeren bir gönderiye video ekleyemezsiniz
@@ -320,21 +320,9 @@ tr:
reblog:
body: "%{name} durumunuzu boost etti:"
subject: "%{name} durumunuzu boost etti"
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
next: Sonraki
prev: Önceki
- truncate: "…"
remote_follow:
acct: Takip edeceğiniz kişiyi kullaniciadi@sunuculinki şeklinde giriniz
missing_resource: Hesabınız için yönlendirme linki bulunamadı
@@ -362,9 +350,6 @@ tr:
stream_entries:
reblogged: boost edildi
sensitive_content: Hassas içerik
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
two_factor_authentication:
code_hint: Onaylamak için kimlik doğrulama uygulamanızın oluşturduğu kodu giriniz
description_html: Eğer iki-faktörlü kimlik doğrulamayı aktif ederseniz, giriş yaparken sizin için giriş kodu üreten telefonunuza ihtiyaç duyacaksınız.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index a582b2385..e027b6bae 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -5,7 +5,6 @@ uk:
about_mastodon_html: Mastodon - це вільна соціальна мережа з відкритим вихідним кодом. Вона є децентралізованою альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте — що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в соціальній мережі.
about_this: Про цю інстанцію
administered_by: 'Адміністратор:'
- api: API
contact: Зв'язатися
contact_missing: Не зазначено
contact_unavailable: Недоступно
@@ -18,15 +17,12 @@ uk:
learn_more: Дізнатися більше
privacy_policy: Політика приватності
source_code: Вихідний код
- status_count_after: статусів
status_count_before: Опубліковано
terms: Правила використання
- user_count_after: користувачів
user_count_before: Тут живе
what_is_mastodon: Що таке Mastodon?
accounts:
follow: Підписатися
- followers: Підписники
following: Підписаний(-а)
joined: Приєднався %{date}
media: Медіа
@@ -35,7 +31,6 @@ uk:
nothing_here: Тут нічого немає!
people_followed_by: Люди, на яких підписаний(-а) %{name}
people_who_follow: Підписники %{name}
- posts: Пости
posts_with_replies: Пости і відповіді
reserved_username: Це ім'я користувача зарезервоване
roles:
@@ -70,7 +65,6 @@ uk:
display_name: Відображуване ім'я
domain: Домен
edit: Змінити
- email: Email
email_status: Статус e-mail
enable: Увімкнути
enabled: Увімкнено
@@ -79,7 +73,6 @@ uk:
followers_url: URL підписників
follows: Підписки
inbox_url: Вхідний URL
- ip: IP
location:
all: Усі
local: Локальні
@@ -119,7 +112,6 @@ uk:
moderator: Модератор
staff: Персонал
user: Користувач
- salmon_url: Salmon URL
search: Пошук
shared_inbox_url: URL спільного вхідного кошика
show:
@@ -358,11 +350,9 @@ uk:
title: Статуси аккаунтів
with_media: З медіа
subscriptions:
- callback_url: Callback URL
confirmed: Підтверджено
expires_in: Спливає через
last_delivery: Остання доставка
- title: WebSub
topic: Тема
title: Адміністрування
admin_mailer:
@@ -372,7 +362,6 @@ uk:
subject: Нова скарга до %{instance} (#%{id})
application_mailer:
notification_preferences: Змінити налаштування e-mail
- salutation: "%{name},"
settings: 'Змінити налаштування e-mail: %{link}'
view: 'Перегляд:'
view_profile: Показати профіль
@@ -398,9 +387,6 @@ uk:
migrate_account: Переїхати до іншого аккаунту
migrate_account_html: Якщо ви бажаєте, щоб відвідувачі цього акканту були перенаправлені до іншого, ви можете налаштувати це тут.
or_log_in_with: Або увійдіть з
- providers:
- cas: CAS
- saml: SAML
register: Зареєструватися
resend_confirmation: Повторно відправити інструкції з підтвердження
reset_password: Скинути пароль
@@ -460,7 +446,6 @@ uk:
request: Зробити запит на архів
size: Розмір
blocks: Список блокувань
- csv: CSV
follows: Підписки
mutes: Список глушення
storage: Ваш медіаконтент
@@ -483,7 +468,6 @@ uk:
generic:
changes_saved_msg: Зміни успішно збережені!
save_changes: Зберегти зміни
- validation_errors: Щось тут не так! Будь ласка, ознайомтеся з %{count} помилками нижче
imports:
preface: Вы можете завантажити деякі дані, наприклад, списки людей, на яких Ви підписані чи яких блокуєте, в Ваш акаунт на цій інстанції з файлів, експортованих з іншої інстанції.
success: Ваші дані були успішно загружені та будуть оброблені в найближчий момент
@@ -506,7 +490,6 @@ uk:
expires_in_prompt: Ніколи
generate: Згенерувати
invited_by: 'Вас запросив(-ла):'
- max_uses: "%{count} використань"
max_uses_prompt: Без обмеження
prompt: Генеруйте та діліться посиланням з іншими для надання доступу до сайту
table:
@@ -568,24 +551,18 @@ uk:
number:
human:
decimal_units:
- format: "%n%u"
units:
billion: млрд
million: млн
quadrillion: квдрл
thousand: тис
trillion: трлн
- unit: ''
pagination:
newer: Новіше
next: Далі
prev: Назад
- truncate: "…"
preferences:
- languages: Мови
other: Інше
- publishing: Публікація
- web: Веб
remote_follow:
acct: Введіть username@domain, яким ви хочете підписатися
missing_resource: Пошук потрібного перенаправлення URL для Вашого аккаунта закінчився невдачею
@@ -600,40 +577,12 @@ uk:
activity: Остання активність
browser: Браузер
browsers:
- alipay: Alipay
- blackberry: Blackberry
- chrome: Chrome
- edge: Microsoft Edge
- electron: Electron
- firefox: Firefox
generic: Невідомий браузер
- ie: Internet Explorer
- micro_messenger: MicroMessenger
- nokia: Nokia S40 Ovi Browser
- opera: Opera
- otter: Otter
- 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
revoke: Закінчити
revoke_success: Сесія успішно закінчена
title: Сесії
@@ -652,11 +601,8 @@ uk:
statuses:
attached:
description: 'Прикріплено: %{attached}'
- image: "%{count} картинки"
- video: "%{count} відео"
boosted_from_html: Просунуто від %{acct_link}
content_warning: 'Попередження про контент: %{warning}'
- disallowed_hashtags: 'містив заборонені хештеґи: %{tags}'
language_detection: Автоматично визначати мову
open_in_web: Відкрити у вебі
over_character_limit: перевищено ліміт символів (%{max})
@@ -666,7 +612,6 @@ uk:
private: Не можна закріпити непублічний пост
reblog: Не можна закріпити просунутий пост
show_more: Детальніше
- title: '%{name}: "%{quote}"'
visibilities:
private: Для підписників
private_long: Показувати тільки підписникам
@@ -684,9 +629,6 @@ uk:
contrast: Висока контрасність
default: Mastodon
mastodon-light: Mastodon (світла)
- time:
- formats:
- default: "%b %d, %Y, %H:%M"
two_factor_authentication:
code_hint: Для підтверждення введіть код, згенерований застосунком аутентифікатора
description_html: При увімкненні двофакторної аутентифікації, вхід буде вимагати від Вас використовування Вашого телефона, який згенерує вхідний код.
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index ae49c0537..0c9b291ad 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,51 +1,61 @@
---
zh-CN:
about:
- about_hashtag_html: 这里展示的是带有话题标签 #%{hashtag} 的公开嘟文。如果你想与他们互动,你需要在任意一个 Mastodon 实例或与其兼容的网站上拥有一个帐户。
+ about_hashtag_html: 这里展示的是带有话题标签 #%{hashtag} 的公开嘟文。如果你想与他们互动,你需要在任意一个 Mastodon 站点或与其兼容的网站上拥有一个帐户。
about_mastodon_html: Mastodon(长毛象)是一个建立在开放式网络协议和自由、开源软件之上的社交网络,有着类似于电子邮件的分布式设计。
- about_this: 关于本实例
+ about_this: 关于本站
active_count_after: 活跃
active_footnote: 每月活跃用户
- administered_by: 本实例的管理员:
+ administered_by: 本站管理员:
api: API
apps: 移动应用
+ apps_platforms: 在 iOS、Android 和其他平台上使用 Mastodon
+ browse_directory: 浏览用户资料目录并按兴趣筛选
+ browse_public_posts: 浏览 Mastodon 上公共嘟文的实时信息流
contact: 联系方式
contact_missing: 未设定
contact_unavailable: 未公开
+ discover_users: 发现用户
documentation: 文档
extended_description_html: |
这里可以写一些规定
本站尚未设置详细介绍。
+ federation_hint_html: 在%{instance} 上拥有账户后,你可以关注任何 Mastodon 服务器或其他服务器上的人。
generic_description: "%{domain} 是这个庞大网络中的一台服务器"
+ get_apps: 尝试移动应用
hosted_on: 一个在 %{domain} 上运行的 Mastodon 实例
learn_more: 了解详情
privacy_policy: 隐私政策
+ see_whats_happening: 看一看现在在发生什么
+ server_stats: 服务器统计数据:
source_code: 源代码
status_count_after:
- one: 条嘟文
other: 条嘟文
status_count_before: 他们共嘟出了
+ tagline: 关注朋友并发现新朋友
terms: 使用条款
user_count_after:
- one: 位用户
other: 位用户
user_count_before: 这里共注册有
what_is_mastodon: Mastodon 是什么?
accounts:
+ choices_html: "%{name} 的推荐:"
follow: 关注
followers:
- one: 关注者
other: 关注者
following: 正在关注
joined: 加入于 %{date}
+ last_active: 最近活动
+ link_verified_on: 此链接的所有权已在 %{date} 检查
media: 媒体
moved_html: "%{name} 已经迁移到 %{new_profile_link}:"
network_hidden: 此信息不可用
nothing_here: 这里神马都没有!
people_followed_by: "%{name} 关注的人"
people_who_follow: 关注 %{name} 的人
+ pin_errors:
+ following: 您必须关注您要推荐的人
posts:
- one: 嘟文
other: 嘟文
posts_tab_heading: 嘟文
posts_with_replies: 嘟文和回复
@@ -54,14 +64,20 @@ zh-CN:
admin: 管理员
bot: 机器人
moderator: 监察员
+ unavailable: 个人资料不可用
unfollow: 取消关注
admin:
+ account_actions:
+ action: 执行操作
+ title: 在 %{acct} 上执行管理操作
account_moderation_notes:
create: 新建
created_msg: 管理备忘建立成功!
delete: 删除
destroyed_msg: 管理备忘删除成功!
accounts:
+ approve: 批准
+ approve_all: 批准全部
are_you_sure: 你确定吗?
avatar: 头像
by_domain: 域名
@@ -75,6 +91,7 @@ zh-CN:
confirm: 确认
confirmed: 已确认
confirming: 确认
+ deleted: 已删除
demote: 降任
disable: 停用
disable_two_factor_authentication: 停用双重认证
@@ -90,8 +107,11 @@ zh-CN:
followers: 关注者
followers_url: 关注者(Followers)URL
follows: 正在关注
+ header: 个人资料页横幅图片
inbox_url: 收件箱(Inbox)URL
+ invited_by: 邀请者为
ip: IP 地址
+ joined: 加入于
location:
all: 全部
local: 本地
@@ -101,15 +121,20 @@ zh-CN:
media_attachments: 媒体文件
memorialize: 设置为追悼帐户
moderation:
+ active: 活跃
all: 全部
+ pending: 待审核
silenced: 已隐藏
suspended: 已封禁
title: 帐户状态
moderation_notes: 管理备忘
most_recent_activity: 最后一次活跃的时间
most_recent_ip: 最后一次活跃的 IP 地址
+ no_account_selected: 因为没有账户被选择,所以没有更改
+ no_limits_imposed: 无限制
not_subscribed: 未订阅
outbox_url: 发件箱(Outbox)URL
+ pending: 待审核
perform_full_suspension: 封禁
profile_url: 个人资料页面 URL
promote: 升任
@@ -117,7 +142,10 @@ zh-CN:
public: 公开页面
push_subscription_expires: PuSH 订阅过期时间
redownload: 刷新个人资料
+ reject: 拒绝
+ reject_all: 拒绝全部
remove_avatar: 删除头像
+ remove_header: 删除横幅图片
resend_confirmation:
already_confirmed: 该用户已被确认
send: 重发确认邮件
@@ -138,24 +166,30 @@ zh-CN:
created_reports: 这个帐户提交的举报
targeted_reports: 针对这个帐户的举报
silence: 隐藏
+ silenced: 已隐藏
statuses: 嘟文
subscribe: 订阅
+ suspended: 已封禁
+ time_in_queue: 已经等待了 %{time}
title: 用户
unconfirmed_email: 待验证的电子邮件地址
undo_silenced: 解除隐藏
undo_suspension: 解除封禁
unsubscribe: 取消订阅
username: 用户名
+ warn: 警告
web: 站内页面
action_logs:
actions:
assigned_to_self_report: "%{name} 接管了举报 %{target}"
change_email_user: "%{name} 更改了用户 %{target} 的电子邮件地址"
confirm_user: "%{name} 确认了用户 %{target} 的电子邮件地址"
+ create_account_warning: "%{name} 向 %{target} 发送了警告"
create_custom_emoji: "%{name} 添加了新的自定义表情 %{target}"
create_domain_block: "%{name} 屏蔽了域名 %{target}"
create_email_domain_block: "%{name} 屏蔽了电子邮件域名 %{target}"
demote_user: "%{name} 对用户 %{target} 进行了降任操作"
+ destroy_custom_emoji: "%{name} 销毁了自定义表情 %{target}"
destroy_domain_block: "%{name} 解除了对域名 %{target} 的屏蔽"
destroy_email_domain_block: "%{name} 解除了对电子邮件域名 %{target} 的屏蔽"
destroy_status: "%{name} 删除了 %{target} 的嘟文"
@@ -209,8 +243,10 @@ zh-CN:
config: 服务器配置
feature_deletions: 帐户删除
feature_invites: 邀请链接
+ feature_profile_directory: 用户资料目录
feature_registrations: 公开注册
feature_relay: 同步中继
+ feature_timeline_preview: 时间轴预览
features: 功能
hidden_service: 匿名服务连通性
open_reports: 待处理举报数
@@ -230,6 +266,7 @@ zh-CN:
created_msg: 正在进行域名屏蔽
destroyed_msg: 域名屏蔽已撤销
domain: 域名
+ existing_domain_block_html: 您已经对 %{name} 施加了更严格的限制,您需要先 解封。
new:
create: 添加屏蔽
hint: 域名屏蔽不会阻止该域名下的帐户进入本站的数据库,但是会对来自这个域名的帐户自动进行预先设置的管理操作。
@@ -241,9 +278,15 @@ zh-CN:
title: 添加域名屏蔽
reject_media: 拒绝接收媒体文件
reject_media_hint: 删除本地已缓存的媒体文件,并且不再接收来自该域名的任何媒体文件。此选项不影响封禁
+ reject_reports: 拒绝接收举报
+ reject_reports_hint: 忽略来自此域名的所有举报。这和封禁无关。
+ rejecting_media: 拒绝接收媒体文件
+ rejecting_reports: 拒绝接收举报
+ severity:
+ silence: 已隐藏
+ suspend: 已封禁
show:
affected_accounts:
- one: 将会影响到数据库中的 1 个帐户
other: 将会影响到数据库中的 %{count} 个帐户
retroactive:
silence: 对此域名的所有帐户解除隐藏
@@ -261,8 +304,24 @@ zh-CN:
create: 添加域名
title: 添加电子邮件域名屏蔽
title: 电子邮件域名屏蔽
+ followers:
+ back_to_account: 返回帐户
+ title: "%{acct} 的关注者"
instances:
+ by_domain: 域名
+ delivery_available: 无法投递
+ known_accounts:
+ other: "%{count} 个已知帐户"
+ moderation:
+ all: 全部
+ limited: 受限的
+ title: 运营
title: 已知实例
+ total_blocked_by_us: 被我方屏蔽的
+ total_followed_by_them: 被对方关注的
+ total_followed_by_us: 被我方关注的
+ total_reported: 关于对方的举报
+ total_storage: 媒体文件
invites:
deactivate_all: 撤销所有邀请链接
filter:
@@ -271,10 +330,17 @@ zh-CN:
expired: 已失效
title: 筛选
title: 邀请用户
+ pending_accounts:
+ title: 待处理的帐户 (%{count})
relays:
add_new: 添加新的中继
+ delete: 删除
description_html: "同步中继是一种中间服务器,各实例可以通过订阅中继和向中继推送信息的方式来大量交换公开嘟文。它可以帮助中小型实例发现网络中的内容,而无需本地用户手动关注其他远程实例上的用户。"
+ disable: 禁用
+ disabled: 已禁用
+ enable: 启用
enable_hint: 启用此功能后,你的实例会订阅此中继的所有公开嘟文,并同时向其推送本服务器的公开嘟文。
+ enabled: 已启用
inbox_url: 中继 URL
pending: 等待中继确认
save_and_enable: 保存并启用
@@ -330,12 +396,18 @@ zh-CN:
hero:
desc_html: 用于在首页展示。推荐分辨率 600×100px 以上。未指定的情况下将默认使用本站缩略图
title: 主题图片
+ mascot:
+ desc_html: 用于在首页展示。推荐分辨率 293×205px 以上。未指定的情况下将使用默认吉祥物。
+ title: 吉祥物图像
peers_api_enabled:
desc_html: 截至目前本实例在网络中已发现的域名
title: 公开已知实例的列表
preview_sensitive_media:
desc_html: 始终在站外链接预览中展示缩略图,无论媒体内容是否标记为敏感
title: 在 OpenGraph 预览中显示敏感媒体内容
+ profile_directory:
+ desc_html: 允许用户可被发现
+ title: 启用用户资料目录
registrations:
closed_message:
desc_html: 本站关闭注册期间的提示信息。可以使用 HTML 标签
@@ -346,6 +418,12 @@ zh-CN:
min_invite_role:
disabled: 没有人
title: 允许发送邀请的用户组
+ registrations_mode:
+ modes:
+ approved: 注册时需要批准
+ none: 关闭注册
+ open: 开放注册
+ title: 注册模式
show_known_fediverse_at_about_page:
desc_html: 启用此选项将会在预览中显示来自已知实例的嘟文,否则只会显示本站时间轴的内容.
title: 在时间轴预览中显示已知实例
@@ -358,6 +436,9 @@ zh-CN:
site_description_extended:
desc_html: 可以填写行为守则、规定、指南或其他本站特有的内容。可以使用 HTML 标签
title: 本站详细介绍
+ site_short_description:
+ desc_html: 会在在侧栏和元数据标签中显示。可以用一小段话描述 Mastodon 是什么,以及本服务器的特点。
+ title: 服务器一句话介绍
site_terms:
desc_html: 可以填写自己的隐私权政策、使用条款或其他法律文本。可以使用 HTML 标签
title: 自定义使用条款
@@ -379,6 +460,7 @@ zh-CN:
media:
title: 媒体文件
no_media: 不含媒体文件
+ no_status_selected: 因为没有嘟文被选中,所以没有更改
title: 帐户嘟文
with_media: 含有媒体文件
subscriptions:
@@ -387,16 +469,39 @@ zh-CN:
expires_in: 失效时间
last_delivery: 最后一次接收数据的时间
title: WebSub
- topic: Topic
+ topic: 话题
+ tags:
+ accounts: 帐户
+ hidden: 隐藏
+ hide: 从目录隐藏
+ name: 话题标签
+ title: 话题标签
+ unhide: 在目录中显示
+ visible: 可见
title: 管理
+ warning_presets:
+ add_new: 添加新条目
+ delete: 删除
+ edit: 编辑
+ edit_preset: 编辑预置警告
+ title: 管理预设警告
admin_mailer:
+ new_pending_account:
+ body: 新帐户的详细信息如下。您可以批准或拒绝此申请。
+ subject: 在 %{instance} 上有新账户 ( %{username}) 需要审核
new_report:
body: "%{reporter} 举报了用户 %{target}"
body_remote: 来自 %{domain} 的用户举报了用户 %{target}
subject: 来自 %{instance} 的用户举报(#%{id})
+ appearance:
+ advanced_web_interface: 高级 web 界面
+ advanced_web_interface_hint: 如果你想使用整个屏幕宽度,高级 web 界面允许您配置多个不同的栏目,可以同时看到更多的信息:主页、通知、跨站时间轴、任意数量的列表和话题标签。
+ animations_and_accessibility: 动画和访问选项
+ confirmation_dialogs: 确认对话框
+ sensitive_content: 敏感内容
application_mailer:
notification_preferences: 更改电子邮件首选项
- salutation: "%{name},"
+ salutation: "%{name}:"
settings: 使用此链接更改你的电子邮件首选项:%{link}
view: 点此链接查看详情:
view_profile: 查看个人资料页
@@ -410,7 +515,9 @@ zh-CN:
warning: 一定小心,千万不要把它分享给任何人!
your_token: 你的访问令牌
auth:
+ apply_for_account: 请求邀请
change_password: 密码
+ checkbox_agreement_html: 我同意 服务器规则 和 服务条款
confirm_email: 确认电子邮件地址
delete_account: 删除帐户
delete_account_html: 如果你想删除你的帐户,请点击这里继续。你需要确认你的操作。
@@ -426,10 +533,12 @@ zh-CN:
cas: CAS
saml: SAML
register: 注册
+ registration_closed: "%{instance} 目前不接收新成员"
resend_confirmation: 重新发送确认邮件
reset_password: 重置密码
security: 帐户安全
set_new_password: 设置新密码
+ trouble_logging_in: 登录有问题?
authorize_follow:
already_following: 你已经在关注此用户了
error: 对不起,寻找这个跨站用户时出错
@@ -461,8 +570,17 @@ zh-CN:
description_html: 继续操作将会永久地、不可撤销地删除帐户中的所有内容,然后冻结帐户。你的用户名将会被保留,以防有人冒用你的身份。
proceed: 删除帐户
success_msg: 你的帐户已经成功删除
- warning_html: 我们只能保证本实例上的内容将会被彻底删除。对于已经被广泛传播的内容,它们在本实例以外的某些地方可能仍然可见。此外,失去连接的服务器以及停止接收订阅的服务器所存储的数据亦无法删除。
+ warning_html: 我们只能保证本服务器上的内容将会被彻底删除。对于已经被广泛传播的内容,它们在本服务器以外的某些地方可能仍然可见。此外,失去连接的服务器以及停止接收订阅的服务器所存储的数据亦无法删除。
warning_title: 关于已传播的内容的警告
+ directories:
+ directory: 用户资料目录
+ enabled: 您目前已被列入目录中。
+ enabled_but_waiting: 您已选择列入目录,但是您没有达到关注者数量下限 (%{min_followers} 名) 。
+ explanation: 根据兴趣发现用户
+ explore_mastodon: 探索 %{title}
+ how_to_enable: 您目前没有选择选择列入到目录中。您可以在下面选择列入。可以在个人简介中加上话题标签,话题标签也会显示在用户资料目录里!
+ people:
+ other: "%{count} 人"
errors:
'403': 你没有访问这个页面的权限。
'404': 无法找到你所要访问的页面。
@@ -475,6 +593,9 @@ zh-CN:
content: 抱歉,我们的后台出错了。
title: 这个页面有问题
noscript_html: 使用 Mastodon 网页版应用需要启用 JavaScript。你也可以选择适用于你的平台的 Mastodon 应用。
+ existing_username_validator:
+ not_found: 在本站找不到此用户
+ not_found_multiple: 找不到 %{usernames}
exports:
archive_takeout:
date: 日期
@@ -485,9 +606,15 @@ zh-CN:
size: 大小
blocks: 屏蔽的用户
csv: CSV
+ domain_blocks: 域名屏蔽
follows: 关注的用户
+ lists: 列表
mutes: 隐藏的用户
storage: 媒体文件存储
+ featured_tags:
+ add_new: 添加新条目
+ errors:
+ limit: 你所推荐的话题标签数已达上限
filters:
contexts:
home: 主页时间轴
@@ -497,23 +624,56 @@ zh-CN:
edit:
title: 编辑过滤器
errors:
+ invalid_context: 过滤器场景没有或无效
invalid_irreversible: 此功能只适用于主页时间轴或通知
index:
delete: 删除
title: 过滤器
new:
title: 添加新的过滤器
+ footer:
+ developers: 开发者
+ more: 更多…
+ resources: 资源
generic:
+ all: 全部
changes_saved_msg: 更改保存成功!
+ copy: 复制
+ order_by: 排序方式
save_changes: 保存更改
validation_errors:
- one: 出错啦!检查一下下面出错的地方吧
other: 出错啦!检查一下下面 %{count} 处出错的地方吧
+ html_validator:
+ invalid_markup: '包含无效的 HTML 标记: %{error}'
+ identity_proofs:
+ active: 有效
+ authorize: 是,授权
+ authorize_connection_prompt: 授权这一密码学连接?
+ errors:
+ failed: 密码关联失败。请在 %{provider} 上重新尝试。
+ keybase:
+ invalid_token: Keybase 令牌是签名的哈希并且必须是 66 个十六进制字符
+ verification_failed: Keybase 无法将此令牌识别为 Keybase 用户 %{kb_username} 的签名。请在 Keybase 再试一次。
+ wrong_user: 无法以 %{current} 的身份创建 %{proving} 的证明。请以 %{proving} 的身份登录并再次尝试。
+ explanation_html: 在这里,你可以和你的其他身份建立密码学关联,例如 Keybase 个人资料。这可以让别人向你发送加密信息,并信任你发给他们的内容。
+ i_am_html: 我是 %{service} 上的 %{username} 。
+ identity: 身份
+ inactive: 失效
+ publicize_checkbox: 并发一条这样的嘟文:
+ publicize_toot: '证明完毕!我是 %{service} 上的 %{username}: %{url}'
+ status: 验证状态
+ view_proof: 查看证明
imports:
+ modes:
+ merge: 合并
+ merge_long: 保留现有记录并添加新的记录
+ overwrite: 覆盖
+ overwrite_long: 将当前记录替换为新记录
preface: 你可以在此导入你在其他实例导出的数据,比如你所关注或屏蔽的用户列表。
success: 数据上传成功,正在处理中
types:
blocking: 屏蔽列表
+ domain_blocking: 域名屏蔽列表
following: 关注列表
muting: 隐藏列表
upload: 上传
@@ -532,10 +692,9 @@ zh-CN:
generate: 生成邀请链接
invited_by: 你的邀请人是:
max_uses:
- one: 1 次
other: "%{count} 次"
max_uses_prompt: 无限制
- prompt: 生成分享链接,邀请他人在本实例注册
+ prompt: 生成分享链接,邀请他人在本服务器注册
table:
expires_at: 失效时间
uses: 已使用次数
@@ -560,9 +719,9 @@ zh-CN:
body: 以下是自%{since}你最后一次登录以来错过的消息的摘要
mention: "%{name} 在嘟文中提到了你:"
new_followers_summary:
- one: 而且,你不在的时候,有一个人关注了你!耶!
other: 而且,你不在的时候,有 %{count} 个人关注了你!好棒!
- subject: "自从你最后一次登录以来,你错过了 %{count} 条新通知 \U0001F418"
+ subject:
+ other: "自从上次访问后,有 %{count} 条新通知 \U0001F418"
title: 在你不在的这段时间……
favourite:
body: 你的嘟文被 %{name} 收藏了:
@@ -589,50 +748,84 @@ zh-CN:
number:
human:
decimal_units:
- format: "%n%u"
units:
billion: B
million: M
quadrillion: Q
thousand: K
trillion: T
- unit: ''
pagination:
newer: 更新
next: 下一页
older: 更早
prev: 上一页
- truncate: "…"
+ polls:
+ errors:
+ already_voted: 你已经在这里投过票了
+ duplicate_options: 包含重复的项目
+ duration_too_long: 持续时间过长
+ duration_too_short: 持续时间过短
+ expired: 投票已经结束
+ over_character_limit: 每条不能超过 %{max} 个字符
+ too_few_options: 至少需要两个选项
+ too_many_options: 不能超过 %{max} 项
preferences:
- languages: 语言
other: 其他
- publishing: 发布
- web: 站内
+ posting_defaults: 发布默认值
+ public_timelines: 公共时间轴
+ relationships:
+ activity: 账户活动
+ dormant: 休眠
+ last_active: 最近活动
+ most_recent: 最近的
+ moved: 已迁移
+ mutual: 互相关注
+ primary: 主要
+ relationship: 关系
+ remove_selected_domains: 从选定的域名中删除所有关注者
+ remove_selected_followers: 移除选中的关注者
+ remove_selected_follows: 取消关注所选用户
+ status: 帐户状态
remote_follow:
acct: 请输入你的“用户名@实例域名”
missing_resource: 无法确定你的帐户的跳转 URL
no_account_html: 还没有帐号?你可以注册一个
proceed: 确认关注
prompt: 你正准备关注:
+ reason_html: "为什么需要这个步骤?%{instance} 可能不是您所注册的服务器,所以我们需要先重定向到您所在的服务器。"
+ remote_interaction:
+ favourite:
+ proceed: 确认收藏
+ prompt: 您想要收藏此嘟文:
+ reblog:
+ proceed: 确认转嘟
+ prompt: 您想要转嘟此条:
+ reply:
+ proceed: 确认回复
+ prompt: 您想要回复此嘟文:
remote_unfollow:
error: 错误
title: 标题
unfollowed: 已取消关注
+ scheduled_statuses:
+ over_daily_limit: 您已超出每日定时嘟文的上限(%{limit} 条)
+ over_total_limit: 您已超出定时嘟文的上限(%{limit} 条)
+ too_soon: 所定的时间必须在未来
sessions:
activity: 最后一次活跃的时间
browser: 浏览器
browsers:
alipay: 支付宝
- blackberry: Blackberry
+ blackberry: 黑莓
chrome: Chrome
- edge: Microsoft Edge
+ edge: 微软 Edge
electron: Electron
- firefox: Firefox
+ firefox: 火狐
generic: 未知浏览器
- ie: Internet Explorer
+ ie: IE 浏览器
micro_messenger: 微信
nokia: Nokia S40 Ovi 浏览器
- opera: Opera
+ opera: 欧朋浏览器
otter: Otter
phantom_js: PhantomJS
qq: QQ浏览器
@@ -646,7 +839,7 @@ zh-CN:
platforms:
adobe_air: Adobe Air
android: Android
- blackberry: Blackberry
+ blackberry: 黑莓
chrome_os: ChromeOS
firefox_os: Firefox OS
ios: iOS
@@ -660,30 +853,35 @@ zh-CN:
revoke_success: 会话注销成功
title: 会话
settings:
+ account: 账户
+ account_settings: 帐户设置
+ appearance: 外观
authorized_apps: 已授权的应用
back: 返回 Mastodon
delete: 删除帐户
development: 开发
edit_profile: 更改个人资料
export: 导出
+ featured_tags: 推荐的话题标签
+ identity_proofs: 身份证明
import: 导入
+ import_and_export: 导入和导出
migrate: 帐户迁移
notifications: 通知
preferences: 首选项
+ profile: 个人资料
+ relationships: 正在关注以及关注者
two_factor_authentication: 双重认证
statuses:
attached:
description: 附加媒体:%{attached}
image:
- one: "%{count} 张图片"
other: "%{count} 张图片"
video:
- one: "%{count} 段视频"
other: "%{count} 段视频"
boosted_from_html: 转嘟自 %{acct_link}
content_warning: 内容警告:%{warning}
disallowed_hashtags:
- one: 包含了一个禁止的话题标签:%{tags}
other: 包含了这些禁止的话题标签:%{tags}
language_detection: 自动检测语言
open_in_web: 在站内打开
@@ -693,7 +891,12 @@ zh-CN:
ownership: 不能置顶他人的嘟文
private: 不能置顶非公开的嘟文
reblog: 不能置顶转嘟
+ poll:
+ total_votes:
+ other: "%{count} 票"
+ vote: 投票
show_more: 显示更多
+ sign_in_to_participate: 登录以加入对话
title: "%{name}:“%{quote}”"
visibilities:
private: 仅关注者
@@ -715,6 +918,7 @@ zh-CN:
time:
formats:
default: "%Y年%-m月%d日 %H:%M"
+ month: "%Y 年 %B"
two_factor_authentication:
code_hint: 输入认证器生成的代码以确认操作
description_html: 启用双重认证后,你需要输入手机认证器生成的代码才能登录.
@@ -736,6 +940,22 @@ zh-CN:
explanation: 你请求了一份 Mastodon 帐户的完整备份。现在你可以下载了!
subject: 你的存档已经准备完毕
title: 存档导出
+ warning:
+ explanation:
+ disable: 虽然您的帐户被冻结,您的帐户数据仍然完整;但是您无法在解锁前执行任何操作。
+ silence: 当您的帐户受限时,只有已经关注过你的人才会这台服务器上看到你的嘟文,并且您会被排除在各种公共列表之外。但是,其他人仍然可以手动关注你。
+ suspend: 您的帐户已被封禁,所有的嘟文和您上传的媒体文件都已经从该服务器和您的关注者的服务器上删除并且不可恢复。
+ review_server_policies: 审阅服务器条款
+ subject:
+ disable: 您的帐户 %{acct} 已被冻结
+ none: 对 %{acct} 的警告
+ silence: 您的帐户 %{acct} 已经受限
+ suspend: 您的帐户 %{acct} 已被封禁。
+ title:
+ disable: 账户已冻结
+ none: 警示
+ silence: 帐户受限
+ suspend: 账户被封禁
welcome:
edit_profile_action: 设置个人资料
edit_profile_step: 你可以自定义你的个人资料,包括上传头像、横幅图片、更改昵称等等。如果你想在新的关注者关注你之前对他们进行审核,你也可以选择为你的帐户开启保护。
@@ -743,19 +963,23 @@ zh-CN:
final_action: 开始嘟嘟
final_step: '开始嘟嘟吧!即便你现在没有关注者,其他人仍然能在本站时间轴或者话题标签等地方看到你的公开嘟文。试着用 #introductions 这个话题标签介绍一下自己吧。'
full_handle: 你的完整用户地址
- full_handle_hint: 你需要把这个告诉你的朋友们,这样他们就能从另一个实例向你发送信息或者关注你。
+ full_handle_hint: 你需要把这个告诉你的朋友们,这样他们就能从另一台服务器向你发送信息或者关注你。
review_preferences_action: 更改首选项
review_preferences_step: 记得调整你的偏好设置,比如你想接收什么类型的邮件,或者你想把你的嘟文可见范围默认设置为什么级别。如果你没有晕动病的话,考虑一下启用“自动播放 GIF 动画”这个选项吧。
subject: 欢迎来到 Mastodon
tip_federated_timeline: 跨站公共时间轴可以让你一窥更广阔的 Mastodon 网络。不过,由于它只显示你的邻居们所订阅的内容,所以并不是全部。
- tip_following: 默认情况下,你会自动关注你所在实例的管理员。想结交更多有趣的人的话,记得多逛逛本站时间轴和跨站公共时间轴哦。
+ tip_following: 默认情况下,你会自动关注你所在服务器的管理员。想结交更多有趣的人的话,记得多逛逛本站时间轴和跨站公共时间轴哦。
tip_local_timeline: 本站时间轴可以让你一窥 %{instance} 上的用户。他们就是离你最近的邻居!
tip_mobile_webapp: 如果你的移动设备浏览器允许你将 Mastodon 添加到主屏幕,你就能够接收推送消息。它就像本地应用一样好使!
tips: 小贴士
title: "%{name},欢迎你的加入!"
users:
+ follow_limit_reached: 您不能关注超过 %{limit} 个人
invalid_email: 输入的电子邮件地址无效
invalid_otp_token: 输入的双重认证代码无效
otp_lost_help_html: 如果你不慎丢失了所有的代码,请联系 %{email} 寻求帮助
seamless_external_login: 因为你是通过外部服务登录的,所以密码和电子邮件地址设置都不可用。
signed_in_as: 当前登录的帐户:
+ verification:
+ explanation_html: 您可以 验证自己是个人资料元数据中的某个链接的所有者。 为此,被链接网站必须包含一个到您的 Mastodon 主页的链接。链接中 必须 包括 rel="me" 属性。链接的文本内容可以随意填写。例如:
+ verification: 验证
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index aade1debb..25e7475a8 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -15,14 +15,14 @@ zh-HK:
hosted_on: 在 %{domain} 運作的 Mastodon 服務站
learn_more: 了解更多
source_code: 源代碼
- status_count_after: 篇文章
status_count_before: 他們共發佈了
- user_count_after: 位使用者
+ tagline: 關注朋友並探索新朋友
user_count_before: 這裏共註冊有
what_is_mastodon: Mastodon 是甚麼?
accounts:
follow: 關注
- followers: 關注者
+ followers:
+ other: 關注者
following: 正在關注
media: 媒體
moved_html: "%{name} 已經轉移到 %{new_profile_link}:"
@@ -30,7 +30,6 @@ zh-HK:
nothing_here: 暫時未有內容可以顯示。
people_followed_by: "%{name} 關注的人"
people_who_follow: 關注 %{name} 的人
- posts: 文章
posts_with_replies: 文章和回覆
reserved_username: 此用戶名已被保留
roles:
@@ -203,7 +202,6 @@ zh-HK:
reject_media: 拒絕媒體檔案
reject_media_hint: 刪除本地緩存的媒體檔案,再也不在未來下載這個站點的檔案。和自動刪除無關
show:
- affected_accounts: 資料庫中有%{count}個用戶受影響
retroactive:
silence: 對此域名的所有用戶取消靜音
suspend: 對此域名的所有用戶取消除名
@@ -220,8 +218,12 @@ zh-HK:
create: 新增網域
title: 新增電郵網域阻隔
title: 電郵網域阻隔
+ followers:
+ back_to_account: 返回帳戶
+ title: "%{acct} 的關注者"
instances:
title: 已知服務站
+ total_followed_by_us: 開始關注你
invites:
filter:
all: 全部
@@ -229,6 +231,8 @@ zh-HK:
expired: 已失效
title: 篩選
title: 邀請用戶
+ relays:
+ description_html: "聯邦中繼站 是種中繼伺服器,會在訂閱並推送至此中繼站的伺服器之間交換大量的公開嘟文。中繼站也能協助小型或中型伺服器從聯邦中探索內容,而無須本地使用者手動關注遠端伺服器的其他使用者。"
report_notes:
created_msg: 舉報筆記已建立。
destroyed_msg: 舉報筆記已刪除。
@@ -364,9 +368,6 @@ zh-HK:
migrate_account: 轉移到另一個帳號
migrate_account_html: 想要將這個帳號指向另一個帳號可到這裡設定。
or_log_in_with: 或登入於
- providers:
- cas: CAS
- saml: SAML
register: 登記
resend_confirmation: 重發確認指示電郵
reset_password: 重設密碼
@@ -426,7 +427,6 @@ zh-HK:
request: 下載檔案
size: 檔案大小
blocks: 被你封鎖的用戶
- csv: CSV
follows: 你所關注的用戶
mutes: 你所靜音的用戶
storage: 媒體容量大小
@@ -434,7 +434,6 @@ zh-HK:
changes_saved_msg: 已成功儲存修改。
save_changes: 儲存修改
validation_errors:
- one: 提交的資料有問題
other: 提交的資料有 %{count} 項問題
imports:
preface: 你可以在此匯入你在其他服務站所匯出的資料檔,包括︰你所關注的用戶,被你封鎖的用戶。
@@ -459,7 +458,6 @@ zh-HK:
generate: 生成邀請連結
invited_by: 你的邀請人是:
max_uses:
- one: 1 次
other: "%{count} 次"
max_uses_prompt: 無限制
prompt: 生成分享連結,邀請他人在本服務站註冊
@@ -487,10 +485,8 @@ zh-HK:
body: 這是自從你在%{since}使用以後,你錯失了的訊息︰
mention: "%{name} 在此提及了你︰"
new_followers_summary:
- one: 你新獲得了 1 位關注者了!恭喜!
other: 你新獲得了 %{count} 位關注者了!好厲害!
subject:
- one: "自從上次登入以來,你收到 1 則新的通知 \U0001F418"
other: "自從上次登入以來,你收到 %{count} 則新的通知 \U0001F418"
title: 在你不在的這段時間……
favourite:
@@ -515,27 +511,14 @@ zh-HK:
body: 您的文章被 %{name} 轉推:
subject: "%{name} 轉推了你的文章"
title: 新的轉推
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
pagination:
newer: 較新
next: 下一頁
older: 較舊
prev: 上一頁
truncate: "……"
- preferences:
- languages: 語言
- other: 其他
- publishing: 發佈
- web: 站内
+ relationships:
+ remove_selected_followers: 刪除所選選項
remote_follow:
acct: 請輸入你的︰用戶名稱@服務點域名
missing_resource: 無法找到你用戶的轉接網址
@@ -550,7 +533,6 @@ zh-HK:
browser: 瀏覽器
browsers:
alipay: 支付寶
- blackberry: Blackberry
chrome: Chrome 瀏覽器
edge: Microsoft Edge 瀏覽器
electron: Electron 瀏覽器
@@ -559,30 +541,14 @@ zh-HK:
ie: Internet Explorer 瀏覽器
micro_messenger: 微信
nokia: Nokia S40 Ovi 瀏覽器
- opera: Opera
otter: Otter 瀏覽器
- phantom_js: PhantomJS
qq: QQ瀏覽器
- safari: Safari
uc_browser: UC瀏覽器
weibo: 新浪微博
current_session: 目前的作業階段
description: "%{platform} 上的 %{browser}"
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
revoke: 取消
revoke_success: 作業階段成功取消
title: 作業階段
@@ -602,15 +568,12 @@ zh-HK:
attached:
description: 附件: %{attached}
image:
- one: "%{count} 幅圖片"
other: "%{count} 幅圖片"
video:
- one: "%{count} 段影片"
other: "%{count} 段影片"
boosted_from_html: 轉推自 %{acct_link}
content_warning: 內容警告: %{warning}
disallowed_hashtags:
- one: 包含不允許的標籤: %{tags}
other: 包含不允許的標籤: %{tags}
language_detection: 自動偵測語言
open_in_web: 開啟網頁
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 988357e1b..d3dcf5133 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -7,7 +7,6 @@ zh-TW:
active_count_after: 活躍
active_footnote: 每月活躍使用者 (MAU)
administered_by: 管理者:
- api: API
apps: 行動應用程式
apps_platforms: 在 iOS、Android 和其他平台使用 Mastodon
browse_directory: 依興趣瀏覽個人資料目錄和過濾器
@@ -29,13 +28,11 @@ zh-TW:
server_stats: 伺服器統計:
source_code: 原始碼
status_count_after:
- one: 條嘟文
other: 條嘟文
status_count_before: 他們共嘟出了
tagline: 關注朋友並探索新朋友
terms: 使用條款
user_count_after:
- one: 位使用者
other: 位使用者
user_count_before: 註冊使用者數
what_is_mastodon: 什麼是 Mastodon?
@@ -43,7 +40,6 @@ zh-TW:
choices_html: "%{name} 的選擇:"
follow: 關注
followers:
- one: 關注者
other: 關注者
following: 正在關注
joined: 加入於 %{date}
@@ -56,7 +52,6 @@ zh-TW:
people_followed_by: "%{name} 關注的人"
people_who_follow: 關注 %{name} 的人
posts:
- one: 嘟文
other: 嘟文
posts_tab_heading: 嘟文
posts_with_replies: 嘟文與回覆
@@ -281,7 +276,6 @@ zh-TW:
suspend: 已停權
show:
affected_accounts:
- one: 將影響到資料庫中的 1 個帳戶
other: 將影響到資料庫中的 %{count} 個帳戶
retroactive:
silence: 對此站點的所有使用者取消靜音
@@ -448,9 +442,6 @@ zh-TW:
migrate_account: 轉移到另一個帳戶
migrate_account_html: 如果你希望引導他人關注另一個帳戶,請到這裡設定。
or_log_in_with: 或透過其他方式登入
- providers:
- cas: CAS
- saml: SAML
register: 註冊
resend_confirmation: 重新寄送確認指引
reset_password: 重設密碼
@@ -510,14 +501,12 @@ zh-TW:
request: 下載存檔
size: 大小
blocks: 您封鎖的使用者
- csv: CSV
follows: 您關注的使用者
mutes: 您靜音的使用者
storage: 儲存空間大小
generic:
changes_saved_msg: 已成功儲存修改!
save_changes: 儲存修改
- validation_errors: 送出的資料有 %{count} 個問題
imports:
preface: 您可以在此匯入您在其他伺服器所匯出的資料檔,包括關注的使用者、封鎖的使用者名單。
success: 資料檔上傳成功,正在匯入,請稍候
@@ -540,7 +529,6 @@ zh-TW:
expires_in_prompt: 永不過期
generate: 建立邀請連結
invited_by: 你的邀請人是:
- max_uses: "%{count} 次"
max_uses_prompt: 無限制
prompt: 建立分享連結,邀請他人在本伺服器註冊
table:
@@ -566,8 +554,6 @@ zh-TW:
action: 閱覽所有通知
body: 以下是自%{since}你最後一次登入以來錯過的訊息摘要
mention: "%{name} 在此提及了你:"
- new_followers_summary: 而且,你不在的時候,有 %{count} 個人關注你了! 好棒!
- subject: "自從上次登入以來,你收到 %{count} 則新的通知 \U0001F418"
title: 你不在的時候...
favourite:
body: '你的嘟文被 %{name} 加入了最愛:'
@@ -591,28 +577,11 @@ zh-TW:
body: '你的嘟文被 %{name} 轉嘟:'
subject: "%{name} 轉嘟了你的嘟文"
title: 新的轉嘟
- number:
- human:
- decimal_units:
- format: "%n%u"
- units:
- billion: B
- million: M
- quadrillion: Q
- thousand: K
- trillion: T
- unit: ''
pagination:
newer: 較新
next: 下一頁
older: 較舊
prev: 上一頁
- truncate: ''
- preferences:
- languages: 語言
- other: 其他
- publishing: 發佈
- web: 站內
remote_follow:
acct: 請輸入您的使用者名稱@站點網域
missing_resource: 無法找到資源
@@ -647,11 +616,6 @@ zh-TW:
description: "%{platform} 上的 %{browser}"
explanation: 這些是現在正登入於你的 Mastodon 帳戶的瀏覽器。
ip: IP 位址
- platforms:
- adobe_air: ''
- linux: ''
- mac: ''
- other: 未知平台
revoke: 取消
revoke_success: Session 取消成功
title: 作業階段
@@ -670,11 +634,8 @@ zh-TW:
statuses:
attached:
description: 附件: %{attached}
- image: "%{count} 幅圖片"
- video: "%{count} 段影片"
boosted_from_html: 轉嘟自 %{acct_link}
content_warning: 內容警告: %{warning}
- disallowed_hashtags: 包含不允許的標籤: %{tags}
language_detection: 自動偵測語言
open_in_web: 以網頁開啟
over_character_limit: 超過了 %{max} 字的限制
@@ -684,7 +645,6 @@ zh-TW:
private: 不能置頂非公開的嘟文
reblog: 不能置頂轉嘟
show_more: 顯示更多
- title: '%{name}: "%{quote}"'
visibilities:
private: 僅關注者
private_long: 只有關注你的人能看到
diff --git a/config/navigation.rb b/config/navigation.rb
index c2a8e45ce..df1024189 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -10,7 +10,12 @@ SimpleNavigation::Configuration.run do |navigation|
s.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? }
end
- n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, highlights_on: %r{/settings/preferences|/settings/notifications}
+ n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url do |s|
+ s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_url
+ s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_url
+ s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_url
+ end
+
n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url
n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}
diff --git a/config/routes.rb b/config/routes.rb
index 34d0081e7..764db8db2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,13 +87,22 @@ Rails.application.routes.draw do
get '/explore', to: 'directories#index', as: :explore
get '/explore/:id', to: 'directories#show', as: :explore_hashtag
+ get '/settings', to: redirect('/settings/profile')
+
namespace :settings do
resource :profile, only: [:show, :update]
- resource :preferences, only: [:show, :update]
- resource :notifications, only: [:show, :update]
- resource :import, only: [:show, :create]
+ get :preferences, to: redirect('/settings/preferences/appearance')
+
+ namespace :preferences do
+ resource :appearance, only: [:show, :update], controller: :appearance
+ resource :notifications, only: [:show, :update]
+ resource :other, only: [:show, :update], controller: :other
+ end
+
+ resource :import, only: [:show, :create]
resource :export, only: [:show, :create]
+
namespace :exports, constraints: { format: :csv } do
resources :follows, only: :index, controller: :following_accounts
resources :blocks, only: :index, controller: :blocked_accounts
@@ -103,6 +112,7 @@ Rails.application.routes.draw do
end
resource :two_factor_authentication, only: [:show, :create, :destroy]
+
namespace :two_factor_authentication do
resources :recovery_codes, only: [:create]
resource :confirmation, only: [:new, :create]
@@ -388,6 +398,29 @@ Rails.application.routes.draw do
namespace :push do
resource :subscription, only: [:create, :show, :update, :destroy]
end
+
+ namespace :admin do
+ resources :accounts, only: [:index, :show] do
+ member do
+ post :enable
+ post :unsilence
+ post :unsuspend
+ post :approve
+ post :reject
+ end
+
+ resource :action, only: [:create], controller: 'account_actions'
+ end
+
+ resources :reports, only: [:index, :show] do
+ member do
+ post :assign_to_self
+ post :unassign
+ post :reopen
+ post :resolve
+ end
+ end
+ end
end
namespace :v2 do
diff --git a/config/settings.yml b/config/settings.yml
index 63f7c3380..805624d3e 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -31,6 +31,7 @@ defaults: &defaults
noindex: false
theme: 'default'
aggregate_reblogs: true
+ advanced_layout: false
notification_emails:
follow: false
reblog: false
diff --git a/config/webpack/production.js b/config/webpack/production.js
index c829ff6f1..bceffaf5c 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -5,7 +5,7 @@ const { URL } = require('url');
const merge = require('webpack-merge');
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
const OfflinePlugin = require('offline-plugin');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
const CompressionPlugin = require('compression-webpack-plugin');
const { output } = require('./configuration');
const sharedConfig = require('./shared');
@@ -33,20 +33,10 @@ module.exports = merge(sharedConfig, {
optimization: {
minimize: true,
minimizer: [
- new UglifyJsPlugin({
+ new TerserPlugin({
cache: true,
parallel: true,
sourceMap: true,
-
- uglifyOptions: {
- compress: {
- warnings: false,
- },
-
- output: {
- comments: false,
- },
- },
}),
],
},
@@ -64,6 +54,7 @@ module.exports = merge(sharedConfig, {
}),
new OfflinePlugin({
publicPath: output.publicPath, // sw.js must be served from the root to avoid scope issues
+ safeToUseOptionalCaches: true,
caches: {
main: [':rest:'],
additional: [':externals:'],
diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js
index 27905a617..3b5b51232 100644
--- a/config/webpack/rules/css.js
+++ b/config/webpack/rules/css.js
@@ -21,7 +21,6 @@ module.exports = {
{
loader: 'sass-loader',
options: {
- fiber: require('fibers'),
implementation: require('sass'),
sourceMap: true,
},
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 000000000..f94417f2e
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,20 @@
+commit_message: "[ci skip]"
+files:
+ - source: /app/javascript/mastodon/locales/en.json
+ translation: /app/javascript/mastodon/locales/%two_letters_code%.json
+ update_option: update_as_unapproved
+ - source: /config/locales/en.yml
+ translation: /config/locales/%two_letters_code%.yml
+ update_option: update_as_unapproved
+ - source: /config/locales/simple_form.en.yml
+ translation: /config/locales/simple_form.%two_letters_code%.yml
+ update_option: update_as_unapproved
+ - source: /config/locales/activerecord.en.yml
+ translation: /config/locales/activerecord.%two_letters_code%.yml
+ update_option: update_as_unapproved
+ - source: /config/locales/devise.en.yml
+ translation: /config/locales/devise.%two_letters_code%.yml
+ update_option: update_as_unapproved
+ - source: /config/locales/doorkeeper.en.yml
+ translation: /config/locales/doorkeeper.%two_letters_code%.yml
+ update_option: update_as_unapproved
diff --git a/db/migrate/20171005102658_create_account_moderation_notes.rb b/db/migrate/20171005102658_create_account_moderation_notes.rb
index 974ed9940..010b94586 100644
--- a/db/migrate/20171005102658_create_account_moderation_notes.rb
+++ b/db/migrate/20171005102658_create_account_moderation_notes.rb
@@ -8,6 +8,6 @@ class CreateAccountModerationNotes < ActiveRecord::Migration[5.1]
t.timestamps
end
- add_foreign_key :account_moderation_notes, :accounts, column: :target_account_id
+ safety_assured { add_foreign_key :account_moderation_notes, :accounts, column: :target_account_id }
end
end
diff --git a/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb b/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb
index fc1e1ab91..cdcd15934 100644
--- a/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb
+++ b/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb
@@ -1,5 +1,5 @@
class AddForeignKeyToAccountModerationNotes < ActiveRecord::Migration[5.1]
def change
- add_foreign_key :account_moderation_notes, :accounts
+ safety_assured { add_foreign_key :account_moderation_notes, :accounts }
end
end
diff --git a/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb b/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb
index 0c8a894cc..586ef6f02 100644
--- a/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb
+++ b/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb
@@ -1,6 +1,6 @@
class AddMovedToAccountIdToAccounts < ActiveRecord::Migration[5.1]
def change
add_column :accounts, :moved_to_account_id, :bigint, null: true, default: nil
- add_foreign_key :accounts, :accounts, column: :moved_to_account_id, on_delete: :nullify
+ safety_assured { add_foreign_key :accounts, :accounts, column: :moved_to_account_id, on_delete: :nullify }
end
end
diff --git a/db/migrate/20180402040909_create_report_notes.rb b/db/migrate/20180402040909_create_report_notes.rb
index 732ddf825..429cb4534 100644
--- a/db/migrate/20180402040909_create_report_notes.rb
+++ b/db/migrate/20180402040909_create_report_notes.rb
@@ -8,7 +8,7 @@ class CreateReportNotes < ActiveRecord::Migration[5.1]
t.timestamps
end
- add_foreign_key :report_notes, :reports, column: :report_id, on_delete: :cascade
- add_foreign_key :report_notes, :accounts, column: :account_id, on_delete: :cascade
+ safety_assured { add_foreign_key :report_notes, :reports, column: :report_id, on_delete: :cascade }
+ safety_assured { add_foreign_key :report_notes, :accounts, column: :account_id, on_delete: :cascade }
end
end
diff --git a/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb b/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb
new file mode 100644
index 000000000..80c244842
--- /dev/null
+++ b/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb
@@ -0,0 +1,5 @@
+class AddByModeratorToTombstone < ActiveRecord::Migration[5.2]
+ def change
+ add_column :tombstones, :by_moderator, :boolean
+ end
+end
diff --git a/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb b/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb
new file mode 100644
index 000000000..1e5cd669c
--- /dev/null
+++ b/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb
@@ -0,0 +1,41 @@
+class AddSilencedAtSuspendedAtToAccounts < ActiveRecord::Migration[5.2]
+ class Account < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ end
+
+ class DomainBlock < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ enum severity: [:silence, :suspend, :noop]
+
+ has_many :accounts, foreign_key: :domain, primary_key: :domain
+ end
+
+ def up
+ add_column :accounts, :silenced_at, :datetime
+ add_column :accounts, :suspended_at, :datetime
+
+ # Record suspend date of blocks and silences for users whose limitations match
+ # a domain block
+ DomainBlock.where(severity: [:silence, :suspend]).find_each do |block|
+ scope = block.accounts
+ if block.suspend?
+ block.accounts.where(suspended: true).in_batches.update_all(suspended_at: block.created_at)
+ else
+ block.accounts.where(silenced: true).in_batches.update_all(silenced_at: block.created_at)
+ end
+ end
+
+ # Set dates for accounts which have limitations not related to a domain block
+ Account.where(suspended: true, suspended_at: nil).in_batches.update_all(suspended_at: Time.now.utc)
+ Account.where(silenced: true, silenced_at: nil).in_batches.update_all(silenced_at: Time.now.utc)
+ end
+
+ def down
+ # Block or silence accounts that have a date set
+ Account.where(suspended: false).where.not(suspended_at: nil).in_batches.update_all(suspended: true)
+ Account.where(silenced: false).where.not(silenced_at: nil).in_batches.update_all(silenced: true)
+
+ remove_column :accounts, :silenced_at
+ remove_column :accounts, :suspended_at
+ end
+end
diff --git a/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb
new file mode 100644
index 000000000..72b7c609d
--- /dev/null
+++ b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb
@@ -0,0 +1,17 @@
+class PreserveOldLayoutForExistingUsers < ActiveRecord::Migration[5.2]
+ disable_ddl_transaction!
+
+ def up
+ # Assume that currently active users are already using the layout that they
+ # want to use, therefore ensure that it is saved explicitly and not based
+ # on the to-be-changed default
+
+ User.where(User.arel_table[:current_sign_in_at].gteq(1.month.ago)).find_each do |user|
+ next if Setting.unscoped.where(thing_type: 'User', thing_id: user.id, var: 'advanced_layout').exists?
+ user.settings.advanced_layout = true
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb b/db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb
new file mode 100644
index 000000000..a46349cb7
--- /dev/null
+++ b/db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class RemoveSuspendedSilencedAccountFields < ActiveRecord::Migration[5.2]
+ class Account < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ end
+
+ class DomainBlock < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ enum severity: [:silence, :suspend, :noop]
+
+ has_many :accounts, foreign_key: :domain, primary_key: :domain
+ end
+
+ disable_ddl_transaction!
+
+ def up
+ # Record suspend date of blocks and silences for users whose limitations match
+ # a domain block
+ DomainBlock.where(severity: [:silence, :suspend]).find_each do |block|
+ scope = block.accounts
+ if block.suspend?
+ block.accounts.where(suspended: true).in_batches.update_all(suspended_at: block.created_at)
+ else
+ block.accounts.where(silenced: true).in_batches.update_all(silenced_at: block.created_at)
+ end
+ end
+
+ # Set dates for accounts which have limitations not related to a domain block
+ Account.where(suspended: true, suspended_at: nil).in_batches.update_all(suspended_at: Time.now.utc)
+ Account.where(silenced: true, silenced_at: nil).in_batches.update_all(silenced_at: Time.now.utc)
+
+ safety_assured do
+ remove_column :accounts, :suspended, :boolean, null: false, default: false
+ remove_column :accounts, :silenced, :boolean, null: false, default: false
+ end
+ end
+
+ def down
+ safety_assured do
+ add_column :accounts, :suspended, :boolean, null: false, default: false
+ add_column :accounts, :silenced, :boolean, null: false, default: false
+ end
+ end
+end
diff --git a/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb b/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
new file mode 100644
index 000000000..d2d924239
--- /dev/null
+++ b/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
@@ -0,0 +1,23 @@
+class RemoveBoostsWideningAudience < ActiveRecord::Migration[5.2]
+ disable_ddl_transaction!
+
+ def up
+ public_boosts = Status.find_by_sql(<<-SQL)
+ SELECT boost.id
+ FROM statuses AS boost
+ LEFT JOIN statuses AS boosted ON boost.reblog_of_id = boosted.id
+ WHERE
+ boost.id > 101746055577600000
+ AND (boost.local = TRUE OR boost.uri IS NULL)
+ AND boost.visibility IN (0, 1)
+ AND boost.reblog_of_id IS NOT NULL
+ AND boosted.visibility = 2
+ SQL
+
+ RemovalWorker.push_bulk(public_boosts.pluck(:id))
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8613539d6..f633f4e3f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2019_04_20_025523) do
+ActiveRecord::Schema.define(version: 2019_05_29_143559) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -131,8 +131,6 @@ ActiveRecord::Schema.define(version: 2019_04_20_025523) do
t.datetime "header_updated_at"
t.string "avatar_remote_url"
t.datetime "subscription_expires_at"
- t.boolean "silenced", default: false, null: false
- t.boolean "suspended", default: false, null: false
t.boolean "locked", default: false, null: false
t.string "header_remote_url", default: "", null: false
t.datetime "last_webfingered_at"
@@ -148,6 +146,8 @@ ActiveRecord::Schema.define(version: 2019_04_20_025523) do
t.string "actor_type"
t.boolean "discoverable"
t.string "also_known_as", array: true
+ t.datetime "silenced_at"
+ t.datetime "suspended_at"
t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id"
@@ -382,9 +382,9 @@ ActiveRecord::Schema.define(version: 2019_04_20_025523) do
create_table "mutes", force: :cascade do |t|
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.boolean "hide_notifications", default: true, null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
- t.boolean "hide_notifications", default: true, null: false
t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
t.index ["target_account_id"], name: "index_mutes_on_target_account_id"
end
@@ -676,6 +676,7 @@ ActiveRecord::Schema.define(version: 2019_04_20_025523) do
t.string "uri", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.boolean "by_moderator"
t.index ["account_id"], name: "index_tombstones_on_account_id"
t.index ["uri"], name: "index_tombstones_on_uri"
end
diff --git a/docker-compose.yml b/docker-compose.yml
index 47662d470..93d47f1a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
redis:
restart: always
- image: redis:4.0-alpine
+ image: redis:5.0-alpine
networks:
- internal_network
healthcheck:
diff --git a/lib/cli.rb b/lib/cli.rb
index 5780e3e87..be276583d 100644
--- a/lib/cli.rb
+++ b/lib/cli.rb
@@ -106,7 +106,7 @@ module Mastodon
[json, account.id, inbox_url]
end
- account.update_column(:suspended, true)
+ account.suspend!
end
processed += 1
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb
index 3131647f3..7d0215313 100644
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -87,8 +87,8 @@ module Mastodon
end
end
- account.suspended = false
- user.account = account
+ account.suspended_at = nil
+ user.account = account
if user.save
if options[:confirmed]
diff --git a/lib/mastodon/domains_cli.rb b/lib/mastodon/domains_cli.rb
index 303b8a94a..b081581fe 100644
--- a/lib/mastodon/domains_cli.rb
+++ b/lib/mastodon/domains_cli.rb
@@ -28,10 +28,15 @@ module Mastodon
say('.', :green, false)
end
- DomainBlock.where(domain: domain).destroy_all
+ DomainBlock.where(domain: domain).destroy_all unless options[:dry_run]
say
say("Removed #{removed} accounts#{dry_run}", :green)
+
+ custom_emojis = CustomEmoji.where(domain: domain)
+ custom_emojis_count = custom_emojis.count
+ custom_emojis.destroy_all unless options[:dry_run]
+ say("Removed #{custom_emojis_count} custom emojis", :green)
end
option :concurrency, type: :numeric, default: 50, aliases: [:c]
diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb
index 32827dd45..97a822e45 100644
--- a/lib/mastodon/emoji_cli.rb
+++ b/lib/mastodon/emoji_cli.rb
@@ -15,9 +15,9 @@ module Mastodon
option :suffix
option :overwrite, type: :boolean
option :unlisted, type: :boolean
- desc 'import PATH', 'Import emoji from a TAR archive at PATH'
+ desc 'import PATH', 'Import emoji from a TAR GZIP archive at PATH'
long_desc <<-LONG_DESC
- Imports custom emoji from a TAR archive specified by PATH.
+ Imports custom emoji from a TAR GZIP archive specified by PATH.
Existing emoji will be skipped unless the --overwrite option
is provided, in which case they will be overwritten.
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 91f45e45d..47eac2432 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,7 +9,7 @@ module Mastodon
end
def minor
- 8
+ 9
end
def patch
diff --git a/lib/paperclip/type_corrector.rb b/lib/paperclip/type_corrector.rb
new file mode 100644
index 000000000..0b0c10a56
--- /dev/null
+++ b/lib/paperclip/type_corrector.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'mime/types/columnar'
+
+module Paperclip
+ class TypeCorrector < Paperclip::Processor
+ def make
+ target_extension = options[:format]
+ extension = File.extname(attachment.instance.file_file_name)
+
+ return @file unless options[:style] == :original && target_extension && extension != target_extension
+
+ attachment.instance.file_content_type = options[:content_type] || attachment.instance.file_content_type
+ attachment.instance.file_file_name = File.basename(attachment.instance.file_file_name, '.*') + '.' + target_extension
+
+ @file
+ end
+ end
+end
diff --git a/nanobox/nginx-local.conf b/nanobox/nginx-local.conf
index c0e883603..37c8a451a 100644
--- a/nanobox/nginx-local.conf
+++ b/nanobox/nginx-local.conf
@@ -10,10 +10,13 @@ http {
sendfile on;
gzip on;
- gzip_http_version 1.0;
- gzip_proxied any;
- gzip_min_length 500;
gzip_disable "MSIE [1-6]\.";
+ gzip_vary on;
+ gzip_proxied any;
+ gzip_comp_level 6;
+ gzip_buffers 16 8k;
+ gzip_min_length 500;
+ gzip_http_version 1.1;
gzip_types text/plain text/xml text/javascript text/css text/comma-separated-values application/xml+rss application/xml application/x-javascript application/json application/javascript application/atom+xml;
# Proxy upstream to the puma process
@@ -36,9 +39,12 @@ http {
# Listen on port 8080
listen 8080;
+ keepalive_timeout 70;
+ client_max_body_size 80M;
+
root /app/public;
- client_max_body_size 80M;
+ add_header Strict-Transport-Security "max-age=31536000";
location / {
try_files $uri @rails;
@@ -47,6 +53,10 @@ http {
# Proxy connections to rails
location @rails {
proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ proxy_set_header Proxy "";
proxy_pass_header Server;
proxy_pass http://rails;
@@ -62,6 +72,10 @@ http {
# Proxy connections to node
location /api/v1/streaming {
proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ proxy_set_header Proxy "";
proxy_pass http://node;
proxy_buffering off;
diff --git a/nanobox/nginx-stream.conf.erb b/nanobox/nginx-stream.conf.erb
index 12bcc8ca5..4ea6e30fc 100644
--- a/nanobox/nginx-stream.conf.erb
+++ b/nanobox/nginx-stream.conf.erb
@@ -10,10 +10,13 @@ http {
sendfile on;
gzip on;
- gzip_http_version 1.1;
- gzip_proxied any;
- gzip_min_length 500;
gzip_disable "MSIE [1-6]\.";
+ gzip_vary on;
+ gzip_proxied any;
+ gzip_comp_level 6;
+ gzip_buffers 16 8k;
+ gzip_min_length 500;
+ gzip_http_version 1.1;
gzip_types text/plain text/xml text/javascript text/css text/comma-separated-values application/xml+rss application/xml application/x-javascript application/json application/javascript application/atom+xml;
# Proxy upstream to the node process
@@ -31,11 +34,13 @@ http {
# Listen on port 8080
listen 8080;
- add_header Strict-Transport-Security "max-age=31536000";
- # add_header Content-Security-Policy "style-src 'self' 'unsafe-inline'; script-src 'self'; object-src 'self'; img-src data: https:; media-src data: https:; connect-src 'self' wss://<%= ENV["LOCAL_DOMAIN"] %>; upgrade-insecure-requests";
+ keepalive_timeout 70;
+ client_max_body_size 80M;
root /app/public;
+ add_header Strict-Transport-Security "max-age=31536000";
+
location / {
try_files $uri @node;
}
@@ -43,6 +48,10 @@ http {
# Proxy connections to node
location @node {
proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ proxy_set_header Proxy "";
proxy_pass http://node;
proxy_buffering off;
diff --git a/nanobox/nginx-web.conf.erb b/nanobox/nginx-web.conf.erb
index d96f1bfc7..182d99209 100644
--- a/nanobox/nginx-web.conf.erb
+++ b/nanobox/nginx-web.conf.erb
@@ -10,10 +10,13 @@ http {
sendfile on;
gzip on;
- gzip_http_version 1.0;
- gzip_proxied any;
- gzip_min_length 500;
gzip_disable "MSIE [1-6]\.";
+ gzip_vary on;
+ gzip_proxied any;
+ gzip_comp_level 6;
+ gzip_buffers 16 8k;
+ gzip_min_length 500;
+ gzip_http_version 1.1;
gzip_types text/plain text/xml text/javascript text/css text/comma-separated-values application/xml+rss application/xml application/x-javascript application/json application/javascript application/atom+xml;
# Proxy upstream to the puma process
@@ -31,12 +34,12 @@ http {
# Listen on port 8080
listen 8080;
- add_header Strict-Transport-Security "max-age=31536000";
- # add_header Content-Security-Policy "style-src 'self' 'unsafe-inline'; script-src 'self'; object-src 'self'; img-src data: https:; media-src data: https:; connect-src 'self' wss://<%= ENV["LOCAL_DOMAIN"] %>; upgrade-insecure-requests";
+ keepalive_timeout 70;
+ client_max_body_size 80M;
root /app/public;
- client_max_body_size 80M;
+ add_header Strict-Transport-Security "max-age=31536000";
location / {
try_files $uri @rails;
@@ -44,17 +47,23 @@ http {
location /sw.js {
add_header Cache-Control "public, max-age=0";
+ add_header Strict-Transport-Security "max-age=31536000";
try_files $uri @rails;
}
location ~ ^/(emoji|packs|system/media_attachments/files|system/accounts/avatars) {
add_header Cache-Control "public, max-age=31536000, immutable";
+ add_header Strict-Transport-Security "max-age=31536000";
try_files $uri @rails;
}
# Proxy connections to rails
location @rails {
proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ proxy_set_header Proxy "";
proxy_pass_header Server;
proxy_pass http://rails;
@@ -66,7 +75,10 @@ http {
proxy_cache CACHE;
proxy_cache_valid 200 7d;
+ proxy_cache_valid 410 24h;
proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
+ add_header Strict-Transport-Security "max-age=31536000";
+ add_header X-Cached $upstream_cache_status;
tcp_nodelay on;
}
diff --git a/package.json b/package.json
index 67396ccc3..c691d8e43 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
- "node": ">=8 <11"
+ "node": ">=8.12 <12"
},
"scripts": {
"postversion": "git push --tags",
@@ -10,8 +10,10 @@
"build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
"manage:translations": "node ./config/webpack/translationRunner.js",
"start": "node ./streaming/index.js",
- "test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
- "test:lint": "eslint --ext=js .",
+ "test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest",
+ "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
+ "test:lint:js": "eslint --ext=js .",
+ "test:lint:sass": "sass-lint -v",
"test:jest": "cross-env NODE_ENV=test jest --coverage"
},
"repository": {
@@ -57,25 +59,26 @@
},
"private": true,
"dependencies": {
- "@babel/core": "^7.3.4",
- "@babel/plugin-proposal-class-properties": "^7.3.4",
- "@babel/plugin-proposal-decorators": "^7.3.0",
- "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
+ "@babel/core": "^7.4.5",
+ "@babel/plugin-proposal-class-properties": "^7.4.4",
+ "@babel/plugin-proposal-decorators": "^7.4.4",
+ "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-react-inline-elements": "^7.2.0",
"@babel/plugin-transform-react-jsx-self": "^7.2.0",
"@babel/plugin-transform-react-jsx-source": "^7.2.0",
- "@babel/plugin-transform-runtime": "^7.3.4",
- "@babel/preset-env": "^7.3.4",
+ "@babel/plugin-transform-runtime": "^7.4.4",
+ "@babel/preset-env": "^7.4.5",
"@babel/preset-react": "^7.0.0",
- "@babel/runtime": "^7.3.4",
+ "@babel/runtime": "^7.4.5",
+ "@clusterws/cws": "^0.14.0",
"array-includes": "^3.0.3",
- "autoprefixer": "^9.4.10",
- "axios": "^0.18.0",
+ "autoprefixer": "^9.6.0",
+ "axios": "^0.19.0",
"babel-loader": "^8.0.5",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^3.0.1",
- "babel-plugin-react-intl": "^3.0.1",
+ "babel-plugin-react-intl": "^3.1.3",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"babel-runtime": "^6.26.0",
"blurhash": "^1.0.0",
@@ -85,26 +88,24 @@
"css-loader": "^2.1.1",
"cssnano": "^4.1.10",
"detect-passive-events": "^1.0.2",
- "dotenv": "^6.2.0",
+ "dotenv": "^8.0.0",
"emoji-mart": "Gargron/emoji-mart#build",
"es6-symbol": "^3.1.1",
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",
- "express": "^4.16.4",
- "fibers": "^3.1.1",
- "file-loader": "^3.0.1",
+ "express": "^4.17.1",
+ "file-loader": "^4.0.0",
"font-awesome": "^4.7.0",
"glob": "^7.1.1",
- "history": "^4.7.2",
"http-link-header": "^1.0.2",
"immutable": "^3.8.2",
"imports-loader": "^0.8.0",
- "intersection-observer": "^0.5.1",
+ "intersection-observer": "^0.7.0",
"intl": "^1.2.5",
"intl-messageformat": "^2.2.0",
- "intl-relativeformat": "^2.1.0",
+ "intl-relativeformat": "^2.2.0",
"is-nan": "^1.2.1",
- "js-yaml": "^3.11.0",
+ "js-yaml": "^3.13.1",
"lodash": "^4.7.11",
"mark-loader": "^0.1.6",
"marky": "^1.2.1",
@@ -113,73 +114,73 @@
"npmlog": "^4.1.2",
"object-assign": "^4.1.1",
"object-fit-images": "^3.2.3",
- "object.values": "^1.0.4",
- "offline-plugin": "^5.0.6",
+ "object.values": "^1.1.0",
+ "offline-plugin": "^5.0.7",
"path-complete-extname": "^1.0.0",
"pg": "^6.4.0",
"postcss-loader": "^3.0.0",
"postcss-object-fit-images": "^1.1.2",
"prop-types": "^15.5.10",
"punycode": "^2.1.0",
- "rails-ujs": "^5.2.2",
- "react": "^16.7.0",
- "react-dom": "^16.7.0",
+ "rails-ujs": "^5.2.3",
+ "react": "^16.8.6",
+ "react-dom": "^16.8.6",
"react-hotkeys": "^1.1.4",
"react-immutable-proptypes": "^2.1.0",
"react-immutable-pure-component": "^1.1.1",
- "react-intl": "^2.7.2",
+ "react-intl": "^2.9.0",
"react-masonry-infinite": "^1.2.2",
"react-motion": "^0.5.2",
"react-notification": "^6.8.4",
"react-overlays": "^0.8.3",
- "react-redux": "^6.0.0",
+ "react-redux": "^6.0.1",
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
- "react-select": "^2.2.0",
+ "react-select": "^2.4.4",
"react-sparklines": "^1.7.0",
- "react-swipeable-views": "^0.13.0",
+ "react-swipeable-views": "^0.13.3",
"react-textarea-autosize": "^7.1.0",
"react-toggle": "^4.0.1",
"redis": "^2.7.1",
"redux": "^4.0.1",
"redux-immutable": "^4.0.0",
"redux-thunk": "^2.2.0",
- "rellax": "^1.7.1",
+ "rellax": "^1.10.0",
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
- "rimraf": "^2.6.1",
- "sass": "^1.17.2",
+ "rimraf": "^2.6.3",
+ "sass": "^1.20.3",
"sass-loader": "^7.0.3",
"stringz": "^1.0.0",
"substring-trie": "^1.0.2",
+ "terser-webpack-plugin": "^1.3.0",
"throng": "^4.0.0",
"tiny-queue": "^0.2.1",
- "uglifyjs-webpack-plugin": "^2.1.2",
"uuid": "^3.1.0",
- "uws": "10.148.0",
- "webpack": "^4.29.6",
+ "webpack": "^4.34.0",
"webpack-assets-manifest": "^3.1.1",
- "webpack-bundle-analyzer": "^3.1.0",
- "webpack-cli": "^3.2.3",
+ "webpack-bundle-analyzer": "^3.3.2",
+ "webpack-cli": "^3.3.4",
"webpack-merge": "^4.2.1",
"websocket.js": "^0.1.12"
},
"devDependencies": {
"babel-eslint": "^10.0.1",
- "babel-jest": "^24.5.0",
- "enzyme": "^3.8.0",
- "enzyme-adapter-react-16": "^1.7.1",
+ "babel-jest": "^24.8.0",
+ "enzyme": "^3.10.0",
+ "enzyme-adapter-react-16": "^1.14.0",
"eslint": "^5.11.1",
- "eslint-plugin-import": "~2.14.0",
- "eslint-plugin-jsx-a11y": "~6.1.2",
- "eslint-plugin-promise": "~4.0.1",
+ "eslint-plugin-import": "~2.17.3",
+ "eslint-plugin-jsx-a11y": "~6.2.1",
+ "eslint-plugin-promise": "~4.1.1",
"eslint-plugin-react": "~7.12.1",
- "jest": "^24.5.0",
+ "jest": "^24.8.0",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
- "react-test-renderer": "^16.7.0",
- "webpack-dev-server": "^3.2.1",
+ "react-test-renderer": "^16.8.6",
+ "sass-lint": "^1.13.1",
+ "webpack-dev-server": "^3.5.1",
"yargs": "^12.0.5"
}
}
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 2a8675c21..fb23658c0 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -63,9 +63,9 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
service = double(call: true)
allow(UnblockDomainService).to receive(:new).and_return(service)
domain_block = Fabricate(:domain_block)
- delete :destroy, params: { id: domain_block.id, domain_block: { retroactive: '1' } }
+ delete :destroy, params: { id: domain_block.id }
- expect(service).to have_received(:call).with(domain_block, true)
+ expect(service).to have_received(:call).with(domain_block)
expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.destroyed_msg')
expect(response).to redirect_to(admin_instances_path(limited: '1'))
end
diff --git a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
index 727669886..19ac32612 100644
--- a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
@@ -61,7 +61,7 @@ describe Api::V1::Accounts::CredentialsController do
describe 'with invalid data' do
before do
- patch :update, params: { note: 'This is too long. ' * 10 }
+ patch :update, params: { note: 'This is too long. ' * 30 }
end
it 'returns http unprocessable entity' do
diff --git a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
new file mode 100644
index 000000000..a5a8f4bb0
--- /dev/null
+++ b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
@@ -0,0 +1,57 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::Admin::AccountActionsController, type: :controller do
+ render_views
+
+ let(:role) { 'moderator' }
+ let(:user) { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+ let(:scopes) { 'admin:read admin:write' }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:account) { Fabricate(:user).account }
+
+ before do
+ allow(controller).to receive(:doorkeeper_token) { token }
+ end
+
+ shared_examples 'forbidden for wrong scope' do |wrong_scope|
+ let(:scopes) { wrong_scope }
+
+ it 'returns http forbidden' do
+ expect(response).to have_http_status(403)
+ end
+ end
+
+ shared_examples 'forbidden for wrong role' do |wrong_role|
+ let(:role) { wrong_role }
+
+ it 'returns http forbidden' do
+ expect(response).to have_http_status(403)
+ end
+ end
+
+ describe 'POST #create' do
+ before do
+ post :create, params: { account_id: account.id, type: 'disable' }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+
+ it 'performs action against account' do
+ expect(account.reload.user_disabled?).to be true
+ end
+
+ it 'logs action' do
+ log_item = Admin::ActionLog.last
+
+ expect(log_item).to_not be_nil
+ expect(log_item.action).to eq :disable
+ expect(log_item.account_id).to eq user.account_id
+ expect(log_item.target_id).to eq account.user.id
+ end
+ end
+end
diff --git a/spec/controllers/api/v1/admin/accounts_controller_spec.rb b/spec/controllers/api/v1/admin/accounts_controller_spec.rb
new file mode 100644
index 000000000..f3f9946ba
--- /dev/null
+++ b/spec/controllers/api/v1/admin/accounts_controller_spec.rb
@@ -0,0 +1,147 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
+ render_views
+
+ let(:role) { 'moderator' }
+ let(:user) { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+ let(:scopes) { 'admin:read admin:write' }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:account) { Fabricate(:user).account }
+
+ before do
+ allow(controller).to receive(:doorkeeper_token) { token }
+ end
+
+ shared_examples 'forbidden for wrong scope' do |wrong_scope|
+ let(:scopes) { wrong_scope }
+
+ it 'returns http forbidden' do
+ expect(response).to have_http_status(403)
+ end
+ end
+
+ shared_examples 'forbidden for wrong role' do |wrong_role|
+ let(:role) { wrong_role }
+
+ it 'returns http forbidden' do
+ expect(response).to have_http_status(403)
+ end
+ end
+
+ describe 'GET #index' do
+ before do
+ get :index
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ describe 'GET #show' do
+ before do
+ get :show, params: { id: account.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ describe 'POST #approve' do
+ before do
+ account.user.update(approved: false)
+ post :approve, params: { id: account.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+
+ it 'approves user' do
+ expect(account.reload.user_approved?).to be true
+ end
+ end
+
+ describe 'POST #reject' do
+ before do
+ account.user.update(approved: false)
+ post :reject, params: { id: account.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+
+ it 'removes user' do
+ expect(User.where(id: account.user.id).count).to eq 0
+ end
+ end
+
+ describe 'POST #enable' do
+ before do
+ account.user.update(disabled: true)
+ post :enable, params: { id: account.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+
+ it 'enables user' do
+ expect(account.reload.user_disabled?).to be false
+ end
+ end
+
+ describe 'POST #unsuspend' do
+ before do
+ account.touch(:suspended_at)
+ post :unsuspend, params: { id: account.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+
+ it 'unsuspends account' do
+ expect(account.reload.suspended?).to be false
+ end
+ end
+
+ describe 'POST #unsilence' do
+ before do
+ account.touch(:silenced_at)
+ post :unsilence, params: { id: account.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+
+ it 'unsilences account' do
+ expect(account.reload.silenced?).to be false
+ end
+ end
+end
diff --git a/spec/controllers/api/v1/admin/reports_controller_spec.rb b/spec/controllers/api/v1/admin/reports_controller_spec.rb
new file mode 100644
index 000000000..4ed3c5dc4
--- /dev/null
+++ b/spec/controllers/api/v1/admin/reports_controller_spec.rb
@@ -0,0 +1,109 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
+ render_views
+
+ let(:role) { 'moderator' }
+ let(:user) { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+ let(:scopes) { 'admin:read admin:write' }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:report) { Fabricate(:report) }
+
+ before do
+ allow(controller).to receive(:doorkeeper_token) { token }
+ end
+
+ shared_examples 'forbidden for wrong scope' do |wrong_scope|
+ let(:scopes) { wrong_scope }
+
+ it 'returns http forbidden' do
+ expect(response).to have_http_status(403)
+ end
+ end
+
+ shared_examples 'forbidden for wrong role' do |wrong_role|
+ let(:role) { wrong_role }
+
+ it 'returns http forbidden' do
+ expect(response).to have_http_status(403)
+ end
+ end
+
+ describe 'GET #index' do
+ before do
+ get :index
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ describe 'GET #show' do
+ before do
+ get :show, params: { id: report.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ describe 'POST #resolve' do
+ before do
+ post :resolve, params: { id: report.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ describe 'POST #reopen' do
+ before do
+ post :reopen, params: { id: report.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ describe 'POST #assign_to_self' do
+ before do
+ post :assign_to_self, params: { id: report.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ describe 'POST #unassign' do
+ before do
+ post :unassign, params: { id: report.id }
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'write:statuses'
+ it_behaves_like 'forbidden for wrong role', 'user'
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+end
diff --git a/spec/controllers/api/v1/notifications_controller_spec.rb b/spec/controllers/api/v1/notifications_controller_spec.rb
index d0f82e79f..db3f4b782 100644
--- a/spec/controllers/api/v1/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/notifications_controller_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
let(:other) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
+ let(:third) { Fabricate(:user, account: Fabricate(:account, username: 'carol')) }
before do
allow(controller).to receive(:doorkeeper_token) { token }
@@ -55,6 +56,7 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
mentioning_status = PostStatusService.new.call(other.account, text: 'Hello @alice')
@mention_from_status = mentioning_status.mentions.first
@favourite = FavouriteService.new.call(other.account, first_status)
+ @second_favourite = FavouriteService.new.call(third.account, first_status)
@follow = FollowService.new.call(other.account, 'alice')
end
@@ -84,6 +86,66 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
end
end
+ describe 'from specified user' do
+ before do
+ get :index, params: { account_id: third.account.id }
+ end
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+
+ it 'includes favourite' do
+ expect(assigns(:notifications).map(&:activity)).to include(@second_favourite)
+ end
+
+ it 'excludes favourite' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@favourite)
+ end
+
+ it 'excludes mention' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@mention_from_status)
+ end
+
+ it 'excludes reblog' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@reblog_of_first_status)
+ end
+
+ it 'excludes follow' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@follow)
+ end
+ end
+
+ describe 'from nonexistent user' do
+ before do
+ get :index, params: { account_id: 'foo' }
+ end
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+
+ it 'excludes favourite' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@favourite)
+ end
+
+ it 'excludes second favourite' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@second_favourite)
+ end
+
+ it 'excludes mention' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@mention_from_status)
+ end
+
+ it 'excludes reblog' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@reblog_of_first_status)
+ end
+
+ it 'excludes follow' do
+ expect(assigns(:notifications).map(&:activity)).to_not include(@follow)
+ end
+ end
+
describe 'with excluded mentions' do
before do
get :index, params: { exclude_types: ['mention'] }
@@ -105,6 +167,10 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
expect(assigns(:notifications).map(&:activity)).to include(@favourite)
end
+ it 'includes third favourite' do
+ expect(assigns(:notifications).map(&:activity)).to include(@second_favourite)
+ end
+
it 'includes follow' do
expect(assigns(:notifications).map(&:activity)).to include(@follow)
end
diff --git a/spec/controllers/api/v1/polls_controller_spec.rb b/spec/controllers/api/v1/polls_controller_spec.rb
index 2b8d5f3ef..851bccb7e 100644
--- a/spec/controllers/api/v1/polls_controller_spec.rb
+++ b/spec/controllers/api/v1/polls_controller_spec.rb
@@ -10,14 +10,26 @@ RSpec.describe Api::V1::PollsController, type: :controller do
before { allow(controller).to receive(:doorkeeper_token) { token } }
describe 'GET #show' do
- let(:poll) { Fabricate(:poll) }
+ let(:poll) { Fabricate(:poll, status: Fabricate(:status, visibility: visibility)) }
before do
get :show, params: { id: poll.id }
end
- it 'returns http success' do
- expect(response).to have_http_status(200)
+ context 'when parent status is public' do
+ let(:visibility) { 'public' }
+
+ it 'returns http success' do
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ context 'when parent status is private' do
+ let(:visibility) { 'private' }
+
+ it 'returns http not found' do
+ expect(response).to have_http_status(404)
+ end
end
end
end
diff --git a/spec/controllers/settings/notifications_controller_spec.rb b/spec/controllers/settings/preferences/notifications_controller_spec.rb
similarity index 86%
rename from spec/controllers/settings/notifications_controller_spec.rb
rename to spec/controllers/settings/preferences/notifications_controller_spec.rb
index 981ef674e..02180b383 100644
--- a/spec/controllers/settings/notifications_controller_spec.rb
+++ b/spec/controllers/settings/preferences/notifications_controller_spec.rb
@@ -1,6 +1,6 @@
require 'rails_helper'
-describe Settings::NotificationsController do
+describe Settings::Preferences::NotificationsController do
render_views
let(:user) { Fabricate(:user) }
@@ -28,7 +28,7 @@ describe Settings::NotificationsController do
}
}
- expect(response).to redirect_to(settings_notifications_path)
+ expect(response).to redirect_to(settings_preferences_notifications_path)
user.reload
expect(user.settings['notification_emails']['follow']).to be true
expect(user.settings['interactions']['must_be_follower']).to be false
diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences/other_controller_spec.rb
similarity index 83%
rename from spec/controllers/settings/preferences_controller_spec.rb
rename to spec/controllers/settings/preferences/other_controller_spec.rb
index f2028cf39..1b556ac7f 100644
--- a/spec/controllers/settings/preferences_controller_spec.rb
+++ b/spec/controllers/settings/preferences/other_controller_spec.rb
@@ -1,6 +1,6 @@
require 'rails_helper'
-describe Settings::PreferencesController do
+describe Settings::Preferences::OtherController do
render_views
let(:user) { Fabricate(:user, filtered_languages: []) }
@@ -20,7 +20,7 @@ describe Settings::PreferencesController do
it 'updates the user record' do
put :update, params: { user: { locale: 'en', chosen_languages: ['es', 'fr', ''] } }
- expect(response).to redirect_to(settings_preferences_path)
+ expect(response).to redirect_to(settings_preferences_other_path)
user.reload
expect(user.locale).to eq 'en'
expect(user.chosen_languages).to eq ['es', 'fr']
@@ -37,7 +37,7 @@ describe Settings::PreferencesController do
}
}
- expect(response).to redirect_to(settings_preferences_path)
+ expect(response).to redirect_to(settings_preferences_other_path)
user.reload
expect(user.settings['boost_modal']).to be true
expect(user.settings['delete_modal']).to be false
diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb
index e092e6c09..f12464ef3 100644
--- a/spec/fabricators/account_fabricator.rb
+++ b/spec/fabricators/account_fabricator.rb
@@ -3,8 +3,11 @@ public_key = keypair.public_key.to_pem
private_key = keypair.to_pem
Fabricator(:account) do
+ transient :suspended, :silenced
username { sequence(:username) { |i| "#{Faker::Internet.user_name(nil, %w(_))}#{i}" } }
last_webfingered_at { Time.now.utc }
public_key { public_key }
private_key { private_key }
+ suspended_at { |attrs| attrs[:suspended] ? Time.now.utc : nil }
+ silenced_at { |attrs| attrs[:silenced] ? Time.now.utc : nil }
end
diff --git a/spec/lib/activitypub/activity/announce_spec.rb b/spec/lib/activitypub/activity/announce_spec.rb
index 926083a4f..60fd96a18 100644
--- a/spec/lib/activitypub/activity/announce_spec.rb
+++ b/spec/lib/activitypub/activity/announce_spec.rb
@@ -58,21 +58,6 @@ RSpec.describe ActivityPub::Activity::Announce do
end
end
- context 'self-boost of a previously unknown status with missing attributedTo' do
- let(:object_json) do
- {
- id: 'https://example.com/actor#bar',
- type: 'Note',
- content: 'Lorem ipsum',
- to: 'http://example.com/followers',
- }
- end
-
- it 'creates a reblog by sender of status' do
- expect(sender.reblogged?(sender.statuses.first)).to be true
- end
- end
-
context 'self-boost of a previously unknown status with correct attributedTo' do
let(:object_json) do
{
@@ -122,6 +107,7 @@ RSpec.describe ActivityPub::Activity::Announce do
type: 'Note',
content: 'Lorem ipsum',
to: 'http://example.com/followers',
+ attributedTo: 'https://example.com/actor',
}
end
@@ -141,6 +127,7 @@ RSpec.describe ActivityPub::Activity::Announce do
type: 'Note',
content: 'Lorem ipsum',
to: 'http://example.com/followers',
+ attributedTo: 'https://example.com/actor',
}
end
@@ -161,6 +148,7 @@ RSpec.describe ActivityPub::Activity::Announce do
type: 'Note',
content: 'Lorem ipsum',
to: 'http://example.com/followers',
+ attributedTo: 'https://example.com/actor',
}
end
diff --git a/spec/lib/activitypub/tag_manager_spec.rb b/spec/lib/activitypub/tag_manager_spec.rb
index 0d1665216..6d246629e 100644
--- a/spec/lib/activitypub/tag_manager_spec.rb
+++ b/spec/lib/activitypub/tag_manager_spec.rb
@@ -41,6 +41,22 @@ RSpec.describe ActivityPub::TagManager do
status.mentions.create(account: mentioned)
expect(subject.to(status)).to eq [subject.uri_for(mentioned)]
end
+
+ it "returns URIs of mentions for direct silenced author's status only if they are followers or requesting to be" do
+ bob = Fabricate(:account, username: 'bob')
+ alice = Fabricate(:account, username: 'alice')
+ foo = Fabricate(:account)
+ author = Fabricate(:account, username: 'author', silenced: true)
+ status = Fabricate(:status, visibility: :direct, account: author)
+ bob.follow!(author)
+ FollowRequest.create!(account: foo, target_account: author)
+ status.mentions.create(account: alice)
+ status.mentions.create(account: bob)
+ status.mentions.create(account: foo)
+ expect(subject.to(status)).to include(subject.uri_for(bob))
+ expect(subject.to(status)).to include(subject.uri_for(foo))
+ expect(subject.to(status)).to_not include(subject.uri_for(alice))
+ end
end
describe '#cc' do
@@ -70,6 +86,22 @@ RSpec.describe ActivityPub::TagManager do
status.mentions.create(account: mentioned)
expect(subject.cc(status)).to include(subject.uri_for(mentioned))
end
+
+ it "returns URIs of mentions for silenced author's non-direct status only if they are followers or requesting to be" do
+ bob = Fabricate(:account, username: 'bob')
+ alice = Fabricate(:account, username: 'alice')
+ foo = Fabricate(:account)
+ author = Fabricate(:account, username: 'author', silenced: true)
+ status = Fabricate(:status, visibility: :public, account: author)
+ bob.follow!(author)
+ FollowRequest.create!(account: foo, target_account: author)
+ status.mentions.create(account: alice)
+ status.mentions.create(account: bob)
+ status.mentions.create(account: foo)
+ expect(subject.cc(status)).to include(subject.uri_for(bob))
+ expect(subject.cc(status)).to include(subject.uri_for(foo))
+ expect(subject.cc(status)).to_not include(subject.uri_for(alice))
+ end
end
describe '#local_uri?' do
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index c506cd87f..5f8eb86a8 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -168,13 +168,13 @@ RSpec.describe FeedManager do
it 'returns true for status by silenced account who recipient is not following' do
status = Fabricate(:status, text: 'Hello world', account: alice)
- alice.update(silenced: true)
+ alice.silence!
expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be true
end
it 'returns false for status by followed silenced account' do
status = Fabricate(:status, text: 'Hello world', account: alice)
- alice.update(silenced: true)
+ alice.silence!
bob.follow!(alice)
expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be false
end
diff --git a/spec/lib/sanitize_config_spec.rb b/spec/lib/sanitize_config_spec.rb
new file mode 100644
index 000000000..bb3cf6f0b
--- /dev/null
+++ b/spec/lib/sanitize_config_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require Rails.root.join('app', 'lib', 'sanitize_config.rb')
+
+describe Sanitize::Config do
+ describe '::MASTODON_STRICT' do
+ subject { Sanitize::Config::MASTODON_STRICT }
+
+ it 'converts h1 to p' do
+ expect(Sanitize.fragment('
Foo
', subject)).to eq '
Foo
'
+ end
+
+ it 'converts ul to p' do
+ expect(Sanitize.fragment('
Check out:
Foo
Bar
', subject)).to eq '
Check out:
Foo Bar
'
+ end
+
+ it 'converts p inside ul' do
+ expect(Sanitize.fragment('
Foo
Bar
Baz
', subject)).to eq '
Foo Bar Baz
'
+ end
+
+ it 'converts ul inside ul' do
+ expect(Sanitize.fragment('