From 3b8023f9f9d90f2e197a4cd78ddfa2180474ff90 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 15 Jun 2018 20:38:41 +0200 Subject: [PATCH 01/32] Bump version to 2.4.2rc1 --- lib/mastodon/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 0313f4ccf2..18055b3f73 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 1 + 2 end def pre @@ -21,7 +21,7 @@ module Mastodon end def flags - '' + 'rc1' end def to_a From 97b2ba42408cee02e7681470ff690289fdb53914 Mon Sep 17 00:00:00 2001 From: Masoud Abkenar Date: Sat, 16 Jun 2018 03:05:45 +0200 Subject: [PATCH 02/32] Update fa.json (#7814) somehow weblate cannot transfer translation of these two words to here --- app/javascript/mastodon/locales/fa.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 0d5b8bf24e..910a42a3e4 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -113,7 +113,7 @@ "empty_column.public": "این‌جا هنوز چیزی نیست! خودتان چیزی بنویسید یا کاربران دیگر را پی بگیرید تا این‌جا پر شود", "follow_request.authorize": "اجازه دهید", "follow_request.reject": "اجازه ندهید", - "getting_started.documentation": "Documentation", + "getting_started.documentation": "راهنما", "getting_started.heading": "آغاز کنید", "getting_started.open_source_notice": "ماستدون یک نرم‌افزار آزاد است. می‌توانید در ساخت آن مشارکت کنید یا مشکلاتش را در {github} گزارش دهید.", "getting_started.terms": "شرایط استفاده", @@ -170,7 +170,7 @@ "navigation_bar.lists": "فهرست‌ها", "navigation_bar.logout": "خروج", "navigation_bar.mutes": "کاربران بی‌صداشده", - "navigation_bar.personal": "Personal", + "navigation_bar.personal": "شخصی", "navigation_bar.pins": "نوشته‌های ثابت", "navigation_bar.preferences": "ترجیحات", "navigation_bar.public_timeline": "نوشته‌های همه‌جا", From b469a8d68884af0df55bbb5ee089a899ba9fec57 Mon Sep 17 00:00:00 2001 From: SerCom_KC Date: Sat, 16 Jun 2018 17:24:54 +0800 Subject: [PATCH 03/32] Update Chinese (Simplified) Translations (#7816) * i18n: (zh-CN) #7805 * i18n: (zh-CN) #7801 * i18n: (zh-CN) #7803 * yarn manage:translations zh-CN * i18n: (zh-CN) #7765 --- app/javascript/mastodon/locales/zh-CN.json | 9 ++++++--- config/locales/simple_form.zh-CN.yml | 2 ++ config/locales/zh-CN.yml | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 3b5af6dd6c..de3cd0090f 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -59,6 +59,7 @@ "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": "这条嘟文被设置为“不公开”，因此它不会出现在任何话题标签的列表下。只有公开的嘟文才能通过话题标签进行搜索。", @@ -80,7 +81,7 @@ "confirmations.delete_list.confirm": "删除", "confirmations.delete_list.message": "你确定要永久删除这个列表吗？", "confirmations.domain_block.confirm": "隐藏整个网站的内容", - "confirmations.domain_block.message": "你真的确定要隐藏所有来自 {domain} 的内容吗？多数情况下，屏蔽或隐藏几个特定的用户应该就能满足你的需要了。", + "confirmations.domain_block.message": "你真的确定要隐藏所有来自 {domain} 的内容吗？多数情况下，屏蔽或隐藏几个特定的用户应该就能满足你的需要了。来自该网站的内容将不再出现在你的公共时间轴或通知列表里。来自该网站的关注者将会被移除。", "confirmations.mute.confirm": "隐藏", "confirmations.mute.message": "你确定要隐藏 {name} 吗？", "confirmations.redraft.confirm": "删除并重新编辑", @@ -113,9 +114,13 @@ "empty_column.public": "这里神马都没有！写一些公开的嘟文，或者关注其他实例的用户后，这里就会有嘟文出现了哦！", "follow_request.authorize": "同意", "follow_request.reject": "拒绝", + "getting_started.developers": "开发", "getting_started.documentation": "文档", + "getting_started.find_friends": "寻找 Twitter 好友", "getting_started.heading": "开始使用", + "getting_started.invite": "邀请用户", "getting_started.open_source_notice": "Mastodon 是一个开源软件。欢迎前往 GitHub（{github}）贡献代码或反馈问题。", + "getting_started.security": "帐户安全", "getting_started.terms": "使用条款", "home.column_settings.advanced": "高级设置", "home.column_settings.basic": "基本设置", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "本站", "tabs_bar.notifications": "通知", "tabs_bar.search": "搜索", - "timeline.media": "媒体", - "timeline.posts": "嘟文", "trends.count_by_accounts": "{count} 人正在讨论", "ui.beforeunload": "如果你现在离开 Mastodon，你的草稿内容将会被丢弃。", "upload_area.title": "将文件拖放到此处开始上传", diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 5b3b25ab13..3a315a7db1 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -3,6 +3,7 @@ zh-CN: simple_form: hints: defaults: + autofollow: 通过邀请链接注册的用户将会自动关注你 avatar: 文件大小限制 2MB，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 400×400px bot: 来自这个帐户的绝大多数操作都是自动进行的，并且可能无人监控 digest: 仅在你长时间未登录，且收到了私信时发送 @@ -26,6 +27,7 @@ zh-CN: name: 标签 value: 内容 defaults: + autofollow: 让被邀请人关注你的帐户 avatar: 头像 bot: 这是一个机器人帐户 confirm_new_password: 确认新密码 diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 267eeafc6f..9abffa01a1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -510,6 +510,7 @@ zh-CN: '86400': 1 天后 expires_in_prompt: 永不过期 generate: 生成邀请链接 + invited_by: 你的邀请人是： max_uses: "%{count} 次" max_uses_prompt: 无限制 prompt: 生成分享链接，邀请他人在本实例注册 From 0f6622f7d1bfe76e83a4865996c5a5bebba7dfae Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Sat, 16 Jun 2018 18:47:42 +0900 Subject: [PATCH 04/32] Add missing Korean translations (#7819) * Add missing Korean translations * i18n-tasks normalize --- app/javascript/mastodon/locales/ko.json | 41 ++++++++++++++----------- config/locales/ko.yml | 20 ++++++------ config/locales/simple_form.ko.yml | 2 ++ 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index fef953c667..94f14593d2 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -1,5 +1,5 @@ { - "account.badges.bot": "Bot", + "account.badges.bot": "봇", "account.block": "@{name}을 차단", "account.block_domain": "{domain} 전체를 숨김", "account.blocked": "차단 됨", @@ -59,8 +59,9 @@ "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": "Learn more", + "compose_form.direct_message_warning_learn_more": "더 알아보기", "compose_form.hashtag_warning": "이 툿은 어떤 해시태그로도 검색 되지 않습니다. 전체공개로 게시 된 툿만이 해시태그로 검색 될 수 있습니다.", "compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.", "compose_form.lock_disclaimer.lock": "비공개", @@ -83,8 +84,8 @@ "confirmations.domain_block.message": "정말로 {domain} 전체를 숨기시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다.", "confirmations.mute.confirm": "뮤트", "confirmations.mute.message": "정말로 {name}를 뮤트하시겠습니까?", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "지우고 다시 쓰기", + "confirmations.redraft.message": "정말로 지우고 다시 쓰시겠습니까? 이 툿에 대한 답장, 부스트, 즐겨찾기를 잃게 됩니다", "confirmations.unfollow.confirm": "언팔로우", "confirmations.unfollow.message": "정말로 {name}를 언팔로우하시겠습니까?", "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.", @@ -93,7 +94,7 @@ "emoji_button.custom": "커스텀", "emoji_button.flags": "국기", "emoji_button.food": "음식", - "emoji_button.label": "emoji를 추가", + "emoji_button.label": "에모지를 추가", "emoji_button.nature": "자연", "emoji_button.not_found": "없어!! (╯°□°）╯︵ ┻━┻", "emoji_button.objects": "물건", @@ -113,10 +114,14 @@ "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 인스턴스의 유저를 팔로우 해서 채워보세요", "follow_request.authorize": "허가", "follow_request.reject": "거부", - "getting_started.documentation": "Documentation", + "getting_started.developers": "개발자", + "getting_started.documentation": "문서", + "getting_started.find_friends": "트위터에서 친구 찾기", "getting_started.heading": "시작", + "getting_started.invite": "초대", "getting_started.open_source_notice": "Mastodon은 오픈 소스 소프트웨어입니다. 누구나 GitHub({github})에서 개발에 참여하거나, 문제를 보고할 수 있습니다.", - "getting_started.terms": "Terms of service", + "getting_started.security": "보안", + "getting_started.terms": "이용 약관", "home.column_settings.advanced": "고급 사용자용", "home.column_settings.basic": "기본 설정", "home.column_settings.filter_regex": "정규 표현식으로 필터링", @@ -160,7 +165,7 @@ "navigation_bar.blocks": "차단한 사용자", "navigation_bar.community_timeline": "로컬 타임라인", "navigation_bar.direct": "다이렉트 메시지", - "navigation_bar.discover": "Discover", + "navigation_bar.discover": "발견하기", "navigation_bar.domain_blocks": "숨겨진 도메인", "navigation_bar.edit_profile": "프로필 편집", "navigation_bar.favourites": "즐겨찾기", @@ -170,11 +175,11 @@ "navigation_bar.lists": "리스트", "navigation_bar.logout": "로그아웃", "navigation_bar.mutes": "뮤트 중인 사용자", - "navigation_bar.personal": "Personal", + "navigation_bar.personal": "개인용", "navigation_bar.pins": "고정된 툿", "navigation_bar.preferences": "사용자 설정", "navigation_bar.public_timeline": "연합 타임라인", - "navigation_bar.security": "Security", + "navigation_bar.security": "보안", "notification.favourite": "{name}님이 즐겨찾기 했습니다", "notification.follow": "{name}님이 나를 팔로우 했습니다", "notification.mention": "{name}님이 답글을 보냈습니다", @@ -190,21 +195,21 @@ "notifications.column_settings.reblog": "부스트:", "notifications.column_settings.show": "컬럼에 표시", "notifications.column_settings.sound": "효과음 재생", - "notifications.group": "{count} notifications", + "notifications.group": "{count} 개의 알림", "onboarding.done": "완료", "onboarding.next": "다음", "onboarding.page_five.public_timelines": "연합 타임라인에서는 {domain}의 사람들이 팔로우 중인 Mastodon 전체 인스턴스의 공개 포스트를 표시합니다. 로컬 타임라인에서는 {domain} 만의 공개 포스트를 표시합니다.", "onboarding.page_four.home": "홈 타임라인에서는 내가 팔로우 중인 사람들의 포스트를 표시합니다.", "onboarding.page_four.notifications": "알림에서는 다른 사람들과의 연결을 표시합니다.", - "onboarding.page_one.federation": "Mastodon은 누구나 참가할 수 있는 SNS입니다.", + "onboarding.page_one.federation": "마스토돈은 누구나 참가할 수 있는 SNS입니다.", "onboarding.page_one.full_handle": "당신의 풀 핸들", "onboarding.page_one.handle_hint": "이것을 검색하여 친구들이 당신을 찾을 수 있습니다.", - "onboarding.page_one.welcome": "Mastodon에 어서 오세요!", + "onboarding.page_one.welcome": "마스토돈에 어서 오세요!", "onboarding.page_six.admin": "이 인스턴스의 관리자는 {admin}입니다.", "onboarding.page_six.almost_done": "이상입니다.", "onboarding.page_six.appetoot": "본 아페툿!", "onboarding.page_six.apps_available": "iOS、Android 또는 다른 플랫폼에서 사용할 수 있는 {apps}이 있습니다.", - "onboarding.page_six.github": "Mastodon는 오픈 소스 소프트웨어입니다. 버그 보고나 기능 추가 요청, 기여는 {github}에서 할 수 있습니다.", + "onboarding.page_six.github": "마스토돈은 오픈 소스 소프트웨어입니다. 버그 보고나 기능 추가 요청, 기여는 {github}에서 할 수 있습니다.", "onboarding.page_six.guidelines": "커뮤니티 가이드라인", "onboarding.page_six.read_guidelines": "{domain}의 {guidelines}을 확인하는 것을 잊지 마세요!", "onboarding.page_six.various_app": "다양한 모바일 애플리케이션", @@ -266,7 +271,7 @@ "status.reblog": "부스트", "status.reblog_private": "원래의 수신자들에게 부스트", "status.reblogged_by": "{name}님이 부스트 했습니다", - "status.redraft": "Delete & re-draft", + "status.redraft": "지우고 다시 쓰기", "status.reply": "답장", "status.replyAll": "전원에게 답장", "status.report": "신고", @@ -284,9 +289,9 @@ "tabs_bar.local_timeline": "로컬", "tabs_bar.notifications": "알림", "tabs_bar.search": "검색", - "timeline.media": "Media", - "timeline.posts": "Toots", - "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", + "timeline.media": "미디어", + "timeline.posts": "툿", + "trends.count_by_accounts": "{count} {rawCount, plural, one {명} other {명}}의 사람들이 이야기 하고 있습니다", "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.", "upload_area.title": "드래그 & 드롭으로 업로드", "upload_button.label": "미디어 추가", diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 3fff2c9d55..7cbcdd02fe 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -2,7 +2,7 @@ ko: about: about_hashtag_html: "#%{hashtag} 라는 해시태그가 붙은 공개 툿 입니다. 같은 연합에 속한 임의의 인스턴스에 계정을 생성하면 당신도 대화에 참여할 수 있습니다." - about_mastodon_html: Mastodon은 오픈 소스 기반의 소셜 네트워크 서비스 입니다. 상용 플랫폼의 대체로서 분산형 구조를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 — 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 Mastodon 인스턴스를 만들 수 있으며, 아주 매끄럽게 소셜 네트워크에 참가할 수 있습니다. + about_mastodon_html: 마스토돈은 오픈 소스 기반의 소셜 네트워크 서비스 입니다. 상용 플랫폼의 대체로서 분산형 구조를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 — 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 마스토돈 인스턴스를 만들 수 있으며, 아주 매끄럽게 소셜 네트워크에 참가할 수 있습니다. about_this: 이 인스턴스에 대해서 administered_by: '관리자:' closed_registrations: 현재 이 인스턴스에서는 신규 등록을 받고 있지 않습니다. @@ -16,9 +16,9 @@ ko:

룰을 작성하는 장소

아직 설명이 작성되지 않았습니다.

features: - humane_approach_body: 다른 SNS의 실패를 교훈삼아, Mastodon은 소셜미디어가 잘못 사용되는 것을 막기 위하여 윤리적인 설계를 추구합니다. + humane_approach_body: 다른 SNS의 실패를 교훈삼아, 마스토돈은 소셜미디어가 잘못 사용되는 것을 막기 위하여 윤리적인 설계를 추구합니다. humane_approach_title: 보다 배려를 의식한 설계를 추구 - not_a_product_body: Mastodon은 이익을 추구하는 SNS가 아닙니다. 그러므로 광고와 데이터의 수집 및 분석이 존재하지 않고, 유저를 구속하지도 않습니다. + not_a_product_body: 마스토돈은 이익을 추구하는 SNS가 아닙니다. 그러므로 광고와 데이터의 수집 및 분석이 존재하지 않고, 유저를 구속하지도 않습니다. not_a_product_title: 여러분은 사람이며, 상품이 아닙니다 real_conversation_body: 자유롭게 사용할 수 있는 500문자의 메세지와 미디어 경고 내용을 바탕으로, 자기자신을 자유롭게 표현할 수 있습니다. real_conversation_title: 진정한 커뮤니케이션을 위하여 @@ -33,7 +33,7 @@ ko: status_count_before: 툿 수 user_count_after: 명 user_count_before: 사용자 수 - what_is_mastodon: Mastodon이란? + what_is_mastodon: 마스토돈이란? accounts: follow: 팔로우 followers: 팔로워 @@ -242,13 +242,13 @@ ko: undo: 실행 취소 email_domain_blocks: add_new: 새로 추가 - created_msg: Email 도메인 차단 규칙을 생성했습니다 + created_msg: 이메일 도메인 차단 규칙을 생성했습니다 delete: 삭제 - destroyed_msg: Email 도메인 차단 규칙을 삭제했습니다 + destroyed_msg: 이메일 도메인 차단 규칙을 삭제했습니다 domain: 도메인 new: create: 차단 규칙 생성 - title: 새 Email 도메인 차단 + title: 새 이메일 도메인 차단 title: Email 도메인 차단 instances: account_count: 알려진 계정의 수 @@ -456,7 +456,7 @@ ko: '404': 당신이 찾으려는 페이지는 존재하지 않습니다. '410': 당신이 보려는 페이지는 더이상 존재하지 않습니다. '422': - content: 보안 인증에 실패했습니다. Cookie를 차단하고 있진 않습니까? + content: 보안 인증에 실패했습니다. 쿠키를 차단하고 있진 않습니까? title: 보안 인증 실패 '429': 요청 횟수 제한에 도달했습니다 '500': @@ -516,6 +516,7 @@ ko: '86400': 하루 expires_in_prompt: 영원히 generate: 생성 + invited_by: '당신을 초대한 사람:' max_uses: one: 일회용 other: "%{count} 회" @@ -629,7 +630,7 @@ ko: weibo: 웨이보 current_session: 현재 세션 description: "%{platform}의 %{browser}" - explanation: 내 Mastodon 계정에 현재 로그인 중인 웹 브라우저 목록입니다. + explanation: 내 마스토돈 계정에 현재 로그인 중인 웹 브라우저 목록입니다. ip: IP platforms: adobe_air: 어도비 에어 @@ -702,6 +703,7 @@ ko: themes: contrast: 고대비 default: 마스토돈 + mastodon-light: 마스토돈 (밝음) time: formats: default: "%Y년 %m월 %d일 %H:%M" diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index b9954e0ad2..448e5d4874 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -3,6 +3,7 @@ ko: simple_form: hints: defaults: + autofollow: 이 초대를 통해 가입하는 사람이 나를 자동으로 팔로우 합니다 avatar: PNG, GIF 혹은 JPG. 최대 2MB. 400x400px로 다운스케일 될 것임 bot: 사람들에게 계정이 사람이 아님을 알립니다 digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기 @@ -30,6 +31,7 @@ ko: name: 라벨 value: 내용 defaults: + autofollow: 초대를 통해 내 계정 팔로우 avatar: 아바타 bot: 이것은 봇 계정입니다 confirm_new_password: 새로운 비밀번호 다시 입력 From ea23ef8cb6316dd69d5eba10b24367c539717787 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sat, 16 Jun 2018 19:56:28 +0900 Subject: [PATCH 05/32] Weblate translations (2018-06-16) (#7815) * Translated using Weblate (Occitan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Dutch) Currently translated at 100.0% (622 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Occitan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Persian) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Occitan) Currently translated at 99.5% (618 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Persian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Italian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 84.0% (522 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Dutch) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Japanese) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Greek) Currently translated at 84.0% (522 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 95.9% (596 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Greek) Currently translated at 99.3% (302 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.3% (302 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.3% (302 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 94.5% (587 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Greek) Currently translated at 96.7% (294 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Korean) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Arabic) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 91.9% (571 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Greek) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Arabic) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovak) Currently translated at 96.2% (598 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Serbian) Currently translated at 80.8% (502 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Slovenian) Currently translated at 14.6% (91 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Occitan) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Occitan) Currently translated at 99.6% (620 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Arabic) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Japanese) Currently translated at 94.1% (64 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (621 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 96.3% (599 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 98.5% (67 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Persian) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Persian) Currently translated at 99.6% (620 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused * Translated using Weblate (Catalan) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (621 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Korean) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (621 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused --- app/javascript/mastodon/locales/ar.json | 29 +- app/javascript/mastodon/locales/bg.json | 7 +- app/javascript/mastodon/locales/ca.json | 19 +- app/javascript/mastodon/locales/co.json | 7 +- app/javascript/mastodon/locales/de.json | 7 +- .../mastodon/locales/defaultMessages.json | 91 ++++++- app/javascript/mastodon/locales/el.json | 225 +++++++-------- app/javascript/mastodon/locales/en.json | 7 +- app/javascript/mastodon/locales/eo.json | 7 +- app/javascript/mastodon/locales/es.json | 7 +- app/javascript/mastodon/locales/eu.json | 9 +- app/javascript/mastodon/locales/fa.json | 9 +- app/javascript/mastodon/locales/fi.json | 7 +- app/javascript/mastodon/locales/fr.json | 23 +- app/javascript/mastodon/locales/gl.json | 7 +- app/javascript/mastodon/locales/he.json | 7 +- app/javascript/mastodon/locales/hr.json | 7 +- app/javascript/mastodon/locales/hu.json | 7 +- app/javascript/mastodon/locales/hy.json | 7 +- app/javascript/mastodon/locales/id.json | 7 +- app/javascript/mastodon/locales/io.json | 7 +- app/javascript/mastodon/locales/it.json | 21 +- app/javascript/mastodon/locales/ja.json | 15 +- app/javascript/mastodon/locales/ko.json | 10 +- app/javascript/mastodon/locales/nl.json | 9 +- app/javascript/mastodon/locales/no.json | 7 +- app/javascript/mastodon/locales/oc.json | 11 +- app/javascript/mastodon/locales/pl.json | 7 +- app/javascript/mastodon/locales/pt-BR.json | 9 +- app/javascript/mastodon/locales/pt.json | 7 +- app/javascript/mastodon/locales/ru.json | 7 +- app/javascript/mastodon/locales/sk.json | 23 +- app/javascript/mastodon/locales/sl.json | 7 +- app/javascript/mastodon/locales/sr-Latn.json | 7 +- app/javascript/mastodon/locales/sr.json | 7 +- app/javascript/mastodon/locales/sv.json | 7 +- app/javascript/mastodon/locales/te.json | 7 +- app/javascript/mastodon/locales/th.json | 7 +- app/javascript/mastodon/locales/tr.json | 7 +- app/javascript/mastodon/locales/uk.json | 7 +- app/javascript/mastodon/locales/zh-HK.json | 7 +- app/javascript/mastodon/locales/zh-TW.json | 7 +- config/locales/ar.yml | 2 +- config/locales/ca.yml | 1 + config/locales/devise.sk.yml | 18 +- config/locales/doorkeeper.fa.yml | 4 +- config/locales/doorkeeper.sk.yml | 10 +- config/locales/el.yml | 257 +++++++++++++++++- config/locales/eu.yml | 8 +- config/locales/fa.yml | 1 + config/locales/fr.yml | 4 +- config/locales/it.yml | 2 +- config/locales/ja.yml | 3 +- config/locales/ko.yml | 2 +- config/locales/nl.yml | 1 + config/locales/oc.yml | 41 +-- config/locales/simple_form.ar.yml | 8 + config/locales/simple_form.ca.yml | 2 + config/locales/simple_form.fa.yml | 2 + config/locales/simple_form.ja.yml | 2 + config/locales/simple_form.ko.yml | 4 +- config/locales/simple_form.nl.yml | 2 + config/locales/simple_form.oc.yml | 2 + config/locales/simple_form.sk.yml | 4 +- config/locales/sk.yml | 6 +- config/locales/sl.yml | 1 + config/locales/sr.yml | 1 + 67 files changed, 767 insertions(+), 320 deletions(-) diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 60d4acc393..c6d44f5a41 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -59,8 +59,9 @@ "column_header.show_settings": "عرض الإعدادات", "column_header.unpin": "فك التدبيس", "column_subheading.settings": "الإعدادات", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "لن يَظهر هذا التبويق إلا للمستخدمين المذكورين.", - "compose_form.direct_message_warning_learn_more": "Learn more", + "compose_form.direct_message_warning_learn_more": "إقرأ المزيد", "compose_form.hashtag_warning": "هذا التبويق لن يُدرَج تحت أي وسم كان بما أنه غير مُدرَج. لا يُسمح بالبحث إلّا عن التبويقات العمومية عن طريق الوسوم.", "compose_form.lock_disclaimer": "حسابك ليس {locked}. يمكن لأي شخص متابعتك و عرض المنشورات.", "compose_form.lock_disclaimer.lock": "مقفل", @@ -80,11 +81,11 @@ "confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.message": "هل تود حقا حذف هذه القائمة ؟", "confirmations.domain_block.confirm": "إخفاء إسم النطاق كاملا", - "confirmations.domain_block.message": "متأكد من أنك تود حظر إسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.", + "confirmations.domain_block.message": "متأكد من أنك تود حظر إسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.", "confirmations.mute.confirm": "أكتم", "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "إزالة و إعادة الصياغة", + "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته ؟ سوف تفقد جميع الردود و الترقيات و المفضلة المتصلة به.", "confirmations.unfollow.confirm": "إلغاء المتابعة", "confirmations.unfollow.message": "متأكد من أنك تريد إلغاء متابعة {name} ؟", "embed.instructions": "يمكنكم إدماج هذه الحالة على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.", @@ -113,10 +114,14 @@ "empty_column.public": "لا يوجد أي شيء هنا ! قم بنشر شيء ما للعامة، أو إتبع مستخدمين آخرين في الخوادم المثيلة الأخرى لملء خيط المحادثات العام", "follow_request.authorize": "ترخيص", "follow_request.reject": "رفض", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "إستعدّ للبدء", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "ماستدون برنامج مفتوح المصدر. يمكنك المساهمة، أو الإبلاغ عن تقارير الأخطاء، على جيت هب {github}.", - "getting_started.terms": "Terms of service", + "getting_started.security": "Security", + "getting_started.terms": "شروط الخدمة", "home.column_settings.advanced": "متقدمة", "home.column_settings.basic": "أساسية", "home.column_settings.filter_regex": "تصفية حسب التعبيرات العادية", @@ -160,7 +165,7 @@ "navigation_bar.blocks": "الحسابات المحجوبة", "navigation_bar.community_timeline": "الخيط العام المحلي", "navigation_bar.direct": "الرسائل المباشِرة", - "navigation_bar.discover": "Discover", + "navigation_bar.discover": "إكتشف", "navigation_bar.domain_blocks": "النطاقات المخفية", "navigation_bar.edit_profile": "تعديل الملف الشخصي", "navigation_bar.favourites": "المفضلة", @@ -174,7 +179,7 @@ "navigation_bar.pins": "التبويقات المثبتة", "navigation_bar.preferences": "التفضيلات", "navigation_bar.public_timeline": "الخيط العام الموحد", - "navigation_bar.security": "Security", + "navigation_bar.security": "الأمان", "notification.favourite": "{name} أعجب بمنشورك", "notification.follow": "{name} يتابعك", "notification.mention": "{name} ذكرك", @@ -190,7 +195,7 @@ "notifications.column_settings.reblog": "الترقيّات:", "notifications.column_settings.show": "إعرِضها في عمود", "notifications.column_settings.sound": "أصدر صوتا", - "notifications.group": "{count} notifications", + "notifications.group": "{count} إشعارات", "onboarding.done": "تم", "onboarding.next": "التالي", "onboarding.page_five.public_timelines": "تُعرَض في الخيط الزمني المحلي المشاركات العامة المحررة من طرف جميع المسجلين في {domain}. أما في الخيط الزمني الموحد ، فإنه يتم عرض جميع المشاركات العامة المنشورة من طرف جميع الأشخاص المتابَعين من طرف أعضاء {domain}. هذه هي الخيوط الزمنية العامة، وهي طريقة رائعة للتعرف أشخاص جدد.", @@ -237,7 +242,7 @@ "report.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": "جملة قصيرة تُمكّنُك من عرض أسماء و حسابات و كلمات رمزية", @@ -266,7 +271,7 @@ "status.reblog": "رَقِّي", "status.reblog_private": "القيام بالترقية إلى الجمهور الأصلي", "status.reblogged_by": "{name} رقى", - "status.redraft": "Delete & re-draft", + "status.redraft": "إزالة و إعادة الصياغة", "status.reply": "ردّ", "status.replyAll": "رُد على الخيط", "status.report": "إبلِغ عن @{name}", @@ -284,9 +289,7 @@ "tabs_bar.local_timeline": "المحلي", "tabs_bar.notifications": "الإخطارات", "tabs_bar.search": "البحث", - "timeline.media": "Media", - "timeline.posts": "Toots", - "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", + "trends.count_by_accounts": "{count} {rawCount, plural, one {person} آخرون {people}} يتحدثون", "ui.beforeunload": "سوف تفقد مسودتك إن تركت ماستدون.", "upload_area.title": "إسحب ثم أفلت للرفع", "upload_button.label": "إضافة وسائط", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index ebee044b83..37590d86f0 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -59,6 +59,7 @@ "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 visible 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.", @@ -113,9 +114,13 @@ "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.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Първи стъпки", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon е софтуер с отворен код. Можеш да помогнеш или да докладваш за проблеми в Github: {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Известия", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 2f2163df20..e2fb1bb993 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -6,7 +6,7 @@ "account.direct": "Missatge directe @{name}", "account.disclaimer_full": "La informació següent pot reflectir incompleta el perfil de l'usuari.", "account.domain_blocked": "Domini ocult", - "account.edit_profile": "Edita el perfil", + "account.edit_profile": "Editar el perfil", "account.follow": "Segueix", "account.followers": "Seguidors", "account.follows": "Seguint", @@ -59,6 +59,7 @@ "column_header.show_settings": "Mostra la configuració", "column_header.unpin": "No fixis", "column_subheading.settings": "Configuració", + "community.column_settings.media_only": "Media Only", "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_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.", @@ -80,7 +81,7 @@ "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", - "confirmations.domain_block.message": "Estàs realment, realment segur que vols blocar totalment {domain}? En la majoria dels casos blocar o silenciar uns pocs objectius és suficient i preferible.", + "confirmations.domain_block.message": "Estàs segur, realment segur que vols bloquejar totalment {domain}? En la majoria dels casos bloquejar o silenciar uns pocs objectius és suficient i preferible. No veuràs contingut d’aquest domini en cap de les línies públiques ni en les notificacions. Els teus seguidors d’aquest domini seran eliminats.", "confirmations.mute.confirm": "Silencia", "confirmations.mute.message": "Estàs segur que vols silenciar {name}?", "confirmations.redraft.confirm": "Esborrar i refer", @@ -113,9 +114,13 @@ "empty_column.public": "No hi ha res aquí! Escriu alguna cosa públicament o segueix manualment usuaris d'altres instàncies per omplir-ho", "follow_request.authorize": "Autoritzar", "follow_request.reject": "Rebutjar", - "getting_started.documentation": "Documentation", + "getting_started.developers": "Developers", + "getting_started.documentation": "Documentació", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Començant", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon és un programari de codi obert. Pots contribuir o informar de problemes a GitHub a {github}.", + "getting_started.security": "Security", "getting_started.terms": "Termes del servei", "home.column_settings.advanced": "Avançat", "home.column_settings.basic": "Bàsic", @@ -196,7 +201,7 @@ "onboarding.page_five.public_timelines": "La línia de temps local mostra missatges públics de tothom de {domain}. La línia de temps federada mostra els missatges públics de tothom que la gent de {domain} segueix. Aquests són les línies de temps Públiques, una bona manera de descobrir noves persones.", "onboarding.page_four.home": "La línia de temps d'Inici mostra missatges de les persones que segueixes.", "onboarding.page_four.notifications": "La columna Notificacions mostra quan algú interactua amb tu.", - "onboarding.page_one.federation": "Mastodon és una xarxa de servidors independents que s'uneixen per fer una més gran xarxa social. A aquests servidors els hi diem instàncies.", + "onboarding.page_one.federation": "Mastodon és una xarxa de servidors independents que s'uneixen per fer una xarxa social encara més gran. A aquests servidors els hi diem instàncies.", "onboarding.page_one.full_handle": "El teu usuari complet", "onboarding.page_one.handle_hint": "Això és el que els hi diries als teus amics que cerquin.", "onboarding.page_one.welcome": "Benvingut a Mastodon!", @@ -240,7 +245,7 @@ "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.text": "El text simple retorna coincidències amb els noms de visualització, els noms d'usuari i els hashtags", + "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", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notificacions", "tabs_bar.search": "Cerca", - "timeline.media": "Media", - "timeline.posts": "Toots", "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", @@ -295,7 +298,7 @@ "upload_form.undo": "Esborra", "upload_progress.label": "Pujant...", "video.close": "Tancar el vídeo", - "video.exit_fullscreen": "Surt de pantalla completa", + "video.exit_fullscreen": "Sortir de pantalla completa", "video.expand": "Ampliar el vídeo", "video.fullscreen": "Pantalla completa", "video.hide": "Amaga vídeo", diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json index 11bb662d84..da1b45d734 100644 --- a/app/javascript/mastodon/locales/co.json +++ b/app/javascript/mastodon/locales/co.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Mustrà i parametri", "column_header.unpin": "Spuntarulà", "column_subheading.settings": "Parametri", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Solu l'utilizatori mintuvati puderenu vede stu statutu.", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.hashtag_warning": "Stu statutu ùn hè \"Micca listatu\" è ùn sarà micca listatu indè e circate da hashtag. Per esse vistu in quesse, u statutu deve esse \"Pubblicu\".", @@ -113,9 +114,13 @@ "empty_column.public": "Ùn c'hè nunda quì! Scrivete qualcosa in pubblicu o seguitate utilizatori d'altre istanze per empie a linea pubblica", "follow_request.authorize": "Auturizà", "follow_request.reject": "Righjittà", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Per principià", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon ghjè un lugiziale liberu. Pudete cuntribuisce à u codice o a traduzione, o palisà un bug, nant'à GitHub: {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Avanzati", "home.column_settings.basic": "Bàsichi", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lucale", "tabs_bar.notifications": "Nutificazione", "tabs_bar.search": "Cercà", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "A bruttacopia sarà persa s'ellu hè chjosu Mastodon.", "upload_area.title": "Drag & drop per caricà un fugliale", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 7ccf380598..a30a2a0dc8 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Einstellungen anzeigen", "column_header.unpin": "Lösen", "column_subheading.settings": "Einstellungen", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.", "compose_form.direct_message_warning_learn_more": "Learn more", "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.", @@ -113,9 +114,13 @@ "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Instanzen, um die Zeitleiste aufzufüllen", "follow_request.authorize": "Erlauben", "follow_request.reject": "Ablehnen", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Erste Schritte", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon ist quelloffene Software. Du kannst auf GitHub unter {github} dazu beitragen oder Probleme melden.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Erweitert", "home.column_settings.basic": "Einfach", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokal", "tabs_bar.notifications": "Mitteilungen", "tabs_bar.search": "Suchen", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.", "upload_area.title": "Zum Hochladen hereinziehen", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 2fdf99a4b2..a27ca2dcfa 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -640,6 +640,10 @@ "defaultMessage": "Column settings", "id": "home.settings" }, + { + "defaultMessage": "Media Only", + "id": "community.column_settings.media_only" + }, { "defaultMessage": "Advanced", "id": "home.column_settings.advanced" @@ -647,19 +651,6 @@ ], "path": "app/javascript/mastodon/features/community_timeline/components/column_settings.json" }, - { - "descriptors": [ - { - "defaultMessage": "Toots", - "id": "timeline.posts" - }, - { - "defaultMessage": "Media", - "id": "timeline.media" - } - ], - "path": "app/javascript/mastodon/features/community_timeline/components/section_headline.json" - }, { "descriptors": [ { @@ -673,6 +664,47 @@ ], "path": "app/javascript/mastodon/features/community_timeline/index.json" }, + { + "descriptors": [ + { + "defaultMessage": "Edit profile", + "id": "account.edit_profile" + }, + { + "defaultMessage": "Pinned toots", + "id": "navigation_bar.pins" + }, + { + "defaultMessage": "Preferences", + "id": "navigation_bar.preferences" + }, + { + "defaultMessage": "Follow requests", + "id": "navigation_bar.follow_requests" + }, + { + "defaultMessage": "Favourites", + "id": "navigation_bar.favourites" + }, + { + "defaultMessage": "Lists", + "id": "navigation_bar.lists" + }, + { + "defaultMessage": "Blocked users", + "id": "navigation_bar.blocks" + }, + { + "defaultMessage": "Hidden domains", + "id": "navigation_bar.domain_blocks" + }, + { + "defaultMessage": "Muted users", + "id": "navigation_bar.mutes" + } + ], + "path": "app/javascript/mastodon/features/compose/components/action_bar.json" + }, { "descriptors": [ { @@ -987,6 +1019,23 @@ ], "path": "app/javascript/mastodon/features/compose/index.json" }, + { + "descriptors": [ + { + "defaultMessage": "Filter out by regular expressions", + "id": "home.column_settings.filter_regex" + }, + { + "defaultMessage": "Column settings", + "id": "home.settings" + }, + { + "defaultMessage": "Advanced", + "id": "home.column_settings.advanced" + } + ], + "path": "app/javascript/mastodon/features/direct_timeline/components/column_settings.json" + }, { "descriptors": [ { @@ -1118,10 +1167,22 @@ "defaultMessage": "Getting started", "id": "getting_started.heading" }, + { + "defaultMessage": "Find friends from Twitter", + "id": "getting_started.find_friends" + }, + { + "defaultMessage": "Invite people", + "id": "getting_started.invite" + }, { "defaultMessage": "Hotkeys", "id": "navigation_bar.keyboard_shortcuts" }, + { + "defaultMessage": "Security", + "id": "getting_started.security" + }, { "defaultMessage": "About this instance", "id": "navigation_bar.info" @@ -1130,6 +1191,10 @@ "defaultMessage": "Terms of service", "id": "getting_started.terms" }, + { + "defaultMessage": "Developers", + "id": "getting_started.developers" + }, { "defaultMessage": "Documentation", "id": "getting_started.documentation" diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index 64efbd31a7..936fba71ef 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -1,5 +1,5 @@ { - "account.badges.bot": "Bot", + "account.badges.bot": "Μποτ", "account.block": "Απόκλεισε τον/την @{name}", "account.block_domain": "Απόκρυψε τα πάντα από τον/την", "account.blocked": "Αποκλεισμένος/η", @@ -59,6 +59,7 @@ "column_header.show_settings": "Εμφάνιση ρυθμίσεων", "column_header.unpin": "Ξεκαρφίτσωμα", "column_subheading.settings": "Ρυθμίσεις", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Αυτό το τουτ θα σταλεί μόνο στους αναφερόμενους χρήστες.", "compose_form.direct_message_warning_learn_more": "Μάθετε περισσότερα", "compose_form.hashtag_warning": "Αυτό το τουτ δεν θα εμφανίζεται κάτω από κανένα hashtag καθώς είναι αφανές. Μόνο τα δημόσια τουτ μπορούν να αναζητηθούν ανά hashtag.", @@ -80,11 +81,11 @@ "confirmations.delete_list.confirm": "Διέγραψε", "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;", "confirmations.domain_block.confirm": "Απόκρυψη ολόκληρου του τομέα", - "confirmations.domain_block.message": "Σίγουρα θες να μπλοκάρεις ολόκληρο το {domain}; Συνήθως μερικά εστιασμένα μπλοκ ή αποσιωπήσεις επαρκούν και προτιμούνται.", + "confirmations.domain_block.message": "Σίγουρα θες να μπλοκάρεις ολόκληρο το {domain}; Συνήθως μερικά εστιασμένα μπλοκ ή αποσιωπήσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον κόμβο σε καμία δημόσια ροή, ούτε στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον κόμβο θα αφαιρεθούν.", "confirmations.mute.confirm": "Αποσιώπηση", "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις τον/την {name};", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο", + "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την κατάσταση και να την γράψεις ξανά; Θα χάσεις όλες τις απαντήσεις, αναφορές και τα αγαπημένα προς αυτή.", "confirmations.unfollow.confirm": "Διακοπή παρακολούθησης", "confirmations.unfollow.message": "Σίγουρα θες να πάψεις να ακολουθείς τον/την {name};", "embed.instructions": "Ενσωματώστε αυτή την κατάσταση στην ιστοσελίδα σας αντιγράφοντας τον παρακάτω κώδικα.", @@ -113,10 +114,14 @@ "empty_column.public": "Δεν υπάρχει τίποτα εδώ! Γράψε κάτι δημόσιο, ή ακολούθησε χειροκίνητα χρήστες από άλλα instances για να τη γεμίσεις", "follow_request.authorize": "Ενέκρινε", "follow_request.reject": "Απέρριψε", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Ξεκινώντας", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Το Mastodon είναι ελεύθερο λογισμικό. Μπορείς να συνεισφέρεις ή να αναφέρεις ζητήματα στο GitHub στο {github}.", - "getting_started.terms": "Terms of service", + "getting_started.security": "Security", + "getting_started.terms": "Όροι χρήσης", "home.column_settings.advanced": "Προχωρημένα", "home.column_settings.basic": "Βασικά", "home.column_settings.filter_regex": "Φιλτράρετε μέσω regular expressions", @@ -140,165 +145,163 @@ "keyboard_shortcuts.toggle_hidden": "για εμφάνιση/απόκρυψη κειμένου πίσω από την προειδοποίηση", "keyboard_shortcuts.toot": "για δημιουργία ολοκαίνουριου τουτ", "keyboard_shortcuts.unfocus": "για την απο-εστίαση του πεδίου σύνθεσης/αναζήτησης", - "keyboard_shortcuts.up": "για να ανέβεις στη λίστα", - "lightbox.close": "Close", + "keyboard_shortcuts.up": "να κινηθείς προς την κορυφή της λίστας", + "lightbox.close": "Κλείσε", "lightbox.next": "Επόμενο", "lightbox.previous": "Προηγούμενο", "lists.account.add": "Πρόσθεσε στη λίστα", - "lists.account.remove": "Αφαίρεσε από τη λίστα", + "lists.account.remove": "Βγάλε από τη λίστα", "lists.delete": "Delete list", - "lists.edit": "Τροποποίησε τη λίστα", - "lists.new.create": "Πρόσθεσε λίστα", + "lists.edit": "Επεξεργασία λίστας", + "lists.new.create": "Προσθήκη λίστας", "lists.new.title_placeholder": "Τίτλος νέας λίστα", - "lists.search": "Αναζήτησε ανάμεσα σε όσους/όσες ακολουθείς", + "lists.search": "Αναζήτησε μεταξύ των ανθρώπων που ακουλουθείς", "lists.subheading": "Οι λίστες σου", "loading_indicator.label": "Φορτώνει...", - "media_gallery.toggle_visible": "Αντιστροφή ορατότητας", + "media_gallery.toggle_visible": "Εναλλαγή ορατότητας", "missing_indicator.label": "Δε βρέθηκε", - "missing_indicator.sublabel": "Αυτό το υλικό δε βρέθηκε", + "missing_indicator.sublabel": "Αδύνατη η εύρεση αυτού του πόρου", "mute_modal.hide_notifications": "Απόκρυψη ειδοποιήσεων αυτού του χρήστη;", "navigation_bar.blocks": "Αποκλεισμένοι χρήστες", - "navigation_bar.community_timeline": "Local timeline", + "navigation_bar.community_timeline": "Τοπική ροή", "navigation_bar.direct": "Απευθείας μηνύματα", - "navigation_bar.discover": "Discover", - "navigation_bar.domain_blocks": "Hidden domains", - "navigation_bar.edit_profile": "Edit profile", - "navigation_bar.favourites": "Favourites", - "navigation_bar.follow_requests": "Follow requests", + "navigation_bar.discover": "Ανακάλυψη", + "navigation_bar.domain_blocks": "Κρυφοί τομείς", + "navigation_bar.edit_profile": "Επεξεργασία προφίλ", + "navigation_bar.favourites": "Αγαπημένα", + "navigation_bar.follow_requests": "Αιτήματα ακολούθησης", "navigation_bar.info": "Extended information", - "navigation_bar.keyboard_shortcuts": "Συντομεύσεις πληκτρολογίου", - "navigation_bar.lists": "Lists", + "navigation_bar.keyboard_shortcuts": "Συντομεύσεις", + "navigation_bar.lists": "Λίστες", "navigation_bar.logout": "Αποσύνδεση", - "navigation_bar.mutes": "Muted users", + "navigation_bar.mutes": "Αποσιωπημένοι χρήστες", "navigation_bar.personal": "Personal", - "navigation_bar.pins": "Pinned toots", + "navigation_bar.pins": "Καρφιτσωμένα τουτ", "navigation_bar.preferences": "Προτιμήσεις", "navigation_bar.public_timeline": "Ομοσπονδιακή ροή", - "navigation_bar.security": "Security", + "navigation_bar.security": "Ασφάλεια", "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου", "notification.follow": "Ο/Η {name} σε ακολούθησε", "notification.mention": "Ο/Η {name} σε ανέφερε", "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.follow": "Νέοι ακόλουθοι:", "notifications.column_settings.mention": "Αναφορές:", - "notifications.column_settings.push": "Push notifications", + "notifications.column_settings.push": "Άμεσες ειδοποιήσεις", "notifications.column_settings.push_meta": "Αυτή η συσκευή", "notifications.column_settings.reblog": "Προωθήσεις:", "notifications.column_settings.show": "Εμφάνισε σε στήλη", "notifications.column_settings.sound": "Ηχητική ειδοποίηση", - "notifications.group": "{count} notifications", + "notifications.group": "{count} ειδοποιήσεις", "onboarding.done": "Έγινε", "onboarding.next": "Επόμενο", "onboarding.page_five.public_timelines": "Η τοπική ροή δείχνει τις δημόσιες δημοσιεύσεις από όσους εδρεύουν στον κόμβο {domain}. Η ομοσπονδιακή ροή δείχνει τις δημόσιες δημοσιεύσεις εκείνων που οι χρήστες του {domain} ακολουθούν. Αυτές οι είναι Δημόσιες Ροές, ένας ωραίος τρόπος να ανακαλύψεις καινούριους ανθρώπους.", - "onboarding.page_four.home": "The home timeline shows posts from people you follow.", - "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.", - "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.", - "onboarding.page_one.full_handle": "Your full handle", - "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.", - "onboarding.page_one.welcome": "Welcome to Mastodon!", + "onboarding.page_four.home": "Η αρχική ροή δείχνει καταστάσεις από ανθρώπους που ακολουθείς.", + "onboarding.page_four.notifications": "Η στήλη ειδοποιήσεων δείχνει πότε κάποιος αλληλεπιδράει μαζί σου.", + "onboarding.page_one.federation": "Το Mastodon είναι ένα δίκτυο ανεξάρτητων εξυπηρετητών (servers) που συνεργάζονται δημιουργώντας ένα μεγαλύτερο κοινωνικό δίκτυο. Τους εξυπηρετητές αυτούς τους λέμε κόμβους.", + "onboarding.page_one.full_handle": "Το πλήρες αναγνωριστικό σου", + "onboarding.page_one.handle_hint": "Αυτό είναι που θα πεις στους φίλους & φίλες σου να ψάξουν.", + "onboarding.page_one.welcome": "Καλώς όρισες στο Mastodon!", "onboarding.page_six.admin": "Ο διαχειριστής του κόμβου σου είναι ο/η {admin}.", - "onboarding.page_six.almost_done": "Almost done...", - "onboarding.page_six.appetoot": "Bon Appetoot!", - "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.", + "onboarding.page_six.almost_done": "Σχεδόν έτοιμοι...", + "onboarding.page_six.appetoot": "Καλά τουτ!", + "onboarding.page_six.apps_available": "Υπάρχουν {apps} για iOS, Android και άλλες πλατφόρμες.", "onboarding.page_six.github": "Το Mastodon είναι ελεύθερο λογισμικό. Μπορείς να αναφέρεις σφάλματα, να αιτηθείς νέες λειτουργίες ή να συνεισφέρεις κώδικα στο {github}.", - "onboarding.page_six.guidelines": "community guidelines", - "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!", - "onboarding.page_six.various_app": "mobile apps", - "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.", - "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.", - "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.", - "onboarding.skip": "Skip", - "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", + "onboarding.page_six.guidelines": "οδηγίες κοινότητας", + "onboarding.page_six.read_guidelines": "Παρακαλώ διάβασε τις {guidelines} του κόμβου {domain}!", + "onboarding.page_six.various_app": "εφαρμογές κινητών", + "onboarding.page_three.profile": "Επεξεργάσου το προφίλ σου για να αλλάξεις την εικόνα σου, το βιογραφικό σου και το εμφανιζόμενο όνομά σου. Εκεί θα βρεις επίσης κι άλλες προτιμήσεις.", + "onboarding.page_three.search": "Χρησιμοποίησε την μπάρα αναζήτησης για να βρεις ανθρώπους και να δεις ταμπέλες όπως για παράδειγμα {illustration} και {introductions}. Για να ψάξεις κάποιον ή κάποια που δεν είναι σε αυτόν τον κόμβο, χρησιμοποίησε το πλήρες αναγνωριστικό τους.", + "onboarding.page_two.compose": "Γράψε δημοσιεύσεις στην κολώνα συγγραφής. Μπορείς να ανεβάσεις εικόνες, να αλλάξεις τις ρυθμίσεις ιδιωτικότητας και να προσθέσεις προειδοποιήσεις περιεχομένου με τα παρακάτω εικονίδια.", + "onboarding.skip": "Παράληψη", + "privacy.change": "Προσαρμογή ιδιωτικότητας δημοσίευσης", + "privacy.direct.long": "Δημοσίευση μόνο σε όσους και όσες αναφέρονται", + "privacy.direct.short": "Απευθείας", + "privacy.private.long": "Δημοσίευση μόνο στους ακόλουθους", + "privacy.private.short": "Μόνο ακόλουθοι", + "privacy.public.long": "Δημοσίευσε στις δημόσιες ροές", + "privacy.public.short": "Δημόσιο", "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}", + "reply_indicator.cancel": "Άκυρο", + "report.forward": "Προώθηση προς {target}", "report.forward_hint": "Ο λογαριασμός είναι από διαφορετικό διακομιστή. Να σταλεί ανώνυμο αντίγραφο της καταγγελίας κι εκεί;", "report.hint": "Η καταγγελία θα σταλεί στους διαχειριστές του κόμβου σου. Μπορείς να περιγράψεις γιατί καταγγέλεις το λογαριασμό παρακάτω:", - "report.placeholder": "Additional comments", + "report.placeholder": "Επιπλέον σχόλια", "report.submit": "Submit", "report.target": "Καταγγελία {target}", - "search.placeholder": "Search", + "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.hashtag": "hashtag", + "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.user": "user", - "search_results.accounts": "People", - "search_results.hashtags": "Hashtags", - "search_results.statuses": "Toots", + "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 {result} other {results}}", - "standalone.public_title": "A look inside...", + "standalone.public_title": "Μια πρώτη γεύση...", "status.block": "Block @{name}", - "status.cancel_reblog_private": "Unboost", - "status.cannot_reblog": "This post cannot be boosted", + "status.cancel_reblog_private": "Ακύρωσε την προώθηση", + "status.cannot_reblog": "Αυτή η δημοσίευση δεν μπορεί να προωθηθεί", "status.delete": "Διαγραφή", - "status.direct": "Direct message @{name}", - "status.embed": "Embed", - "status.favourite": "Favourite", + "status.direct": "Απευθείας μήνυμα προς @{name}", + "status.embed": "Ενσωμάτωσε", + "status.favourite": "Σημείωσε ως αγαπημένο", "status.load_more": "Φόρτωσε περισσότερα", - "status.media_hidden": "Media hidden", - "status.mention": "Mention @{name}", - "status.more": "More", - "status.mute": "Mute @{name}", - "status.mute_conversation": "Mute conversation", + "status.media_hidden": "Κρυμμένο πολυμέσο", + "status.mention": "Ανέφερε τον/την @{name}", + "status.more": "Περισσότερα", + "status.mute": "Σώπασε τον/την @{name}", + "status.mute_conversation": "Αποσιώπησε τη συζήτηση", "status.open": "Διεύρυνε αυτή την κατάσταση", - "status.pin": "Pin on profile", - "status.pinned": "Pinned toot", - "status.reblog": "Boost", - "status.reblog_private": "Boost to original audience", - "status.reblogged_by": "{name} boosted", - "status.redraft": "Delete & re-draft", - "status.reply": "Reply", - "status.replyAll": "Reply to thread", + "status.pin": "Καρφίτσωσε στο προφίλ", + "status.pinned": "Καρφιτσωμένο τουτ", + "status.reblog": "Προώθησε", + "status.reblog_private": "Προώθησε στο αρχικό κοινό", + "status.reblogged_by": "{name} προώθησε", + "status.redraft": "Σβήσε & ξαναγράψε", + "status.reply": "Απάντησε", + "status.replyAll": "Απάντησε στην συζήτηση", "status.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.unmute_conversation": "Unmute conversation", - "status.unpin": "Unpin from profile", + "status.sensitive_toggle": "Κλικ για να δεις", + "status.sensitive_warning": "Ευαίσθητο περιεχόμενο", + "status.share": "Μοιράσου", + "status.show_less": "Δείξε λιγότερα", + "status.show_less_all": "Δείξε λιγότερα για όλα", + "status.show_more": "Δείξε περισσότερα", + "status.show_more_all": "Δείξε περισσότερα για όλα", + "status.unmute_conversation": "Διέκοψε την αποσιώπηση της συζήτησης", + "status.unpin": "Ξεκαρφίτσωσε από το προφίλ", "tabs_bar.federated_timeline": "Ομοσπονδιακή", - "tabs_bar.home": "Home", - "tabs_bar.local_timeline": "Local", - "tabs_bar.notifications": "Notifications", - "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", - "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", - "upload_form.description": "Describe for the visually impaired", - "upload_form.focus": "Crop", + "tabs_bar.home": "Αρχική", + "tabs_bar.local_timeline": "Τοπικά", + "tabs_bar.notifications": "Ειδοποιήσεις", + "tabs_bar.search": "Αναζήτηση", + "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} μιλάνε", + "ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.", + "upload_area.title": "Drag & drop για να ανεβάσεις", + "upload_button.label": "Πρόσθεσε πολυμέσα", + "upload_form.description": "Περιέγραψε για όσους & όσες έχουν προβλήματα όρασης", + "upload_form.focus": "Περικοπή", "upload_form.undo": "Διαγραφή", - "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", + "upload_progress.label": "Ανεβαίνει...", + "video.close": "Κλείσε το βίντεο", + "video.exit_fullscreen": "Έξοδος πλήρης οθόνης", + "video.expand": "Επέκταση βίντεο", + "video.fullscreen": "Πλήρης οθόνη", + "video.hide": "Κρύψε βίντεο", "video.mute": "Mute sound", "video.pause": "Pause", "video.play": "Play", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 3a03fe27af..455c22dbbb 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -59,6 +59,7 @@ "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 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.", @@ -113,9 +114,13 @@ "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.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "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", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notifications", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index b01237a2e8..86e3b0e87b 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Montri agordojn", "column_header.unpin": "Depingli", "column_subheading.settings": "Agordado", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Tiu mesaĝo estos sendita nur al menciitaj uzantoj.", "compose_form.direct_message_warning_learn_more": "Lerni pli", "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.", @@ -113,9 +114,13 @@ "empty_column.public": "Estas nenio ĉi tie! Publike skribu ion, aŭ mane sekvu uzantojn de aliaj nodoj por plenigi la publikan tempolinion", "follow_request.authorize": "Rajtigi", "follow_request.reject": "Rifuzi", + "getting_started.developers": "Developers", "getting_started.documentation": "Dokumentado", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Por komenci", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon estas malfermitkoda programo. Vi povas kontribui aŭ raporti problemojn en GitHub je {github}.", + "getting_started.security": "Security", "getting_started.terms": "Uzkondiĉoj", "home.column_settings.advanced": "Precizaj agordoj", "home.column_settings.basic": "Bazaj agordoj", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Loka tempolinio", "tabs_bar.notifications": "Sciigoj", "tabs_bar.search": "Serĉi", - "timeline.media": "Aŭdovidaĵoj", - "timeline.posts": "Mesaĝoj", "trends.count_by_accounts": "{count} {rawCount, pluraj, unu {person} alia(j) {people}} parolas", "ui.beforeunload": "Via malneto perdiĝos se vi eliras de Mastodon.", "upload_area.title": "Altreni kaj lasi por alŝuti", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index ba85841f64..f1f370bbb3 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Mostrar ajustes", "column_header.unpin": "Dejar de fijar", "column_subheading.settings": "Ajustes", + "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": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo", "follow_request.authorize": "Autorizar", "follow_request.reject": "Rechazar", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Primeros pasos", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon es software libre. Puedes contribuir o reportar errores en {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Avanzado", "home.column_settings.basic": "Básico", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notificaciones", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.", "upload_area.title": "Arrastra y suelta para subir", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index c6904e9e2d..d11b0f8178 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Erakutsi ezarpenak", "column_header.unpin": "Desfinkatu", "column_subheading.settings": "Ezarpenak", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Toot hau aipatutako erabiltzaileei besterik ez zaie bidaliko.", "compose_form.direct_message_warning_learn_more": "Ikasi gehiago", "compose_form.hashtag_warning": "Toot hau ez da traoletan agertuko zerrendatu gabekoa baita. Traoletan toot publikoak besterik ez dira agertzen.", @@ -80,7 +81,7 @@ "confirmations.delete_list.confirm": "Ezabatu", "confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?", "confirmations.domain_block.confirm": "Ezkutatu domeinu osoa", - "confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da.", + "confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da. Ez duzu domeinu horretako edukirik ikusiko denbora lerroetan edo jakinarazpenetan. Domeinu horretako zure jarraitzaileak kenduko dira ere.", "confirmations.mute.confirm": "Mututu", "confirmations.mute.message": "Ziur {name} mututu nahi duzula?", "confirmations.redraft.confirm": "Ezabatu eta berridatzi", @@ -113,9 +114,13 @@ "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste instantzia batzuetako erabiltzailean hau betetzeko", "follow_request.authorize": "Baimendu", "follow_request.reject": "Ukatu", + "getting_started.developers": "Developers", "getting_started.documentation": "Dokumentazioa", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Menua", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon software librea da. Ekarpenak egin ditzakezu edo akatsen berri eman GitHub bidez: {github}.", + "getting_started.security": "Security", "getting_started.terms": "Erabilera baldintzak", "home.column_settings.advanced": "Aurreratua", "home.column_settings.basic": "Oinarrizkoa", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokala", "tabs_bar.notifications": "Jakinarazpenak", "tabs_bar.search": "Bilatu", - "timeline.media": "Media", - "timeline.posts": "Toot-ak", "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", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 910a42a3e4..33a515ecfb 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -59,6 +59,7 @@ "column_header.show_settings": "نمایش تنظیمات", "column_header.unpin": "رهاکردن", "column_subheading.settings": "تنظیمات", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "این بوق تنها به کاربرانی که از آن‌ها نام برده شده فرستاده خواهد شد.", "compose_form.direct_message_warning_learn_more": "بیشتر بدانید", "compose_form.hashtag_warning": "از آن‌جا که این بوق فهرست‌نشده است، در نتایج جستجوی هشتگ‌ها پیدا نخواهد شد. تنها بوق‌های عمومی را می‌توان با جستجوی هشتگ پیدا کرد.", @@ -80,7 +81,7 @@ "confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.message": "آیا واقعاً می‌خواهید این فهرست را برای همیشه پاک کنید؟", "confirmations.domain_block.confirm": "پنهان‌سازی کل دامین", - "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید کل دامین {domain} را مسدود کنید؟ بیشتر وقت‌ها مسدودکردن یا بی‌صداکردن چند حساب کاربری خاص کافی است و توصیه می‌شود.", + "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید کل دامین {domain} را مسدود کنید؟ بیشتر وقت‌ها مسدودکردن یا بی‌صداکردن چند حساب کاربری خاص کافی است و توصیه می‌شود. پس از این کار شما هیچ نوشته‌ای را از این دامین در فهرست نوشته‌های عمومی یا اعلان‌هایتان نخواهید دید. پیگیران شما از این دامین هم حذف خواهد شد.", "confirmations.mute.confirm": "بی‌صدا کن", "confirmations.mute.message": "آیا واقعاً می‌خواهید {name} را بی‌صدا کنید؟", "confirmations.redraft.confirm": "پاک‌کردن و بازنویسی", @@ -113,9 +114,13 @@ "empty_column.public": "این‌جا هنوز چیزی نیست! خودتان چیزی بنویسید یا کاربران دیگر را پی بگیرید تا این‌جا پر شود", "follow_request.authorize": "اجازه دهید", "follow_request.reject": "اجازه ندهید", + "getting_started.developers": "Developers", "getting_started.documentation": "راهنما", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "آغاز کنید", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "ماستدون یک نرم‌افزار آزاد است. می‌توانید در ساخت آن مشارکت کنید یا مشکلاتش را در {github} گزارش دهید.", + "getting_started.security": "Security", "getting_started.terms": "شرایط استفاده", "home.column_settings.advanced": "پیشرفته", "home.column_settings.basic": "اصلی", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "محلی", "tabs_bar.notifications": "اعلان‌ها", "tabs_bar.search": "جستجو", - "timeline.media": "عکس و ویدیو", - "timeline.posts": "بوق‌ها", "trends.count_by_accounts": "{count} {rawCount, plural, one {نفر نوشته است} other {نفر نوشته‌اند}}", "ui.beforeunload": "اگر از ماستدون خارج شوید پیش‌نویس شما پاک خواهد شد.", "upload_area.title": "برای بارگذاری به این‌جا بکشید", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index 4cdee49ee4..b4678c1d28 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Näytä asetukset", "column_header.unpin": "Poista kiinnitys", "column_subheading.settings": "Asetukset", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Tämä tuuttaus näkyy vain mainituille käyttäjille.", "compose_form.direct_message_warning_learn_more": "Lisätietoja", "compose_form.hashtag_warning": "Tämä tuuttaus ei näy hashtag-hauissa, koska se on listaamaton. Hashtagien avulla voi hakea vain julkisia tuuttauksia.", @@ -113,9 +114,13 @@ "empty_column.public": "Täällä ei ole mitään! Saat sisältöä, kun kirjoitat jotain julkisesti tai käyt manuaalisesti seuraamassa muiden instanssien käyttäjiä", "follow_request.authorize": "Valtuuta", "follow_request.reject": "Hylkää", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Aloitus", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon on avoimen lähdekoodin ohjelma. Voit avustaa tai raportoida ongelmia GitHubissa: {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Lisäasetukset", "home.column_settings.basic": "Perusasetukset", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Paikallinen", "tabs_bar.notifications": "Ilmoitukset", "tabs_bar.search": "Hae", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.", "upload_area.title": "Lataa raahaamalla ja pudottamalla tähän", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index a6849cc94c..c64263316c 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -3,7 +3,7 @@ "account.block": "Bloquer @{name}", "account.block_domain": "Tout masquer venant de {domain}", "account.blocked": "Bloqué", - "account.direct": "Message direct à @{name}", + "account.direct": "Envoyer un message direct à @{name}", "account.disclaimer_full": "Les données ci-dessous peuvent ne pas refléter ce profil dans sa totalité.", "account.domain_blocked": "Domaine caché", "account.edit_profile": "Modifier le profil", @@ -59,6 +59,7 @@ "column_header.show_settings": "Afficher les paramètres", "column_header.unpin": "Retirer", "column_subheading.settings": "Paramètres", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Ce pouet sera uniquement envoyé qu'aux personnes mentionnées. Cependant, l'administration de votre instance et des instances réceptrices pourront inspecter ce message.", "compose_form.direct_message_warning_learn_more": "En savoir plus", "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par hashtag car sa visibilité est réglée sur \"non-listé\". Seuls les pouets avec une visibilité \"publique\" peuvent être recherchés par hashtag.", @@ -80,11 +81,11 @@ "confirmations.delete_list.confirm": "Supprimer", "confirmations.delete_list.message": "Êtes-vous sûr de vouloir supprimer définitivement cette liste ?", "confirmations.domain_block.confirm": "Masquer le domaine entier", - "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables.", + "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine ni dans vos lignes de temps publiques, ni dans vos notifications. Vos suiveurs utilisant ce domaine seront retirés.", "confirmations.mute.confirm": "Masquer", "confirmations.mute.message": "Confirmez-vous le masquage de {name} ?", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "Effacer et ré-écrire", + "confirmations.redraft.message": "Êtes vous sûr de vouloir effacer ce statut pour le ré-écrire ? Vous perdrez toutes ses réponses, ses repartages et ses mises en favori.", "confirmations.unfollow.confirm": "Ne plus suivre", "confirmations.unfollow.message": "Voulez-vous arrêter de suivre {name} ?", "embed.instructions": "Intégrez ce statut à votre site en copiant le code ci-dessous.", @@ -113,9 +114,13 @@ "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres instances pour remplir le fil public", "follow_request.authorize": "Accepter", "follow_request.reject": "Rejeter", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Pour commencer", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et rapports de bogues via {github} sur GitHub.", + "getting_started.security": "Security", "getting_started.terms": "Conditions d’utilisation", "home.column_settings.advanced": "Avancé", "home.column_settings.basic": "Basique", @@ -166,7 +171,7 @@ "navigation_bar.favourites": "Favoris", "navigation_bar.follow_requests": "Demandes de suivi", "navigation_bar.info": "Plus d’informations", - "navigation_bar.keyboard_shortcuts": "Raccourcis clavier", + "navigation_bar.keyboard_shortcuts": "Raccourcis-clavier", "navigation_bar.lists": "Listes", "navigation_bar.logout": "Déconnexion", "navigation_bar.mutes": "Comptes masqués", @@ -251,7 +256,7 @@ "status.cancel_reblog_private": "Dé-booster", "status.cannot_reblog": "Cette publication ne peut être boostée", "status.delete": "Effacer", - "status.direct": "Message direct à @{name}", + "status.direct": "Envoyer un message direct à @{name}", "status.embed": "Intégrer", "status.favourite": "Ajouter aux favoris", "status.load_more": "Charger plus", @@ -266,7 +271,7 @@ "status.reblog": "Partager", "status.reblog_private": "Booster vers l'audience originale", "status.reblogged_by": "{name} a partagé :", - "status.redraft": "Delete & re-draft", + "status.redraft": "Effacer et ré-écrire", "status.reply": "Répondre", "status.replyAll": "Répondre au fil", "status.report": "Signaler @{name}", @@ -284,9 +289,7 @@ "tabs_bar.local_timeline": "Fil public local", "tabs_bar.notifications": "Notifications", "tabs_bar.search": "Chercher", - "timeline.media": "Media", - "timeline.posts": "Pouets", - "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", + "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} discutent", "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.", "upload_area.title": "Glissez et déposez pour envoyer", "upload_button.label": "Joindre un média", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 5aab4d6484..52ebf8a961 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Mostras axustes", "column_header.unpin": "Soltar", "column_subheading.settings": "Axustes", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Este toot enviarase só as usuarias mencionadas. Porén, a súa proveedora de internet e calquera das instancias receptoras poderían examinar esta mensaxe.", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.hashtag_warning": "Esta mensaxe non será listada baixo ningunha etiqueta xa que está marcada como non listada. Só os toots públicos poden buscarse por etiquetas.", @@ -113,9 +114,13 @@ "empty_column.public": "Nada por aquí! Escriba algo de xeito público, ou siga manualmente usuarias de outras instancias para ir enchéndoa", "follow_request.authorize": "Autorizar", "follow_request.reject": "Rexeitar", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Comezando", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon é software de código aberto. Pode contribuír ou informar de fallos en GitHub en {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Avanzado", "home.column_settings.basic": "Básico", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notificacións", "tabs_bar.search": "Buscar", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "O borrador perderase se sae de Mastodon.", "upload_area.title": "Arrastre e solte para subir", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 188d695538..4457e2a9b1 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -59,6 +59,7 @@ "column_header.show_settings": "הצגת העדפות", "column_header.unpin": "שחרור קיבוע", "column_subheading.settings": "אפשרויות", + "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": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות", "follow_request.authorize": "קבלה", "follow_request.reject": "דחיה", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "בואו נתחיל", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "מסטודון היא תוכנה חופשית (בקוד פתוח). ניתן לתרום או לדווח על בעיות בגיטהאב: {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "למתקדמים", "home.column_settings.basic": "למתחילים", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "ציר זמן מקומי", "tabs_bar.notifications": "התראות", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.", "upload_area.title": "ניתן להעלות על ידי Drag & drop", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index fc787366de..110246e8af 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.settings": "Postavke", + "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": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "Ovdje nema ništa! Napiši nešto javno, ili ručno slijedi korisnike sa drugih instanci kako bi popunio", "follow_request.authorize": "Autoriziraj", "follow_request.reject": "Odbij", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Počnimo", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon je softver otvorenog koda. Možeš pridonijeti ili prijaviti probleme na GitHubu {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Napredno", "home.column_settings.basic": "Osnovno", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokalno", "tabs_bar.notifications": "Notifikacije", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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": "Povuci i spusti kako bi uploadao", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 7c850b0058..187ce7c423 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -59,6 +59,7 @@ "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.", @@ -113,9 +114,13 @@ "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.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "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", "home.column_settings.advanced": "Fejlett", "home.column_settings.basic": "Alap", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Értesítések", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index bb167998e8..5d5ceb46bc 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Ցուցադրել կարգավորումները", "column_header.unpin": "Հանել", "column_subheading.settings": "Կարգավորումներ", + "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": "Այս թութը չի հաշվառվի որեւէ պիտակի տակ, քանզի այն ծածուկ է։ Միայն հրապարակային թթերը հնարավոր է որոնել պիտակներով։", @@ -113,9 +114,13 @@ "empty_column.public": "Այստեղ բան չկա՛։ Հրապարակային մի բան գրիր կամ հետեւիր այլ հանգույցներից էակների՝ այն լցնելու համար։", "follow_request.authorize": "Վավերացնել", "follow_request.reject": "Մերժել", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Ինչպես սկսել", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Մաստոդոնը բաց ելատեքստով ծրագրակազմ է։ Կարող ես ներդրում անել կամ վրեպներ զեկուցել ԳիթՀաբում՝ {github}։", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Առաջադեմ", "home.column_settings.basic": "Հիմնական", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Տեղական", "tabs_bar.notifications": "Ծանուցումներ", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Քո սեւագիրը կկորի, եթե լքես Մաստոդոնը։", "upload_area.title": "Քաշիր ու նետիր՝ վերբեռնելու համար", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 0dee976560..2b337fa201 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Tampilkan pengaturan", "column_header.unpin": "Lepaskan", "column_subheading.settings": "Pengaturan", + "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": "Toot ini tidak akan ada dalam daftar tagar manapun karena telah di set sebagai tidak terdaftar. Hanya postingan publik yang bisa dicari dengan tagar.", @@ -113,9 +114,13 @@ "empty_column.public": "Tidak ada apapun disini! Tulis sesuatu, atau ikuti pengguna lain dari server lain untuk mengisi ini", "follow_request.authorize": "Izinkan", "follow_request.reject": "Tolak", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Mulai", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon adalah perangkat lunak yang bersifat terbuka. Anda dapat berkontribusi atau melaporkan permasalahan/bug di Github {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Tingkat Lanjut", "home.column_settings.basic": "Dasar", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokal", "tabs_bar.notifications": "Notifikasi", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Naskah anda akan hilang jika anda keluar dari Mastodon.", "upload_area.title": "Seret & lepaskan untuk mengunggah", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index abb81981e0..7789c99941 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -59,6 +59,7 @@ "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 visible 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.", @@ -113,9 +114,13 @@ "empty_column.public": "Esas nulo hike! Skribez ulo publike, o manuale sequez uzeri de altra instaluri por plenigar ol.", "follow_request.authorize": "Yurizar", "follow_request.reject": "Refuzar", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Debuto", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon esas programaro kun apertita kodexo. Tu povas kontributar o signalar problemi en GitHub ye {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Komplexa", "home.column_settings.basic": "Simpla", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokala", "tabs_bar.notifications": "Savigi", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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": "Tranar faligar por kargar", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index f0d58621dd..7192811e7a 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Mostra impostazioni", "column_header.unpin": "Non fissare in cima", "column_subheading.settings": "Impostazioni", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Questo toot sarà mandato solo a tutti gli utenti menzionati.", "compose_form.direct_message_warning_learn_more": "Per saperne di piu'", "compose_form.hashtag_warning": "Questo toot non è listato, quindi non sarà trovato nelle ricerche per hashtag. Solo i toot pubblici possono essere cercati per hashtag.", @@ -80,11 +81,11 @@ "confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.message": "Sei sicuro di voler cancellare definitivamente questa lista?", "confirmations.domain_block.confirm": "Nascondi intero dominio", - "confirmations.domain_block.message": "Sei davvero sicuro che vuoi bloccare l'intero {domain}? Nella maggior parte dei casi, pochi blocchi o silenziamenti mirati sono sufficienti e preferibili.", + "confirmations.domain_block.message": "Sei davvero sicuro che vuoi bloccare l'intero {domain}? Nella maggior parte dei casi, pochi blocchi o silenziamenti mirati sono sufficienti e preferibili. Non vedrai nessun contenuto di quel dominio né nelle timeline pubbliche né nelle notifiche. I tuoi seguaci di quel dominio saranno eliminati.", "confirmations.mute.confirm": "Silenzia", "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "Cancella e riscrivi", + "confirmations.redraft.message": "Sei sicuro di voler cancellare questo stato e riscriverlo? Perderai tutte le risposte, condivisioni e preferiti.", "confirmations.unfollow.confirm": "Smetti di seguire", "confirmations.unfollow.message": "Sei sicuro che non vuoi più seguire {name}?", "embed.instructions": "Inserisci questo status nel tuo sito copiando il codice qui sotto.", @@ -113,10 +114,14 @@ "empty_column.public": "Qui non c'è nulla! Scrivi qualcosa pubblicamente, o aggiungi utenti da altri server per riempire questo spazio", "follow_request.authorize": "Autorizza", "follow_request.reject": "Rifiuta", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Come iniziare", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon è un software open source. Puoi contribuire o segnalare errori su GitHub all'indirizzo {github}.", - "getting_started.terms": "Terms of service", + "getting_started.security": "Security", + "getting_started.terms": "Condizioni del servizio", "home.column_settings.advanced": "Avanzato", "home.column_settings.basic": "Semplice", "home.column_settings.filter_regex": "Filtra con espressioni regolari", @@ -160,7 +165,7 @@ "navigation_bar.blocks": "Utenti bloccati", "navigation_bar.community_timeline": "Timeline locale", "navigation_bar.direct": "Messaggi diretti", - "navigation_bar.discover": "Discover", + "navigation_bar.discover": "Scopri", "navigation_bar.domain_blocks": "Domini nascosti", "navigation_bar.edit_profile": "Modifica profilo", "navigation_bar.favourites": "Apprezzati", @@ -174,7 +179,7 @@ "navigation_bar.pins": "Toot fissati in cima", "navigation_bar.preferences": "Impostazioni", "navigation_bar.public_timeline": "Timeline federata", - "navigation_bar.security": "Security", + "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", @@ -266,7 +271,7 @@ "status.reblog": "Condividi", "status.reblog_private": "Condividi con i destinatari iniziali", "status.reblogged_by": "{name} ha condiviso", - "status.redraft": "Delete & re-draft", + "status.redraft": "Cancella e riscrivi", "status.reply": "Rispondi", "status.replyAll": "Rispondi alla conversazione", "status.report": "Segnala @{name}", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Locale", "tabs_bar.notifications": "Notifiche", "tabs_bar.search": "Cerca", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "La bozza andrà persa se esci da Mastodon.", "upload_area.title": "Trascina per caricare", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 1b3ed3f5eb..984f1c4983 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -59,6 +59,7 @@ "column_header.show_settings": "設定を表示", "column_header.unpin": "ピン留めを外す", "column_subheading.settings": "設定", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "このトゥートはメンションされた人にのみ送信されます。", "compose_form.direct_message_warning_learn_more": "もっと詳しく", "compose_form.hashtag_warning": "このトゥートは未収載なのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。", @@ -80,11 +81,11 @@ "confirmations.delete_list.confirm": "削除", "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？", "confirmations.domain_block.confirm": "ドメイン全体を非表示", - "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。", + "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。", "confirmations.mute.confirm": "ミュート", "confirmations.mute.message": "本当に{name}さんをミュートしますか？", - "confirmations.redraft.confirm": "削除し下書きに戻す", - "confirmations.redraft.message": "本当にこのトゥートを削除し下書きに戻しますか？このトゥートへの全ての返信やブースト、お気に入り登録を失うことになります。", + "confirmations.redraft.confirm": "削除して下書きに戻す", + "confirmations.redraft.message": "本当にこのトゥートを削除して下書きに戻しますか？ このトゥートへの全ての返信やブースト、お気に入り登録を失うことになります。", "confirmations.unfollow.confirm": "フォロー解除", "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？", "embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。", @@ -113,9 +114,13 @@ "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のインスタンスのユーザーをフォローしたりしていっぱいにしましょう", "follow_request.authorize": "許可", "follow_request.reject": "拒否", + "getting_started.developers": "Developers", "getting_started.documentation": "ドキュメント", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "スタート", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub（{github}）から開発に参加したり、問題を報告したりできます。", + "getting_started.security": "Security", "getting_started.terms": "プライバシーポリシー", "home.column_settings.advanced": "高度な設定", "home.column_settings.basic": "基本設定", @@ -266,7 +271,7 @@ "status.reblog": "ブースト", "status.reblog_private": "ブースト", "status.reblogged_by": "{name}さんがブースト", - "status.redraft": "削除し下書きに戻す", + "status.redraft": "削除して下書きに戻す", "status.reply": "返信", "status.replyAll": "全員に返信", "status.report": "@{name}さんを通報", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "ローカル", "tabs_bar.notifications": "通知", "tabs_bar.search": "検索", - "timeline.media": "メディア", - "timeline.posts": "投稿", "trends.count_by_accounts": "{count} {rawCount, plural, one {人} other {人}} がトゥート", "ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。", "upload_area.title": "ドラッグ＆ドロップでアップロード", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 94f14593d2..1a3a4d23f5 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -81,11 +81,11 @@ "confirmations.delete_list.confirm": "삭제", "confirmations.delete_list.message": "정말로 이 리스트를 삭제하시겠습니까?", "confirmations.domain_block.confirm": "도메인 전체를 숨김", - "confirmations.domain_block.message": "정말로 {domain} 전체를 숨기시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다.", + "confirmations.domain_block.message": "정말로 {domain} 전체를 숨기시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 컨텐츠를 보지 못합니다. 해당 도메인 팔로워와의 관계가 사라집니다.", "confirmations.mute.confirm": "뮤트", "confirmations.mute.message": "정말로 {name}를 뮤트하시겠습니까?", - "confirmations.redraft.confirm": "지우고 다시 쓰기", - "confirmations.redraft.message": "정말로 지우고 다시 쓰시겠습니까? 이 툿에 대한 답장, 부스트, 즐겨찾기를 잃게 됩니다", + "confirmations.redraft.confirm": "삭제하고 다시 쓰기", + "confirmations.redraft.message": "정말로 이 포스트를 삭제하고 다시 쓰시겠습니까? 해당 포스트에 대한 답장과 부스트, 그리고 즐겨찾기를 잃게 됩니다.", "confirmations.unfollow.confirm": "언팔로우", "confirmations.unfollow.message": "정말로 {name}를 언팔로우하시겠습니까?", "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.", @@ -289,9 +289,7 @@ "tabs_bar.local_timeline": "로컬", "tabs_bar.notifications": "알림", "tabs_bar.search": "검색", - "timeline.media": "미디어", - "timeline.posts": "툿", - "trends.count_by_accounts": "{count} {rawCount, plural, one {명} other {명}}의 사람들이 이야기 하고 있습니다", + "trends.count_by_accounts": "{count} {rawCount, plural, one {명} other {명}} 의 사람들이 말하고 있습니다", "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.", "upload_area.title": "드래그 & 드롭으로 업로드", "upload_button.label": "미디어 추가", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 76b90ac2a7..8c6f7cee0b 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Instellingen tonen", "column_header.unpin": "Losmaken", "column_subheading.settings": "Instellingen", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Deze toot wordt alleen naar vermelde gebruikers verstuurd. Echter, de beheerders en moderatoren van jouw en de ontvangende Mastodonserver(s) kunnen dit bericht mogelijk wel bekijken.", "compose_form.direct_message_warning_learn_more": "Meer leren", "compose_form.hashtag_warning": "Deze toot valt niet onder een hashtag te bekijken, omdat deze niet op openbare tijdlijnen wordt getoond. Alleen openbare toots kunnen via hashtags gevonden worden.", @@ -80,7 +81,7 @@ "confirmations.delete_list.confirm": "Verwijderen", "confirmations.delete_list.message": "Weet je zeker dat je deze lijst definitief wilt verwijderen?", "confirmations.domain_block.confirm": "Negeer alles van deze server", - "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wil negeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en gepaster.", + "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt negeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je zult geen toots van deze server op openbare tijdlijnen zien of in jouw meldingen. Jouw volgers van deze server worden verwijderd.", "confirmations.mute.confirm": "Negeren", "confirmations.mute.message": "Weet je het zeker dat je {name} wilt negeren?", "confirmations.redraft.confirm": "Verwijderen en herschrijven", @@ -113,9 +114,13 @@ "empty_column.public": "Er is hier helemaal niks! Toot iets in het openbaar of volg mensen van andere servers om het te vullen", "follow_request.authorize": "Goedkeuren", "follow_request.reject": "Afkeuren", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentatie", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Aan de slag", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon is vrije software. Je kunt bijdragen of problemen melden op GitHub via {github}.", + "getting_started.security": "Security", "getting_started.terms": "Voorwaarden", "home.column_settings.advanced": "Geavanceerd", "home.column_settings.basic": "Algemeen", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokaal", "tabs_bar.notifications": "Meldingen", "tabs_bar.search": "Zoeken", - "timeline.media": "Media", - "timeline.posts": "Toots", "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", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index d971bfcdce..0491d3f7ad 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Vis innstillinger", "column_header.unpin": "Løsne", "column_subheading.settings": "Innstillinger", + "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": "Denne tuten blir ikke listet under noen emneknagger da den er ulistet. Kun offentlige tuter kan søktes etter med emneknagg.", @@ -113,9 +114,13 @@ "empty_column.public": "Det er ingenting her! Skriv noe offentlig, eller følg brukere manuelt fra andre instanser for å fylle den opp", "follow_request.authorize": "Autorisér", "follow_request.reject": "Avvis", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Kom i gang", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon er fri programvare. Du kan bidra eller rapportere problemer på GitHub på {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Avansert", "home.column_settings.basic": "Enkel", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokal", "tabs_bar.notifications": "Varslinger", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Din kladd vil bli forkastet om du forlater Mastodon.", "upload_area.title": "Dra og slipp for å laste opp", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index cfbd3a83cd..0c65fbad5f 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Mostrar los paramètres", "column_header.unpin": "Despenjar", "column_subheading.settings": "Paramètres", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Sols los mencionats poiràn veire aqueste tut.", "compose_form.direct_message_warning_learn_more": "Ne saber mai", "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pas cercar que los tuts publics per etiqueta.", @@ -80,7 +81,7 @@ "confirmations.delete_list.confirm": "Suprimir", "confirmations.delete_list.message": "Volètz vertadièrament suprimir aquesta lista per totjorn ?", "confirmations.domain_block.confirm": "Amagar tot lo domeni", - "confirmations.domain_block.message": "Volètz vertadièrament blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.", + "confirmations.domain_block.message": "Volètz vertadièrament blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.\nVeiretz pas cap de contengut d’aquel domeni dins cap de flux public o dins vòstras notificacions. Vòstres seguidors d’aquel domeni seràn levats.", "confirmations.mute.confirm": "Rescondre", "confirmations.mute.message": "Sètz segur de voler rescondre {name} ?", "confirmations.redraft.confirm": "Delete & redraft", @@ -113,9 +114,13 @@ "empty_column.public": "I a pas res aquí ! Escrivètz quicòm de public, o seguètz de personas d’autras instàncias per garnir lo flux public", "follow_request.authorize": "Acceptar", "follow_request.reject": "Regetar", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Per començar", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon es un logicial liure. Podètz contribuir e mandar vòstres comentaris e rapòrt de bug via {github} sus GitHub.", + "getting_started.security": "Security", "getting_started.terms": "Condicions d’utilizacion", "home.column_settings.advanced": "Avançat", "home.column_settings.basic": "Basic", @@ -160,7 +165,7 @@ "navigation_bar.blocks": "Personas blocadas", "navigation_bar.community_timeline": "Flux public local", "navigation_bar.direct": "Messatges dirèctes", - "navigation_bar.discover": "Descobrir", + "navigation_bar.discover": "Trobar", "navigation_bar.domain_blocks": "Domenis resconduts", "navigation_bar.edit_profile": "Modificar lo perfil", "navigation_bar.favourites": "Favorits", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Flux public local", "tabs_bar.notifications": "Notificacions", "tabs_bar.search": "Recèrcas", - "timeline.media": "Media", - "timeline.posts": "Tuts", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} ne charra other {people}} ne charran", "ui.beforeunload": "Vòstre brolhon serà perdut se quitatz Mastodon.", "upload_area.title": "Lisatz e depausatz per mandar", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index a597d5702a..88fa7bfcbb 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Pokaż ustawienia", "column_header.unpin": "Cofnij przypięcie", "column_subheading.settings": "Ustawienia", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Ten wpis będzie widoczny tylko dla wszystkich wspomnianych użytkowników.", "compose_form.direct_message_warning_learn_more": "Dowiedz się więcej", "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hashtagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hashtagów.", @@ -113,9 +114,13 @@ "empty_column.public": "Tu nic nie ma! Napisz coś publicznie, lub dodaj ludzi z innych instancji, aby to wyświetlić", "follow_request.authorize": "Autoryzuj", "follow_request.reject": "Odrzuć", + "getting_started.developers": "Developers", "getting_started.documentation": "Dokumentacja", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Rozpocznij", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na GitHubie tutaj: {github}.", + "getting_started.security": "Security", "getting_started.terms": "Zasady użytkowania", "home.column_settings.advanced": "Zaawansowane", "home.column_settings.basic": "Podstawowe", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokalne", "tabs_bar.notifications": "Powiadomienia", "tabs_bar.search": "Szukaj", - "timeline.media": "Zawartość multimedialna", - "timeline.posts": "Wpisy", "trends.count_by_accounts": "{count} {rawCount, plural, one {osoba rozmawia} few {osoby rozmawiają} other {osób rozmawia}} o tym", "ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.", "upload_area.title": "Przeciągnij i upuść aby wysłać", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 89a2cf3e3d..0697d9ab9f 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Mostrar configurações", "column_header.unpin": "Desafixar", "column_subheading.settings": "Configurações", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Este toot só será enviado aos usuários mencionados.", "compose_form.direct_message_warning_learn_more": "Saber mais", "compose_form.hashtag_warning": "Esse toot não será listado em nenhuma hashtag por ser não listado. Somente toots públicos podem ser pesquisados por hashtag.", @@ -80,7 +81,7 @@ "confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.message": "Você tem certeza que quer deletar permanentemente a lista?", "confirmations.domain_block.confirm": "Esconder o domínio inteiro", - "confirmations.domain_block.message": "Você quer mesmo bloquear {domain} inteiro? Na maioria dos casos, silenciar ou bloquear alguns usuários é o suficiente e o recomendado.", + "confirmations.domain_block.message": "Você quer mesmo bloquear {domain} inteiro? Na maioria dos casos, silenciar ou bloquear alguns usuários é o suficiente e o recomendado. Você não vai ver conteúdo desse domínio em nenhuma das timelines públicas ou nas suas notificações. Seus seguidores desse domínio serão removidos.", "confirmations.mute.confirm": "Silenciar", "confirmations.mute.message": "Você tem certeza de que quer silenciar {name}?", "confirmations.redraft.confirm": "Apagar & usar como rascunho", @@ -113,9 +114,13 @@ "empty_column.public": "Não há nada aqui! Escreva algo publicamente ou siga manualmente usuários de outras instâncias", "follow_request.authorize": "Autorizar", "follow_request.reject": "Rejeitar", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Primeiros passos", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon é um software de código aberto. Você pode contribuir ou reportar problemas na página do GitHub do projeto: {github}.", + "getting_started.security": "Security", "getting_started.terms": "Termos de serviço", "home.column_settings.advanced": "Avançado", "home.column_settings.basic": "Básico", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notificações", "tabs_bar.search": "Buscar", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {pessoa} other {pessoas}} falando sobre", "ui.beforeunload": "Seu rascunho será perdido se você sair do Mastodon.", "upload_area.title": "Arraste e solte para enviar", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index d51a47955a..fb0cfc4456 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Mostrar preferências", "column_header.unpin": "Desafixar", "column_subheading.settings": "Preferências", + "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": "Esta pulbicacção não será listada em nenhuma hashtag por ser não listada. Somente publicações públicas podem ser pesquisadas por hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para ver aqui os conteúdos públicos", "follow_request.authorize": "Autorizar", "follow_request.reject": "Rejeitar", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Primeiros passos", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon é software de fonte aberta. Podes contribuir ou repostar problemas no GitHub do projecto: {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Avançado", "home.column_settings.basic": "Básico", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notificações", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "O teu rascunho vai ser perdido se abandonares o Mastodon.", "upload_area.title": "Arraste e solte para enviar", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 0ef7a32bbe..57bd413ea8 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Показать настройки", "column_header.unpin": "Открепить", "column_subheading.settings": "Настройки", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Этот статус будет виден только упомянутым пользователям.", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.hashtag_warning": "Этот пост не будет показывается в поиске по хэштегу, т.к. он непубличный. Только публичные посты можно найти в поиске по хэштегу.", @@ -113,9 +114,13 @@ "empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту.", "follow_request.authorize": "Авторизовать", "follow_request.reject": "Отказать", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Добро пожаловать", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon - программа с открытым исходным кодом. Вы можете помочь проекту или сообщить о проблемах на GitHub по адресу {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Дополнительные", "home.column_settings.basic": "Основные", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Локальная", "tabs_bar.notifications": "Уведомления", "tabs_bar.search": "Поиск", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Ваш черновик будет утерян, если вы покинете Mastodon.", "upload_area.title": "Перетащите сюда, чтобы загрузить", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index c71d253270..bdc3636697 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -16,7 +16,7 @@ "account.mention": "Spomeň @{name}", "account.moved_to": "{name} sa presunul/a na:", "account.mute": "Ignorovať @{name}", - "account.mute_notifications": "Stĺmiť oznámenia od @{name}", + "account.mute_notifications": "Stĺmiť oboznámenia od @{name}", "account.muted": "Utíšený/á", "account.posts": "Hlášky", "account.posts_with_replies": "Príspevky s odpoveďami", @@ -32,9 +32,9 @@ "account.view_full_profile": "Pozri celý profil", "alert.unexpected.message": "Vyskytla sa neočakávaná chyba.", "alert.unexpected.title": "Oops!", - "boost_modal.combo": "Nabudúce môžete kliknúť {combo} aby ste preskočili", - "bundle_column_error.body": "Nastala chyba pri načítaní tohto komponentu.", - "bundle_column_error.retry": "Skúste znova", + "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", "bundle_column_error.title": "Chyba siete", "bundle_modal_error.close": "Zatvoriť", "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.", @@ -48,8 +48,8 @@ "column.home": "Domov", "column.lists": "Zoznamy", "column.mutes": "Ignorovaní užívatelia", - "column.notifications": "Oznámenia", - "column.pins": "Pripnuté tooty", + "column.notifications": "Oboznámenia", + "column.pins": "Pripnuté príspevky", "column.public": "Federovaná časová os", "column_back_button.label": "Späť", "column_header.hide_settings": "Skryť nastavenia", @@ -59,6 +59,7 @@ "column_header.show_settings": "Ukáž nastavenia", "column_header.unpin": "Odopnúť", "column_subheading.settings": "Nastavenia", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Tento príspevok bude videný výhradne iba spomenutými užívateľmi. Ber ale na vedomie že správci tvojej a všetkých iných zahrnutých instancií majú možnosť skontrolovať túto správu.", "compose_form.direct_message_warning_learn_more": "Zistiť viac", "compose_form.hashtag_warning": "Tento toot nebude zobrazený pod žiadným haštagom lebo nieje listovaný. Iba verejné tooty môžu byť nájdené podľa haštagu.", @@ -80,7 +81,7 @@ "confirmations.delete_list.confirm": "Vymazať", "confirmations.delete_list.message": "Ste si istý/á, že chceťe navždy vymazať tento zoznam?", "confirmations.domain_block.confirm": "Skryť celú doménu", - "confirmations.domain_block.message": "Ste si naozaj istý, že chcete blokovať celú {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať daných používateľov, čiže to sa doporučuje.", + "confirmations.domain_block.message": "Si si naozaj istý, že chceš blokovať celú {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych používateľov, čo sa doporučuje. Neuvidíš obsah z tejto domény v žiadnej verejnej časovej osi, ani v oznámeniach. Tvoji následovníci pochádzajúci z tejto domény budú odstránení.", "confirmations.mute.confirm": "Ignoruj", "confirmations.mute.message": "Naozaj chcete ignorovať {name}?", "confirmations.redraft.confirm": "Vyčistiť a prepísať", @@ -113,9 +114,13 @@ "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne alebo začnite sledovať používateľov z iných Mastodon serverov aby tu niečo pribudlo", "follow_request.authorize": "Povoľ prístup", "follow_request.reject": "Odmietni", + "getting_started.developers": "Developers", "getting_started.documentation": "Dokumentácia", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Začni tu", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon má otvorený kód. Nahlásiť chyby, alebo prispieť môžeš na GitHube v {github}.", + "getting_started.security": "Security", "getting_started.terms": "Podmienky prevozu", "home.column_settings.advanced": "Pokročilé", "home.column_settings.basic": "Základné", @@ -264,7 +269,7 @@ "status.pin": "Pripni na profil", "status.pinned": "Pripnutý príspevok", "status.reblog": "Povýšiť", - "status.reblog_private": "Boost to original audience", + "status.reblog_private": "Povýš k pôvodnému publiku", "status.reblogged_by": "{name} povýšil/a", "status.redraft": "Vymaž a prepíš", "status.reply": "Odpovedať", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokálna", "tabs_bar.notifications": "Notifikácie", "tabs_bar.search": "Hľadaj", - "timeline.media": "Médiá", - "timeline.posts": "Príspevky", "trends.count_by_accounts": "{count} {rawCount, viacerí, jeden {person} iní {people}} diskutujú", "ui.beforeunload": "Čo máš rozpísané sa stratí, ak opustíš Mastodon.", "upload_area.title": "Pretiahni a pusť pre nahratie", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 2d89b63ebb..7e4307c2ad 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Prikaži nastavitve", "column_header.unpin": "Odpni", "column_subheading.settings": "Nastavitve", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Ta tut bo viden le vsem omenjenim uporabnikom.", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.hashtag_warning": "Ta tut ne bo naveden pod nobenim hashtagom, ker ni dodan hashtag. Samo javne tute lahko iščete pod hashtagom.", @@ -113,9 +114,13 @@ "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", "follow_request.reject": "Zavrni", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "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", "home.column_settings.advanced": "Napredno", "home.column_settings.basic": "Osnovno", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokalno", "tabs_bar.notifications": "Obvestila", "tabs_bar.search": "Poišči", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Vaš osnutek bo izgubljen, če zapustite Mastodona.", "upload_area.title": "Povlecite in spustite za pošiljanje", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index c174959795..7a72ba6fb7 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Prikaži postavke", "column_header.unpin": "Otkači", "column_subheading.settings": "Postavke", + "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": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "Ovde nema ničega! Napišite nešto javno, ili nađite korisnike sa drugih instanci koje ćete zapratiti da popunite ovu prazninu", "follow_request.authorize": "Odobri", "follow_request.reject": "Odbij", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Da počnete", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodont je softver otvorenog koda. Možete mu doprineti ili prijaviti probleme preko GitHub-a na {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Napredno", "home.column_settings.basic": "Osnovno", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokalno", "tabs_bar.notifications": "Obaveštenja", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Ako napustite Mastodont, izgubićete napisani nacrt.", "upload_area.title": "Prevucite ovde da otpremite", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index f11e3935c1..c699bd8fd1 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Прикажи поставке", "column_header.unpin": "Откачи", "column_subheading.settings": "Поставке", + "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": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "Овде нема ничега! Напишите нешто јавно, или нађите кориснике са других инстанци које ћете запратити да попуните ову празнину", "follow_request.authorize": "Одобри", "follow_request.reject": "Одбиј", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Да почнете", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Мастoдонт је софтвер отвореног кода. Можете му допринети или пријавити проблеме преко GitHub-а на {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Напредно", "home.column_settings.basic": "Основно", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Локално", "tabs_bar.notifications": "Обавештења", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Ако напустите Мастодонт, изгубићете написани нацрт.", "upload_area.title": "Превуците овде да отпремите", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index fd0cc32689..00d2fee8e3 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Visa inställningar", "column_header.unpin": "Ångra fäst", "column_subheading.settings": "Inställningar", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "Denna toot kommer endast att skickas nämnda nämnda användare.", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.hashtag_warning": "Denna toot kommer inte att listas under någon hashtag eftersom den är onoterad. Endast offentliga toots kan sökas med hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "Det finns inget här! Skriv något offentligt, eller följ manuellt användarna från andra instanser för att fylla på det", "follow_request.authorize": "Godkänn", "follow_request.reject": "Avvisa", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Kom igång", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon är programvara med öppen källkod. Du kan bidra eller rapportera problem via GitHub på {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Avancerad", "home.column_settings.basic": "Grundläggande", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Lokal", "tabs_bar.notifications": "Meddelanden", "tabs_bar.search": "Sök", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "Ditt utkast kommer att förloras om du lämnar Mastodon.", "upload_area.title": "Dra & släpp för att ladda upp", diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json index 22b164936c..74fe732e13 100644 --- a/app/javascript/mastodon/locales/te.json +++ b/app/javascript/mastodon/locales/te.json @@ -59,6 +59,7 @@ "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 visible 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.", @@ -113,9 +114,13 @@ "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.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "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", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notifications", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 57fe1b5d95..07cce99d5c 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -59,6 +59,7 @@ "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 visible 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.", @@ -113,9 +114,13 @@ "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.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "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", "home.column_settings.advanced": "Advanced", "home.column_settings.basic": "Basic", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notifications", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 9c5e894639..e46084467d 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.settings": "Ayarlar", + "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": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "Burada hiçbir gönderi yok! Herkese açık bir şeyler yazın, veya diğer sunucudaki insanları takip ederek bu alanın dolmasını sağlayın", "follow_request.authorize": "Yetkilendir", "follow_request.reject": "Reddet", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Başlangıç", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon açık kaynaklı bir yazılımdır. Github {github}. {apps} üzerinden katkıda bulunabilir, hata raporlayabilirsiniz.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Gelişmiş", "home.column_settings.basic": "Temel", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Yerel", "tabs_bar.notifications": "Bildirimler", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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": "Upload için sürükle bırak yapınız", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 0f76a0045e..a73c04e5bb 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -59,6 +59,7 @@ "column_header.show_settings": "Show settings", "column_header.unpin": "Unpin", "column_subheading.settings": "Налаштування", + "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": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", @@ -113,9 +114,13 @@ "empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших інстанцій, щоб заповнити стрічку.", "follow_request.authorize": "Авторизувати", "follow_request.reject": "Відмовити", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "Ласкаво просимо", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon - програма з відкритим вихідним кодом. Ви можете допомогти проекту, або повідомити про проблеми на GitHub за адресою {github}.", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "Додаткові", "home.column_settings.basic": "Основні", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "Локальна", "tabs_bar.notifications": "Сповіщення", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "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": "Перетягніть сюди, щоб завантажити", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 578f038429..90a6500aed 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -59,6 +59,7 @@ "column_header.show_settings": "顯示設定", "column_header.unpin": "取下", "column_subheading.settings": "設定", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "這文章只有被提及的用戶才可以看到。", "compose_form.direct_message_warning_learn_more": "了解更多", "compose_form.hashtag_warning": "這文章因為不是公開，所以不會被標籤搜索。只有公開的文章才會被標籤搜索。", @@ -113,9 +114,13 @@ "empty_column.public": "跨站時間軸暫時沒有內容！快寫一些公共的文章，或者關注另一些服務站的用戶吧！你和本站、友站的交流，將決定這裏出現的內容。", "follow_request.authorize": "批准", "follow_request.reject": "拒絕", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "開始使用", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon（萬象）是一個開放源碼的軟件。你可以在官方 GitHub ({github}) 貢獻或者回報問題。", + "getting_started.security": "Security", "getting_started.terms": "服務條款", "home.column_settings.advanced": "進階", "home.column_settings.basic": "基本", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "本站", "tabs_bar.notifications": "通知", "tabs_bar.search": "搜尋", - "timeline.media": "Media", - "timeline.posts": "文章", "trends.count_by_accounts": "{count} 位用戶在討論", "ui.beforeunload": "如果你現在離開 Mastodon，你的草稿內容將會被丟棄。", "upload_area.title": "將檔案拖放至此上載", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 88dd4ac6dd..1ba277e289 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -59,6 +59,7 @@ "column_header.show_settings": "顯示設定", "column_header.unpin": "取下", "column_subheading.settings": "設定", + "community.column_settings.media_only": "Media Only", "compose_form.direct_message_warning": "此則推文只會被所有提到的使用者看見。", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.hashtag_warning": "此則推文將不會在任何主題標籤中看見，只有公開的推文可以用主題標籤來搜尋。", @@ -113,9 +114,13 @@ "empty_column.public": "這裡什麼都沒有！公開寫些什麼，或是關注其他副本的使用者。", "follow_request.authorize": "授權", "follow_request.reject": "拒絕", + "getting_started.developers": "Developers", "getting_started.documentation": "Documentation", + "getting_started.find_friends": "Find friends from Twitter", "getting_started.heading": "馬上開始", + "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon 是開源軟體。你可以在 GitHub {github} 上做出貢獻或是回報問題。", + "getting_started.security": "Security", "getting_started.terms": "Terms of service", "home.column_settings.advanced": "進階", "home.column_settings.basic": "基本", @@ -284,8 +289,6 @@ "tabs_bar.local_timeline": "本地", "tabs_bar.notifications": "通知", "tabs_bar.search": "Search", - "timeline.media": "Media", - "timeline.posts": "Toots", "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", "ui.beforeunload": "如果離開 Mastodon，你的草稿將會不見。", "upload_area.title": "拖放來上傳", diff --git a/config/locales/ar.yml b/config/locales/ar.yml index ad194a17c5..9e32447082 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -426,7 +426,7 @@ ar: following: 'مرحى ! أنت الآن تتبع :' post_follow: close: أو يمكنك إغلاق هذه النافذة. - return: العودة إلى الملف الشخصي للمستخدم + return: عرض الملف الشخصي للمستخدم web: واصل إلى الويب title: إتباع %{acct} datetime: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index e536ea8c3e..0b403c5e4e 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -514,6 +514,7 @@ ca: '86400': 1 dia expires_in_prompt: Mai generate: Genera + invited_by: 'Has estat invitat per:' max_uses: one: 1 ús other: "%{count} usos" diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml index 4bbc723e9b..173622bc50 100644 --- a/config/locales/devise.sk.yml +++ b/config/locales/devise.sk.yml @@ -6,11 +6,11 @@ sk: send_instructions: O niekoľko minút obdržíte email s inštrukciami ako potvrdiť váš účet. send_paranoid_instructions: Ak sa váš email nachádza v našej databáze, obdržíte email s inštrukciami ako potvrdiť váš účet. failure: - already_authenticated: Už ste prihlásený/á. - inactive: Váš účet ešte nebol aktivovaný. - invalid: Nesprávny %{authentication_keys} alebo heslo. - last_attempt: Máte posledný pokus pred zamknutím vašeho účtu. - locked: Váš účet je zamknutý. + already_authenticated: Už si prihlásený/á. + inactive: Tvoj účet ešte nebol potvrdený. + invalid: Nesprávny %{authentication_keys}, alebo heslo. + last_attempt: Máš posledný pokus pred zamknutím tvojho účtu. + locked: Tvoj účet je zamknutý. not_found_in_database: Nesprávny %{authentication_keys} alebo heslo. timeout: Vaša aktívna sezóna vypršala. Pre pokračovanie sa prosím znovu prihláste. unauthenticated: K pokračovaniu sa musíš zaregistrovať alebo prihlásiť. @@ -52,11 +52,11 @@ sk: no_token: Túto stránku nemôžete navštíviť pokiaľ neprichádzate z emailu s inštrukciami na obnovu hesla. Pokiaľ prichádzate z tohto emailu, prosím uistite sa že ste použili celú URL z emailu. send_instructions: Ak zadaný email existuje v našej databázi, tak o niekoľko minút obdržíte email s inštrukciami ako nastaviť nové heslo. send_paranoid_instructions: Ak zadaný email existuje v našej databázi, zachvíľu obdržíte odkaz na obnovu hesla na svoj email. Skontrolujte aj spam ak tento email nevidíte. - updated: Vaše heslo bolo úspešne zmenené. Teraz ste prihlásený/á. - updated_not_active: Vaše heslo bolo úspešne zmenené. + updated: Tvoje heslo bolo úspešne zmenené. Teraz si prihlásený/á. + updated_not_active: Tvoje heslo bolo úspešne zmenené. registrations: - destroyed: Dovidenia! Váš účet bol úspešne zrušený. Dúfame ale, že sa tu opäť niekedy zastavíte. - signed_up: Vitajte! Vaša registrácia bola úspešná. + destroyed: Dovidenia! Tvoj účet bol úspešne zrušený. Dúfame ale, že ťa tu opäť niekedy uvidíme. + signed_up: Vitaj! Tvoja registrácia bola úspešná. signed_up_but_inactive: Registrácia bola úspešná. Avšak, účet ešte nebol aktivovaný, takže ťa nemôžeme prihlásiť. signed_up_but_locked: Prihlasovanie úspešné. Avšak tvoj účet je zamknutý, takže ťa nieje možné prihlásiť. signed_up_but_unconfirmed: Správa s odkazom potvrdzujúcim registráciu bola poslaná na váš email. Pre aktváciu účtu, kliknite na daný odkaz. diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml index 2293f1115e..e191265540 100644 --- a/config/locales/doorkeeper.fa.yml +++ b/config/locales/doorkeeper.fa.yml @@ -37,8 +37,8 @@ fa: index: application: برنامه callback_url: نشانی Callback - delete: Delete - name: Name + delete: حذف + name: نام new: برنامهٔ تازه scopes: دامنه‌ها show: نمایش diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml index d909271892..b998d9c376 100644 --- a/config/locales/doorkeeper.sk.yml +++ b/config/locales/doorkeeper.sk.yml @@ -25,7 +25,7 @@ sk: edit: Upraviť submit: Poslať confirmations: - destroy: Ste si istý? + destroy: Si si istý/á? edit: title: Upraviť aplikáciu form: @@ -55,7 +55,7 @@ sk: authorizations: buttons: authorize: Overiť - deny: Zamietnuť + deny: Zamietni error: title: Nastala chyba new: @@ -115,6 +115,6 @@ sk: title: Požadovaná OAuth autorizácia scopes: follow: sledovať, blokovať, povoliť a zušiť sledovanie účtov - push: dostávaj oznámenia ohľadom tvojho účtu ako notifikácie na plochu - read: prezrieť dáta na vašom účete - write: poslať vo vašom mene + push: dostávaj oboznámenia ohľadom tvojho účtu ako notifikácie na plochu + read: prezrieť dáta svojho účetu + write: poslať v tvojom mene diff --git a/config/locales/el.yml b/config/locales/el.yml index 353e437322..6bcf0ad46e 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -221,7 +221,7 @@ el: suspend: Αναστολή title: Αποκλεισμός νέου τομέα reject_media: Απόρριψη πολυμέσων - reject_media_hint: Αφαιρεί τα τοπικά αποθηκευμένα αρχεία πολυμέσων και αποτρέπει το κατέβασμα άλλων στο μέλλον. Δεν έχει σημασία για τις αναστολές + reject_media_hint: Αφαιρεί τα τοπικά αποθηκευμένα αρχεία πολυμέσων και αποτρέπει τη λήψη άλλων στο μέλλον. Δεν έχει σημασία για τις αναστολές severities: noop: Κανένα silence: Αποσιώπηση @@ -480,16 +480,271 @@ el: followers_count: Πλήθος ακολούθων lock_link: Κλείδωσε το λογαριασμό σου purge: Αφαίρεσε από ακόλουθο + success: + one: Ημι-μπλοκάροντας τους ακόλουθους από έναν τομέα... + other: Ημι-μπλοκάροντας τους ακόλουθους από %{count} τομείς... + true_privacy_html: Έχε υπ' όψιν σου πως η πραγματική ιδιωτικότητα επιτυγχάνεται μόνο με κρυπτογράφηση από άκρη σε άκρη. + unlocked_warning_html: Μπορεί ο οποιοσδήποτε να σε ακολουθήσει και να βλέπει κατευθείαν τις ιδιωτικές ενημερώσεις σου. %{lock_link} για να αναθεωρήσεις και απορρίψεις ακόλουθους. + unlocked_warning_title: Ο λογαριασμός σου δεν είναι κλειδωμένος + generic: + changes_saved_msg: Οι αλλαγές αποθηκεύτηκαν! + powered_by: παρέχεται από %{link} + save_changes: Αποθήκευσε αλλαγές + validation_errors: + one: Κάτι δεν είναι εντάξει ακόμα! Για κοίταξε το παρακάτω σφάλμα + other: Κάτι δεν είναι εντάξει ακόμα! Για κοίταξε τα παρακάτω %{count} σφάλματα imports: preface: Μπορείς να εισάγεις τα δεδομένα που έχεις εξάγει από άλλο κόμβο, όπως τη λίστα των ανθρώπων που ακολουθείς ή μπλοκάρεις. + success: Τα δεδομένα σου μεταφορτώθηκαν επιτυχώς και θα επεξεργαστούν εν καιρώ + types: + blocking: Λίστα αποκλεισμού + following: Λίστα ακολούθων + muting: Λίστα αποσιωπήσεων + upload: Ανέβασμα + in_memoriam_html: Εις μνήμην. invites: + delete: Απενεργοποίησε + expired: Ληγμένη + expires_in: + '1800': 30 λεπτά + '21600': 6 ώρες + '3600': 1 ώρα + '43200': 12 ώρες + '604800': 1 εβδομάδα + '86400': 1 μέρα + expires_in_prompt: Ποτέ + generate: Δημιούργησε + max_uses: + one: 1 χρήσης + other: "%{count} χρήσεων" + max_uses_prompt: Απεριόριστη prompt: Φτιάξε και μοίρασε συνδέσμους με τρίτους για να δώσεις πρόσβαση σε αυτόν τον κόμβο + table: + expires_at: Λήγει + uses: Χρήσεις + title: Προσκάλεσε άτομα + landing_strip_html: Ο/Η %{name} είναι χρήστης στο %{link_to_root_path}. Μπορείς να ακολουθήσεις ή να αλληλεπιδράσεις μαζί τους αν έχεις λογαριασμό οπουδήποτε στο fediverse. + landing_strip_signup_html: Αν όχι, μπορείς να γραφτείς εδώ. + lists: + errors: + limit: Έχεις φτάσει το μέγιστο πλήθος επιτρεπτών λιστών + media_attachments: + validations: + images_and_video: Δεν γίνεται να προσθέσεις βίντεο σε ενημέρωση που ήδη περιέχει εικόνες + too_many: Δεν γίνεται να προσθέσεις περισσότερα από 4 αρχεία + migrations: + acct: ΌνομαΧρήστη@Τομέας του νέου λογαριασμού + currently_redirecting: 'Το προφίλ σου έχει ρυθμιστεί να ανακατευθύνει στο:' + proceed: Αποθήκευση + updated_msg: Οι ρυθμίσεις μετακόμισης του λογαριασμού σου ενημερώθηκαν! + moderation: + title: Συντονισμός + notification_mailer: + digest: + action: Δες όλες τις ειδοποιήσεις + body: Μια σύνοψη των μηνυμάτων που έχασες από την τελευταία επίσκεψή σου στις %{since} + mention: 'Ο/Η %{name} σε ανέφερε στις:' + new_followers_summary: + one: Επίσης, απέκτησες έναν νέο ακόλουθο ενώ ήσουν μακριά! + other: Επίσης, απέκτησες %{count} νέους ακόλουθους ενώ ήσουν μακριά! Εκπληκτικό! + subject: + one: "1 νέα ειδοποίηση από την τελευταία επίσκεψή σου \U0001F418" + other: "%{count} νέες ειδοποιήσεις από την τελευταία επίσκεψή σου \U0001F418" + title: Ενώ έλειπες... + favourite: + body: 'Η κατάστασή σου αγαπήθηκε από τον/την %{name}:' + subject: Ο/Η %{name} αγάπησε την κατάστασή σου + title: Νέο αγαπημένο + follow: + body: Ο/Η %{name} πλέον σε ακολουθεί! + subject: Ο/Η %{name} πλέον σε ακολουθεί + title: Νέος/α ακόλουθος + follow_request: + action: Διαχειρίσου τα αιτήματα παρακολούθησης + body: "%{name} αιτήθηκε να σε ακολουθήσει" + subject: 'Ακόλουθος που εκκρεμεί: %{name}' + title: Νέο αίτημα ακολούθησης + mention: + action: Απάντησε + body: 'Αναφέρθηκες από τον/την %{name} στο:' + subject: Αναφέρθηκες από τον/την %{name} + title: Νέα αναφορά + reblog: + body: 'Η κατάστασή σου προωθήθηκε από τον/την %{name}:' + subject: Ο/Η %{name} προώθησε την κατάστασή σου + title: Νέα προώθηση + number: + human: + decimal_units: + format: "%n%u" + units: + billion: Δις. + million: Εκ. + quadrillion: Τετρ. + thousand: Χ. + trillion: Τρις. + pagination: + newer: Νεότερο + next: Επόμενο + older: Παλιότερο + prev: Προηγούμενο + truncate: "…" + preferences: + languages: Γλώσσες + other: Άλλο + publishing: Δημοσίευση + web: Διαδίκτυο + remote_follow: + acct: Γράψε το ΌνομαΧρήστη@τομέας από όπου θέλεις να ακολουθήσεις + missing_resource: Δεν βρέθηκε το απαιτούμενο URL ανακατεύθυνσης για το λογαριασμό σου + proceed: Συνέχισε για να ακολουθήσεις + prompt: 'Θα ακολουθήσεις:' + remote_unfollow: + error: Σφάλμα + title: Τίτλος + unfollowed: Σταμάτησες να ακολουθείς + sessions: + activity: Τελευταία δραστηριότητα + browser: Φυλλομετρητής (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: Αυτοί είναι οι φυλλομετρητές (browsers) που είναι συνδεδεμένοι στον λογαριασμό σου στο 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: Σύνδεση + settings: + authorized_apps: Εγκεκριμένες εφαρμογές + back: Πίσω στο Mastodon + delete: Διαγραφή λογαριασμού + development: Ανάπτυξη + edit_profile: Επεξεργασία προφίλ + export: Εξαγωγή δεδομένων + followers: Εγκεκριμένοι ακόλουθοι + import: Εισαγωγή + migrate: Μετακόμιση λογαριασμού + notifications: Ειδοποιήσεις + preferences: Προτιμήσεις + settings: Ρυθμίσεις + two_factor_authentication: Πιστοποίηση 2 παραγόντων (2FA) + your_apps: Οι εφαρμογές σου + 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}' + open_in_web: Δες στο διαδίκτυο + over_character_limit: υπέρβαση μέγιστου ορίου %{max} χαρακτήρων + pin_errors: + limit: Έχεις ήδη καρφιτσώσει το μέγιστο αριθμό επιτρεπτών τουτ + ownership: Δεν μπορείς να καρφιτσώσεις μη δικό σου τουτ + private: Τα μη δημόσια τουτ δεν καρφιτσώνονται + reblog: Οι προωθήσεις δεν καρφιτσώνονται + show_more: Περισσότερα + title: '%{name}: "%{quote}"' + visibilities: + private: Μόνο ακόλουθοι + private_long: Εμφάνιση μόνο σε ακόλουθους + public: Δημόσιο + public_long: Βλέπει οποιοσδήποτε + unlisted: Ακαταχώριστο + unlisted_long: Βλέπει οποιοσδήποτε, αλλά δεν καταχωρείται στις δημόσιες ροές + stream_entries: + click_to_show: Κλικ για εμφάνιση + pinned: Καρφιτσωμένο τουτ + reblogged: προωθημένο + sensitive_content: Ευαίσθητο περιεχόμενο terms: title: Όροι Χρήσης και Πολιτική Απορρήτου του κόμβου %{instance} + themes: + contrast: Υψηλή αντίθεση + default: Mastodon + mastodon-light: Mastodon (ανοιχτόχρωμο) + time: + formats: + default: "%b %d, %Y, %H:%M" + two_factor_authentication: + code_hint: Βάλε τον κωδικό που δημιούργησε η εφαρμογή πιστοποίησής σου για επιβεβαίωση + description_html: Αν ενεργοποιήσεις την πιστοποίηση 2 παραγόντων (2FA), για να συνδεθείς θα πρέπει να έχεις το τηλέφωνό σου, που θα σου δημιουργήσει κλειδιά εισόδου. + disable: Απενεργοποίησε + enable: Ενεργοποίησε + enabled: Η πιστοποίηση 2 παραγόντων (2FA) είναι ενεργοποιημένη + enabled_success: Η πιστοποίηση 2 παραγόντων (2FA) ενεργοποιήθηκε επιτυχώς + generate_recovery_codes: Δημιούργησε κωδικούς ανάκτησης + instructions_html: "Σάρωσε αυτόν τον κωδικό QR με την εφαρμογή Google Authenticator ή κάποια άλλη αντίστοιχη στο τηλέφωνό σου. Από εδώ και στο εξής, η εφαρμογή αυτή θα δημιουργεί κλειδιά που θα πρέπει να εισάγεις όταν συνδέεσαι." + lost_recovery_codes: Οι κωδικοί ανάκτησης σου επιτρέπουν να ανακτήσεις ξανά πρόσβαση στον λογαριασμό σου αν χάσεις το τηλέφωνό σου. Αν έχεις χάσει τους κωδικούς ανάκτησης, μπορείς να τους δημιουργήσεις ξανά εδώ. Οι παλιοί κωδικοί σου θα ακυρωθούν. + manual_instructions: 'Αν δεν μπορείς να σαρώσεις τον κωδικό QR και χρειάζεσαι να τον εισάγεις χειροκίνητα, ορίστε η μυστική φράση σε μορφή κειμένου:' + recovery_codes: Εφεδρικοί κωδικοί ανάκτησης + recovery_codes_regenerated: Οι εφεδρικοί κωδικοί ανάκτησης δημιουργήθηκαν επιτυχώς + recovery_instructions_html: Αν ποτέ δεν έχεις πρόσβαση στο κινητό σου, μπορείς να χρησιμοποιήσεις έναν από τους παρακάτω κωδικούς ανάκτησης για να αποκτήσεις πρόσβαση στο λογαριασμό σου. Διαφύλαξε τους κωδικούς ανάκτησης. Για παράδειγμα, μπορείς να τους εκτυπώσεις και να τους φυλάξεις μαζί με άλλα σημαντικά σου έγγραφα. + setup: Στήσιμο + wrong_code: Ο κωδικός που έβαλες ήταν άκυρος! Τα ρολόγια στον διακομιστή και τη συσκευή είναι σωστά; user_mailer: + backup_ready: + explanation: Ζήτησες ένα εφεδρικό αντίγραφο του λογαριασμού σου στο Mastodon. Είναι έτοιμο για κατέβασμα! + subject: Το εφεδρικό αντίγραφό σου είναι έτοιμο για κατέβασμα + title: Λήψη εφεδρικού αρχείου welcome: + edit_profile_action: Στήσιμο προφίλ + edit_profile_step: Μπορείς να προσαρμόσεις το προφίλ σου ανεβάζοντας μια εικόνα εμφάνισης & επικεφαλίδας, αλλάζοντας το εμφανιζόμενο όνομά σου και άλλα. Αν θες να ελέγχεις τους νέου σου ακόλουθους πριν αυτοί σε ακολουθήσουν, μπορείς να κλειδώσεις το λογαριασμό σου. + explanation: Μερικές συμβουλές για να ξεκινήσεις + final_action: Ξεκίνα τις δημοσιεύσεις final_step: 'Ξεκίνα τις δημοσιεύσεις! Ακόμα και χωρίς ακόλουθους τα δημόσια μηνύματά σου μπορεί να τα δουν άλλοι, για παράδειγμα στην τοπική ροή και στις ετικέτες. Ίσως να θέλεις να κάνεις μια εισαγωγή του εαυτού σου με την ετικέτα #introductions.' + full_handle: Το πλήρες όνομά σου full_handle_hint: Αυτό θα εδώ θα πεις στους φίλους σου για να σου μιλήσουν ή να σε ακολουθήσουν από άλλο κόμβο. + review_preferences_action: Αλλαγή προτιμήσεων + review_preferences_step: Σιγουρέψου πως έχεις ορίσει τις προτιμήσεις σου, όπως το ποια email θέλεις να λαμβάνεις, ή ποιο επίπεδο ιδιωτικότητας θέλεις να έχουν οι δημοσιεύσεις σου. Αν δεν σε πιάνει ναυτία, μπορείς να ενεργοποιήσεις την αυτόματη αναπαραγωγή των GIF. + subject: Καλώς ήρθες στο Mastodon + tip_bridge_html: Αν έχεις έρθει από το Twitter, μπορείς να βρεις τους φίλους και τις φίλες σου στο Mastodon χρησιμοποιώντας την βοηθητική εφαρμογή. Υπόψιν πως δουλεύει μόνο αν την έχουν χρησιμοποιήσει και εκείνοι! tip_federated_timeline: Η ομοσπονδιακή ροή είναι μια όψη πραγματικού χρόνου στο δίκτυο του Mastodon. Παρόλα αυτά, περιλαμβάνει μόνο όσους ακολουθούν οι γείτονές σου, άρα δεν είναι πλήρης. tip_following: Ακολουθείς το διαχειριστή του διακομιστή σου αυτόματα. Για να βρεις περισσότερους ενδιαφέροντες ανθρώπους, έλεγξε την τοπική και την ομοσπονδιακή ροή. tip_local_timeline: Η τοπική ροή είναι η όψη πραγματικού χρόνου των ανθρώπων στον κόμβο %{instance}. Αυτοί είναι οι άμεσοι γείτονές σου! + tip_mobile_webapp: Αν ο φυλλομετρητής (browser) στο κινητό σού σου επιτρέπει να προσθέσεις το Mastodon στην αρχική οθόνη της συσκευής, θα λαμβάνεις και ειδοποιήσεις μέσω push. Σε πολλά πράγματα λειτουργεί σαν κανονική εφαρμογή! + tips: Συμβουλές + title: Καλώς όρισες, %{name}! + users: + invalid_email: Η διεύθυνση email είναι άκυρη + invalid_otp_token: Άκυρος κωδικός πιστοποίησης 2 παραγόντων (2FA) + otp_lost_help_html: Αν χάσεις και τα δύο, μπορείς να επικοινωνήσεις με τον/την %{email} + seamless_external_login: Επειδή έχεις συνδεθεί μέσω τρίτης υπηρεσίας, οι ρυθμίσεις συνθηματικού και email δεν είναι διαθέσιμες. + signed_in_as: 'Έχεις συνδεθεί ως:' diff --git a/config/locales/eu.yml b/config/locales/eu.yml index dcfcd5b307..00341893dc 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -29,10 +29,10 @@ eu: learn_more: Ikasi gehiago other_instances: Instantzien zerrenda source_code: Iturburu kodea - status_count_after: mezu - status_count_before: Idatzi dituzte - user_count_after: erabiltzaile - user_count_before: Baditugu + status_count_after: mezu idatzi dituzte + status_count_before: Hauek + user_count_after: erabiltzaile daude + user_count_before: Hemen what_is_mastodon: Zer da Mastodon? accounts: follow: Jarraitu diff --git a/config/locales/fa.yml b/config/locales/fa.yml index ec36afad05..61e7509c5a 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -514,6 +514,7 @@ fa: '86400': ۱ روز expires_in_prompt: هیچ وقت generate: ساختن + invited_by: 'دعوت‌کنندهٔ شما:' max_uses: one: ۱ بار other: "%{count} بار" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index b3914ea2b1..07d900cfa6 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -55,7 +55,7 @@ fr: unfollow: Ne plus suivre admin: account_moderation_notes: - create: Créer une note + create: Laisser un commentaire created_msg: Note de modération créée avec succès ! delete: Supprimer destroyed_msg: Note de modération supprimée avec succès ! @@ -424,7 +424,7 @@ fr: following: 'Youpi ! Vous suivez  :' post_follow: close: Ou bien, vous pouvez fermer cette fenêtre. - return: Retour au profil de l’utilisateur⋅ice + return: Afficher le profil de l’utilisateur⋅ice web: Retour à l’interface web title: Suivre %{acct} datetime: diff --git a/config/locales/it.yml b/config/locales/it.yml index 5608c0574c..a4733024bf 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -374,7 +374,7 @@ it: following: 'Accettato! Ora stai seguendo:' post_follow: close: Oppure puoi chiudere questa finestra. - return: Torna al profilo dell'utente + return: Mostra il profilo dell'utente title: Segui %{acct} datetime: distance_in_words: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 759e1b5b5b..94a0c817cf 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -424,7 +424,7 @@ ja: following: '成功！ あなたは現在以下のアカウントをフォローしています:' post_follow: close: またはこのウィンドウを閉じます。 - return: ユーザーのプロフィールに戻る + return: ユーザーのプロフィールを見る web: Web を開く title: "%{acct} をフォロー" datetime: @@ -514,6 +514,7 @@ ja: '86400': 1 日 expires_in_prompt: 無期限 generate: 作成 + invited_by: '次の人に招待されました:' max_uses: one: '1' other: "%{count}" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 7cbcdd02fe..68a044eb5c 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -109,7 +109,7 @@ ko: not_subscribed: 구독하지 않음 order: alphabetic: 알파벳 순 - most_recent: 최근 활동 순 + most_recent: 최근 순 title: 순서 outbox_url: 발신함 URL perform_full_suspension: 완전히 정지시키기 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index b723bcfc24..df655c5463 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -514,6 +514,7 @@ nl: '86400': 1 dag expires_in_prompt: Nooit generate: Genereren + invited_by: 'Jij bent uitgenodigd door:' max_uses: one: 1 keer other: "%{count} keer" diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 451caa4f28..af0b5c8a5d 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -483,38 +483,18 @@ oc: - :year datetime: distance_in_words: - about_x_hours: - one: Fa una ora - other: Fa %{count} oras - about_x_months: - one: Fa un mes - other: Fa %{count} meses - about_x_years: - one: Fa un an - other: Fa %{count} ans - almost_x_years: - one: Fa quasi un an - other: Fa quasi %{count} ans + about_x_hours: "%{count} h" + about_x_months: "%{count} meses" + about_x_years: "%{count} ans" + almost_x_years: "%{count}ans" half_a_minute: Ara - less_than_x_minutes: - one: Fa mens d’una minuta - other: Fa mens de %{count} minutas + less_than_x_minutes: "%{count} min" less_than_x_seconds: Ara meteis - over_x_years: - one: Fa mai d’un an - other: Fa mai de %{count} ans - x_days: - one: Fa un jorn - other: Fa %{count} jorns - x_minutes: - one: Fa una minuta - other: Fa %{count} minutas - x_months: - one: Fa un mes - other: Fa %{count} meses - x_seconds: - one: Fa una segonda - other: Fa %{count} segondas + over_x_years: "%{count} ans" + 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 @@ -591,6 +571,7 @@ oc: '86400': 1 jorn expires_in_prompt: Jamai generate: Generar + invited_by: 'Vos a convidat :' max_uses: one: 1 persona other: "%{count} personas" diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index 3d555718c1..e028781fc5 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -3,12 +3,19 @@ ar: simple_form: hints: defaults: + autofollow: سوف يتابعك تلقائيًا الأشخاص الذين يقومون بالتسجيل من خلال الدعوة avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 400x400px bot: يُعلِم أنّ هذا الحساب لا يمثل شخصًا digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة + display_name: + one: 1 حرف باق + other: %{count} حرف باق fields: يُمكنك عرض 4 عناصر على شكل جدول في ملفك الشخصي header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 700x335px locked: يتطلب منك الموافقة يدويا على طلبات المتابعة + note: + one: 1 حرف باق + other: %{count} حرف باق setting_hide_network: الحسابات التي تُتابعها و التي تُتابِعك على حد سواء لن تُعرَض على صفحتك الشخصية setting_noindex: ذلك يؤثر على حالة ملفك الشخصي و صفحاتك setting_theme: ذلك يؤثر على الشكل الذي سيبدو عليه ماستدون عندما تقوم بالدخول مِن أي جهاز. @@ -24,6 +31,7 @@ ar: name: التسمية value: المحتوى defaults: + autofollow: إرسال دعوة لمتابعة حسابك avatar: الصورة الرمزية bot: إنّ هذا الحساب روبوت آلي confirm_new_password: تأكيد كلمة السر الجديدة diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index 5df7bf77b2..088a6f067a 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -3,6 +3,7 @@ ca: simple_form: hints: defaults: + autofollow: Les persones que es registrin a través de la invitació et seguiran automàticament avatar: PNG, GIF o JPG. Màxim 2MB. S'escalarà a 400x400px bot: Aquest compte realitza principalment accions automatitzades i pot no estar controlat per cap persona digest: Només s'envia després d'un llarg període d'inactivitat amb un resum de les mencions que has rebut en la teva absència @@ -30,6 +31,7 @@ ca: name: Etiqueta value: Contingut defaults: + autofollow: Convida a seguir el teu compte avatar: Avatar bot: Aquest compte és un bot confirm_new_password: Confirma la contrasenya nova diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml index 13ff7801eb..6c72fa7b05 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -3,6 +3,7 @@ fa: simple_form: hints: defaults: + autofollow: کسانی که از راه دعوت‌نامه عضو می‌شوند به طور خودکار پیگیر شما خواهند شد avatar: یکی از قالب‌های PNG یا GIF یا JPG. بیشترین اندازه ۲ مگابایت. تصویر به اندازهٔ ۴۰۰×۴۰۰ پیکسل تبدیل خواهد شد bot: این حساب بیشتر به طور خودکار فعالیت می‌کند و نظارت پیوسته‌ای روی آن وجود ندارد digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد @@ -30,6 +31,7 @@ fa: name: برچسب value: محتوا defaults: + autofollow: دعوت از دیگران برای عضو شدن و پیگیری حساب شما avatar: تصویر نمایه bot: این حساب یک ربات است confirm_new_password: تأیید رمز تازه diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index d30afb4aba..5fa53aaee5 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -3,6 +3,7 @@ ja: simple_form: hints: defaults: + autofollow: 招待から登録した人が自動的にあなたをフォローするようになります avatar: 2MBまでのPNG、GIF、JPGが利用可能です。400x400pxまで縮小されます bot: このアカウントは主に自動で動作し、人が見ていない可能性があります digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます @@ -26,6 +27,7 @@ ja: name: ラベル value: 内容 defaults: + autofollow: あなたのアカウントに招待する avatar: アイコン bot: これは BOT アカウントです confirm_new_password: 新しいパスワード（確認用） diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 448e5d4874..f198009469 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -3,7 +3,7 @@ ko: simple_form: hints: defaults: - autofollow: 이 초대를 통해 가입하는 사람이 나를 자동으로 팔로우 합니다 + autofollow: 이 초대를 통해 가입하는 사람은 당신을 자동으로 팔로우 하게 됩니다 avatar: PNG, GIF 혹은 JPG. 최대 2MB. 400x400px로 다운스케일 될 것임 bot: 사람들에게 계정이 사람이 아님을 알립니다 digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기 @@ -31,7 +31,7 @@ ko: name: 라벨 value: 내용 defaults: - autofollow: 초대를 통해 내 계정 팔로우 + autofollow: 초대를 통한 팔로우 avatar: 아바타 bot: 이것은 봇 계정입니다 confirm_new_password: 새로운 비밀번호 다시 입력 diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 68aa0635d4..6c7ff4464e 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -3,6 +3,7 @@ nl: simple_form: hints: defaults: + autofollow: Mensen die zich via de uitnodiging hebben geregistreerd, volgen jou automatisch avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 400x400px bot: Dit is een geautomatiseerd account en wordt mogelijk niet gemonitord digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen @@ -30,6 +31,7 @@ nl: name: Label value: Inhoud defaults: + autofollow: Uitnodigen om jouw account te volgen avatar: Avatar bot: Dit is een bot-account confirm_new_password: Nieuw wachtwoord bevestigen diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 65b27e7166..f21852fbb1 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -3,6 +3,7 @@ oc: simple_form: hints: defaults: + autofollow: Lo monde que se marcan gràcia a l’invitacion vos segràn automaticament avatar: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en 400x400px bot: Avisar lo monde qu’aqueste compte es pas d’una persona digest: Solament enviat aprèp un long moment d’inactivitat e solament s’avètz recebut de messatges personals pendent vòstra abséncia @@ -30,6 +31,7 @@ oc: name: Nom value: Contengut defaults: + autofollow: Convidar a sègre vòstre compte avatar: Avatar bot: Aquò es lo compte a un robòt confirm_new_password: Confirmacion del nòu senhal diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index ae0dc6af56..74cb3ac568 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -3,6 +3,7 @@ sk: simple_form: hints: defaults: + autofollow: Ľudia ktorí sa zaregistrujú prostredníctvom pozvánky, ťa budú inheď následovať avatar: PNG, GIF alebo JPG. Maximálne 2MB. Bude zmenšený na 400x400px bot: Tento účet vykonáva hlavne automatizované akcie, a je pravdepodobne nespravovaný digest: Odoslané iba v prípade dlhodobej neprítomnosti, a len ak si obdŕžal/a nejaké osobné správy kým si bol/a preč @@ -32,6 +33,7 @@ sk: name: Označenie value: Obsah defaults: + autofollow: Pozvi k následovaniu tvojho profilu avatar: Avatar bot: Toto je automatizovaný bot účet confirm_new_password: Znovu tvoje nové heslo, pre potvrdenie @@ -69,7 +71,7 @@ sk: username_or_email: Prezívka, alebo email interactions: must_be_follower: Blokovať oznámenia od užívateľov, ktorí ťa nesledujú - must_be_following: Blokovať oznámenia od ľudí ktorých nesleduješ + must_be_following: Blokovať oboznámenia ohľadom ľudí ktorých nesleduješ must_be_following_dm: Blokovať súkromné správy od ľudí ktorých nesleduješ notification_emails: digest: Posielať súhrnné emaily diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 6dd8ece091..ad5080e6b1 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -26,7 +26,7 @@ sk: within_reach_title: Stále v dosahu generic_description: "%{domain} je jeden server v sieti" hosted_on: Mastodon hostovaný na %{domain} - learn_more: Dozvedieť sa viac + learn_more: Zisti viac other_instances: Zoznam ďalších inštancií source_code: Zdrojový kód status_count_after: príspevkov @@ -435,10 +435,11 @@ sk: about_x_years: "%{count}rok" almost_x_years: "%{count}rok" half_a_minute: Práve teraz + less_than_x_minutes: "%{count}min" less_than_x_seconds: Práve teraz over_x_years: "%{count}rok" x_days: "%{count}dni" - x_minutes: '' + x_minutes: "%{count}min" x_months: "%{count}mesiace" x_seconds: "%{count}sek" deletes: @@ -516,6 +517,7 @@ sk: '86400': 1 deň expires_in_prompt: Nikdy generate: Vygeneruj + invited_by: 'Bol/a si pozvan/á užívateľom:' max_uses: few: "%{count} použitia" one: jedno použitie diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 43c31b3b74..6f581f838f 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -103,3 +103,4 @@ sl: alphabetic: Po abecedi most_recent: Najnovejše title: Red + promote: Spodbujanje diff --git a/config/locales/sr.yml b/config/locales/sr.yml index d34a2ecbf2..040090932b 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -4,6 +4,7 @@ sr: about_hashtag_html: Ово су јавни статуси таговани са #%{hashtag}. Можете одговарати на њих ако имате налог било где у федиверсу. about_mastodon_html: Мастодонт је друштвена мрежа базирана на отвореним протоколима и слободном софтверу отвореног кода. Децентрализована је као што је децентрализована е-пошта. about_this: О инстанци + administered_by: 'Администрирано од стране:' closed_registrations: Регистрације су тренутно затворене на овој инстанци. Ипак! Можете наћи другу инстанцу на којој ћете направити налог и одатле добити приступ истој овој мрежи. contact: Контакт contact_missing: Није постављено From a9ef82febb929be1e6ccd650cbad5d9850448fc4 Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Sat, 16 Jun 2018 19:56:45 +0900 Subject: [PATCH 06/32] Fix autosuggest-textarea backgrounds and some minor adjustments (#7817) --- .../styles/mastodon-light/diff.scss | 100 +++++++++++------- 1 file changed, 59 insertions(+), 41 deletions(-) diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index fad7feb984..84ccd326ec 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -25,33 +25,51 @@ background: $ui-base-color url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto; } -.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button { - color: lighten($white, 7%); +// Change the colors used in compose-form +.compose-form { + .compose-form__modifiers { + .compose-form__upload__actions .icon-button { + color: lighten($white, 7%); - &:active, - &:focus, - &:hover { - color: $white; + &:active, + &:focus, + &:hover { + color: $white; + } + } + + .compose-form__upload-description input { + color: lighten($white, 7%); + + &::placeholder { + color: lighten($white, 7%); + } + } } -} -.compose-form .compose-form__modifiers .compose-form__upload-description input { - color: lighten($white, 7%); - - &::placeholder { - color: lighten($white, 7%); + .compose-form__buttons-wrapper { + background: darken($ui-base-color, 6%); } -} -.compose-form .compose-form__buttons-wrapper { - background: darken($ui-base-color, 6%); + .autosuggest-textarea__suggestions { + background: darken($ui-base-color, 6%); + } + + .autosuggest-textarea__suggestions__item { + &:hover, + &:focus, + &:active, + &.selected { + background: lighten($ui-base-color, 4%); + } + } } .emoji-mart-bar { - border-color: lighten($ui-base-color, 8%); + border-color: lighten($ui-base-color, 4%); &:first-child { - background: $ui-base-color; + background: darken($ui-base-color, 6%); } } @@ -60,6 +78,7 @@ border-color: $ui-base-color; } +// Change the background colors of statuses .focusable:focus { background: $ui-base-color; } @@ -77,7 +96,7 @@ background: darken($ui-base-color, 6%); } -// Change the background color of status__content__spoiler-link +// 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; @@ -87,8 +106,7 @@ } } -// Change the background colors of media and video spoiler - +// Change the background colors of media and video spoilers .media-spoiler, .video-player__spoiler { background: $ui-base-color; @@ -101,30 +119,30 @@ // Change the colors used in the dropdown menu .dropdown-menu { background: $ui-base-color; -} -.dropdown-menu__arrow { - &.left { - border-left-color: $ui-base-color; + &__arrow { + &.left { + border-left-color: $ui-base-color; + } + + &.top { + border-top-color: $ui-base-color; + } + + &.bottom { + border-bottom-color: $ui-base-color; + } + + &.right { + border-right-color: $ui-base-color; + } } - &.top { - border-top-color: $ui-base-color; - } - - &.bottom { - border-bottom-color: $ui-base-color; - } - - &.right { - border-right-color: $ui-base-color; - } -} - -.dropdown-menu__item { - a { - background: $ui-base-color; - color: $darker-text-color; + &__item { + a { + background: $ui-base-color; + color: $darker-text-color; + } } } From 9c08a368e7dbbe621690acc642e5300476b7a89f Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Sat, 16 Jun 2018 19:57:25 +0900 Subject: [PATCH 07/32] Adjust account__action-bar contents (#7818) --- .../mastodon/features/account/components/action_bar.js | 8 ++++---- app/javascript/styles/mastodon/components.scss | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js index 2d0f72be24..69726a4167 100644 --- a/app/javascript/mastodon/features/account/components/action_bar.js +++ b/app/javascript/mastodon/features/account/components/action_bar.js @@ -140,10 +140,6 @@ export default class ActionBar extends React.PureComponent { {extraInfo}
-
- -
-
@@ -160,6 +156,10 @@ export default class ActionBar extends React.PureComponent { {shortNumberFormat(account.get('followers_count'))}
+ +
+ +
); diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 9ec25c5723..4bcd1dec7b 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1211,6 +1211,10 @@ a .account__avatar { flex: 0 1 calc(50% - 140px); padding: 10px; + .icon-button { + vertical-align: middle; + } + .dropdown--active { .dropdown__content.dropdown__right { left: 6px; @@ -1230,13 +1234,14 @@ a .account__avatar { display: flex; flex: 1 1 auto; line-height: 18px; + text-align: center; } .account__action-bar__tab { text-decoration: none; overflow: hidden; flex: 0 1 80px; - border-left: 1px solid lighten($ui-base-color, 8%); + border-right: 1px solid lighten($ui-base-color, 8%); padding: 10px 5px; & > span { From 5e9d51c24b176bfb38a9fc6a4e7212f43503693f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 16 Jun 2018 18:47:19 +0200 Subject: [PATCH 08/32] Do not pre-emojify note HTML in accounts REST API (#7821) Fix #7820 --- app/serializers/rest/account_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 6adcd70390..3a724aa7c2 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -25,7 +25,7 @@ class REST::AccountSerializer < ActiveModel::Serializer end def note - Formatter.instance.simplified_format(object, custom_emojify: true) + Formatter.instance.simplified_format(object) end def url From 31e5d7efd700547d27d0393264859fa02932a8dd Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Sun, 17 Jun 2018 20:47:56 +0900 Subject: [PATCH 09/32] Fix the action with X button on compose form (#7826) --- app/javascript/styles/mastodon/components.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 4bcd1dec7b..28daac6a38 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4941,8 +4941,8 @@ noscript { .navigation-bar { & > a:first-child { - will-change: margin-top, margin-left, width; - transition: margin-top $duration $delay, margin-left $duration ($duration + $delay); + will-change: margin-top, margin-left, margin-right, width; + transition: margin-top $duration $delay, margin-left $duration ($duration + $delay), margin-right $duration ($duration + $delay); } & > .navigation-bar__profile-edit { @@ -4975,8 +4975,7 @@ noscript { padding-bottom: 0; & > a:first-child { - margin-top: -50px; - margin-left: -40px; + margin: -100px 10px 0 -50px; } .navigation-bar__profile { @@ -4985,7 +4984,7 @@ noscript { .navigation-bar__profile-edit { position: absolute; - margin-top: -50px; + margin-top: -60px; } .navigation-bar__actions { @@ -4993,6 +4992,7 @@ noscript { pointer-events: auto; opacity: 1; transform: scale(1.0, 1.0) translate(0, 0); + bottom: 5px; } .compose__action-bar .icon-button { From 7eec279c7fb0350974fea4456c5c3bab7b457376 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 17 Jun 2018 13:54:02 +0200 Subject: [PATCH 10/32] Change language opt-out to language opt-in (#7823) * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations --- .../settings/preferences_controller.rb | 2 +- app/models/account.rb | 2 +- app/models/status.rb | 6 +++--- app/models/user.rb | 5 ++++- app/views/settings/preferences/show.html.haml | 2 +- config/locales/simple_form.ar.yml | 3 --- config/locales/simple_form.ca.yml | 3 --- config/locales/simple_form.co.yml | 3 --- config/locales/simple_form.de.yml | 3 --- config/locales/simple_form.en.yml | 6 +++--- config/locales/simple_form.eo.yml | 3 --- config/locales/simple_form.es.yml | 3 --- config/locales/simple_form.eu.yml | 3 --- config/locales/simple_form.fa.yml | 3 --- config/locales/simple_form.fi.yml | 3 --- config/locales/simple_form.fr.yml | 3 --- config/locales/simple_form.gl.yml | 3 --- config/locales/simple_form.he.yml | 3 --- config/locales/simple_form.hu.yml | 3 --- config/locales/simple_form.it.yml | 3 --- config/locales/simple_form.ja.yml | 3 --- config/locales/simple_form.ko.yml | 3 --- config/locales/simple_form.nl.yml | 3 --- config/locales/simple_form.no.yml | 3 --- config/locales/simple_form.oc.yml | 3 --- config/locales/simple_form.pl.yml | 3 --- config/locales/simple_form.pt-BR.yml | 3 --- config/locales/simple_form.pt.yml | 3 --- config/locales/simple_form.ru.yml | 3 --- config/locales/simple_form.sk.yml | 3 --- config/locales/simple_form.sr-Latn.yml | 3 --- config/locales/simple_form.sr.yml | 3 --- config/locales/simple_form.sv.yml | 3 --- config/locales/simple_form.zh-CN.yml | 3 --- config/locales/simple_form.zh-HK.yml | 3 --- config/locales/simple_form.zh-TW.yml | 3 --- ...180616192031_add_chosen_languages_to_users.rb | 5 +++++ db/schema.rb | 3 ++- .../settings/preferences_controller_spec.rb | 4 ++-- spec/models/status_spec.rb | 16 ++++++++-------- spec/models/user_spec.rb | 4 ++-- 41 files changed, 32 insertions(+), 113 deletions(-) create mode 100644 db/migrate/20180616192031_add_chosen_languages_to_users.rb diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 57793d7761..851e62d1b7 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -27,7 +27,7 @@ class Settings::PreferencesController < ApplicationController def user_params params.require(:user).permit( :locale, - filtered_languages: [] + chosen_languages: [] ) end diff --git a/app/models/account.rb b/app/models/account.rb index 72e850aa75..c3eea79cc7 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -141,7 +141,7 @@ class Account < ApplicationRecord prefix: true, allow_nil: true - delegate :filtered_languages, to: :user, prefix: false, allow_nil: true + delegate :chosen_languages, to: :user, prefix: false, allow_nil: true def local? domain.nil? diff --git a/app/models/status.rb b/app/models/status.rb index 7fa0690832..e7dd0df29e 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -190,8 +190,8 @@ class Status < ApplicationRecord before_validation :set_local class << self - def not_in_filtered_languages(account) - where(language: nil).or where.not(language: account.filtered_languages) + def in_chosen_languages(account) + where(language: nil).or where(language: account.chosen_languages) end def as_home_timeline(account) @@ -333,7 +333,7 @@ class Status < ApplicationRecord def filter_timeline_for_account(query, account, local_only) query = query.not_excluded_by_account(account) query = query.not_domain_blocked_by_account(account) unless local_only - query = query.not_in_filtered_languages(account) if account.filtered_languages.present? + query = query.in_chosen_languages(account) if account.chosen_languages.present? query.merge(account_silencing_filter(account)) end diff --git a/app/models/user.rb b/app/models/user.rb index 0becfa7e96..c95960dc6d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -35,6 +35,7 @@ # moderator :boolean default(FALSE), not null # invite_id :bigint(8) # remember_token :string +# chosen_languages :string is an Array # class User < ApplicationRecord @@ -317,7 +318,9 @@ class User < ApplicationRecord private def sanitize_languages - filtered_languages.reject!(&:blank?) + return if chosen_languages.nil? + chosen_languages.reject!(&:blank?) + self.chosen_languages = nil if chosen_languages.empty? end def prepare_new_user! diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index d2e8663731..6ec03ab4bd 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -12,7 +12,7 @@ .fields-group = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale - = f.input :filtered_languages, collection: filterable_languages, 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' + = 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' %h4= t 'preferences.publishing' diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index e028781fc5..06f9613412 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -23,8 +23,6 @@ ar: data: ملف CSV تم تصديره مِن مثيل خادوم ماستدون آخر sessions: otp: 'قم بإدخال رمز المصادقة بخطوتين الذي قام بتوليده تطبيق جهازك أو إستخدم أحد رموز النفاذ الإحتياطية :' - user: - filtered_languages: سوف يتم تصفية و إخفاء اللغات المختارة من خيوطك العمومية labels: account: fields: @@ -42,7 +40,6 @@ ar: email: عنوان البريد الإلكتروني expires_in: تنتهي مدة صلاحيته بعد fields: واصفات بيانات الملف الشخصي - filtered_languages: اللغات التي تم تصفيتها header: الرأسية locale: اللغة locked: تجميد الحساب diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index 088a6f067a..43230e5cf7 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -23,8 +23,6 @@ ca: data: Fitxer CSV exportat des de una altra instància de Mastodon sessions: otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:' - user: - filtered_languages: Les llengües seleccionades s'eliminaran de les línies de temps públiques labels: account: fields: @@ -42,7 +40,6 @@ ca: email: Adreça de correu electrònic expires_in: Expira després fields: Metadades del perfil - filtered_languages: Llengües filtrades header: Capçalera locale: Llengua locked: Fes aquest compte privat diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml index 25d4a05fb5..ac8b89a7bb 100644 --- a/config/locales/simple_form.co.yml +++ b/config/locales/simple_form.co.yml @@ -22,8 +22,6 @@ co: data: Un fugliale CSV da un’altr’istanza di Mastodon sessions: otp: 'Entrate u codice d’identificazione à dui fattori nant’à u vostru telefuninu, o unu di i vostri codici di ricuperazione:' - user: - filtered_languages: Ùn viderete micca e lingue selezziunate nant’à e linee pubbliche labels: account: fields: @@ -40,7 +38,6 @@ co: email: Indirizzu e-mail expires_in: Spira dopu à fields: Metadata di u prufile - filtered_languages: Lingue filtrate header: Ritrattu di cuprendula locale: Lingua locked: Privatizà u contu diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index c0a4510000..f09f717f0a 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -22,8 +22,6 @@ de: data: CSV-Datei, die aus einer anderen Mastodon-Instanz exportiert wurde sessions: otp: 'Gib den Zwei-Faktor-Authentisierungscode von deinem Telefon ein oder benutze einen deiner Wiederherstellungscodes:' - user: - filtered_languages: Ausgewählte Sprachen werden aus deinen öffentlichen Zeitleisten gefiltert labels: account: fields: @@ -40,7 +38,6 @@ de: email: E-Mail-Adresse expires_in: Gültig bis fields: Profil-Metadaten - filtered_languages: Gefilterte Sprachen header: Kopfbild locale: Sprache locked: Gesperrtes Profil diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 247a792187..a75a0f567f 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -24,7 +24,7 @@ en: sessions: otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' user: - filtered_languages: Checked languages will be filtered from public timelines for you + chosen_languages: Only toots in selected languages will be displayed in public timelines. Select nothing to see toots in all languages labels: account: fields: @@ -34,6 +34,7 @@ en: autofollow: Invite to follow your account avatar: Avatar bot: This is a bot account + chosen_languages: Filter languages confirm_new_password: Confirm new password confirm_password: Confirm password current_password: Current password @@ -42,9 +43,8 @@ en: email: E-mail address expires_in: Expire after fields: Profile metadata - filtered_languages: Filtered languages header: Header - locale: Language + locale: Interface language locked: Lock account max_uses: Max number of uses new_password: New password diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml index 4027c1b603..c235929ad0 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -22,8 +22,6 @@ eo: data: CSV-dosiero el alia nodo de Mastodon sessions: otp: 'Enmetu la kodon de dufaktora aŭtentigo el via telefono aŭ uzu unu el viaj realiraj kodoj:' - user: - filtered_languages: Markitaj lingvoj estos elfiltritaj de publikaj tempolinioj por vi labels: account: fields: @@ -40,7 +38,6 @@ eo: email: Retadreso expires_in: Eksvalidiĝas post fields: Profilaj metadatumoj - filtered_languages: Filtritaj lingvoj header: Fonbildo locale: Lingvo locked: Ŝlosi konton diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 38661b00ff..000a33edc6 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -19,8 +19,6 @@ es: data: Archivo CSV exportado desde otra instancia de Mastodon sessions: otp: Introduce el código de autenticación de dos factores de tu teléfono o usa uno de tus códigos de recuperación. - user: - filtered_languages: Los idiomas seleccionados dejarán de mostrarse para ti en las líneas de tiempo públicas labels: defaults: avatar: Avatar @@ -31,7 +29,6 @@ es: display_name: Nombre para mostrar email: Dirección de correo electrónico expires_in: Expirar tras - filtered_languages: Idiomas filtrados header: Img. cabecera locale: Idioma locked: Hacer privada esta cuenta diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index 364a2e1182..f89786dc9e 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -22,8 +22,6 @@ eu: data: Beste Mastodon instantzia batetik esportatutako CSV fitxategia sessions: otp: 'Sartu zure telefonoko aplikazioak sortutako bi faktoreetako kodea, edo erabili zure berreskuratze kodeetako bat:' - user: - filtered_languages: Ez dira aukeratutako hizkuntzak erakutsiko zure denbora-lerro publikoetan labels: account: fields: @@ -40,7 +38,6 @@ eu: email: E-mail helbidea expires_in: Iraungitzea fields: Profilaren metadatuak - filtered_languages: Iragazitako hizkuntzak header: Goiburua locale: Hizkuntza locked: Giltzapetu kontua diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml index 6c72fa7b05..e8a2c38aaf 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -23,8 +23,6 @@ fa: data: پروندهٔ CSV که از سرور ماستدون دیگری برون‌سپاری شده sessions: otp: 'کد تأیید دومرحله‌ای که اپ روی تلفن شما ساخته را وارد کنید یا یکی از کدهای بازیابی را به کار ببرید:' - user: - filtered_languages: زبان‌های انتخاب‌شده از فهرست عمومی نوشته‌هایی که می‌بینید حذف می‌شوند labels: account: fields: @@ -42,7 +40,6 @@ fa: email: نشانی ایمیل expires_in: تاریخ انقضا fields: اطلاعات تکمیلی نمایه - filtered_languages: زبان‌های فیلترشده header: تصویر زمینه locale: زبان locked: خصوصی‌کردن حساب diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index b7b97395a3..190790ca55 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -20,8 +20,6 @@ fi: data: Toisesta Mastodon-instanssista tuotu CSV-tiedosto sessions: otp: Syötä puhelimeen saamasi kaksivaiheisen tunnistautumisen koodi tai käytä palautuskoodia. - user: - filtered_languages: Valitut kielet suodatetaan pois julkisilta aikajanoilta labels: account: fields: @@ -36,7 +34,6 @@ fi: email: Sähköpostiosoite expires_in: Vanhenee fields: Profiilin metadata - filtered_languages: Suodatetut kielet header: Otsakekuva locale: Kieli locked: Lukitse tili diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 4e535cdf46..8af0201e6a 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -22,8 +22,6 @@ fr: data: Un fichier CSV généré par une autre instance de Mastodon sessions: otp: 'Entrez le code d’authentification à deux facteurs généré par votre téléphone ou utilisez un de vos codes de récupération :' - user: - filtered_languages: Les langues sélectionnées seront filtrées hors de vos fils publics pour vous labels: account: fields: @@ -40,7 +38,6 @@ fr: email: Adresse courriel expires_in: Expire après fields: Métadonnées du profil - filtered_languages: Langues filtrées header: Image d’en-tête locale: Langue locked: Verrouiller le compte diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index bae49a65dc..f621d35878 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -22,8 +22,6 @@ gl: data: Ficheiro CSV exportado desde outra instancia Mastodon 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: - filtered_languages: Os idiomas marcados filtraranse das liñas temporais públicas para vostede labels: account: fields: @@ -40,7 +38,6 @@ gl: email: enderezo correo electrónico expires_in: Caducidade despois de fields: Metadatos do perfil - filtered_languages: Idiomas filtrados header: Cabeceira locale: Idioma locked: Protexer conta diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml index 20cf1029ee..96cdccd2b4 100644 --- a/config/locales/simple_form.he.yml +++ b/config/locales/simple_form.he.yml @@ -19,8 +19,6 @@ he: data: קובץ CSV שיוצא משרת מסטודון אחר sessions: otp: נא להקליד קוד אימות דו-שלבי ממכשירך או קוד אחזור גישה. - user: - filtered_languages: שפות שנבחרו יוסתרו מציר הזמן הציבורי בשבילך labels: defaults: avatar: תמונת פרופיל @@ -31,7 +29,6 @@ he: display_name: שם להצגה email: כתובת דוא"ל expires_in: תפוגה לאחר - filtered_languages: שפות מסוננות header: ראשה locale: שפה locked: הפוך חשבון לפרטי diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index 6ec39aa79b..2b36dc85b2 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -19,8 +19,6 @@ hu: data: Egy másik Mastodon szerverről exportált CSV fájl sessions: otp: Add meg a Második-faktor kódodat a telefonodról vagy használd az egyik tartalék bejelentkező kódodat. - user: - filtered_languages: A kiválasztott nyelvek nem jelennek majd meg a nyilvános idővonaladon labels: defaults: avatar: Profilkép @@ -31,7 +29,6 @@ hu: display_name: Megjelenített név email: E-mail cím expires_in: Elévül - filtered_languages: Szűrt nyelvek header: Fejléc locale: Nyelv locked: Zárt felhasználói fiók diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index cd77bffe3f..6a0658395e 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -22,8 +22,6 @@ it: data: File CSV esportato da un'altra istanza di Mastodon sessions: otp: 'Inserisci il codice a due fattori generato dall''app del tuo telefono o usa uno dei codici di recupero:' - user: - filtered_languages: Le lingue selezionate verranno filtrate dalla tua timeline pubblica labels: account: fields: @@ -40,7 +38,6 @@ it: email: Indirizzo email expires_in: Scade dopo fields: Metadati del profilo - filtered_languages: Lingue filtrate header: Header locale: Lingua locked: Blocca account diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 5fa53aaee5..dd5caa0ba8 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -19,8 +19,6 @@ ja: data: 他の Mastodon インスタンスからエクスポートしたCSVファイルを選択して下さい sessions: otp: '携帯電話のアプリで生成された二段階認証コードを入力するか、リカバリーコードを使用してください:' - user: - filtered_languages: 選択した言語があなたの公開タイムラインから取り除かれます labels: account: fields: @@ -38,7 +36,6 @@ ja: email: メールアドレス expires_in: 有効期限 fields: プロフィール補足情報 - filtered_languages: 除外する言語 header: ヘッダー locale: 言語 locked: 承認制アカウントにする diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index f198009469..421357b492 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -23,8 +23,6 @@ ko: data: 다른 마스토돈 인스턴스에서 추출된 CSV 파일 sessions: otp: '휴대전화에서 생성 된 2단계 인증 코드를 입력하거나, 복구 코드 중 하나를 사용하세요:' - user: - filtered_languages: 선택된 언어가 공개 타임라인에서 제외 될 것입니다 labels: account: fields: @@ -42,7 +40,6 @@ ko: email: 이메일 주소 expires_in: 만료시각 fields: 프로필 메타데이터 - filtered_languages: 숨긴 언어들 header: 헤더 locale: 언어 locked: 계정 잠금 diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 6c7ff4464e..f3320f46bc 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -23,8 +23,6 @@ nl: data: CSV-bestand dat op een andere Mastodonserver werd geëxporteerd sessions: otp: Voer de tweestaps-aanmeldcode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes. - user: - filtered_languages: Geselecteerde talen worden uit de lokale en globale tijdlijn verwijderd labels: account: fields: @@ -42,7 +40,6 @@ nl: email: E-mailadres expires_in: Vervalt na fields: Metadata profiel - filtered_languages: Gefilterde talen header: Omslagfoto locale: Taal locked: Maak account besloten diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index 48710cabda..aba8feeb61 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -19,8 +19,6 @@ data: CSV-fil eksportert fra en annen Mastodon-instans sessions: otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder. - user: - filtered_languages: Språk som er avhuket vil ikke vises på offentlige tidslinjer fra deg labels: defaults: avatar: Avatar @@ -31,7 +29,6 @@ display_name: Visningsnavn email: E-postadresse expires_in: Utløper etter - filtered_languages: Filtrerte språk header: Overskrift locale: Språk locked: Lås konto diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index f21852fbb1..510e76e383 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -23,8 +23,6 @@ oc: data: Fichièr CSV exportat d’una autra instància Mastodon sessions: otp: 'Picatz lo còdi d’autentificacion en dos temps (Two factor code) de vòstra aplicacion mobil o utilizatz un de vòstres còdis de recuperacion :' - user: - filtered_languages: Las lengas seleccionadas seràn levadas de vòstre flux d’actualitat labels: account: fields: @@ -42,7 +40,6 @@ oc: email: Corrièl expires_in: Expira aprèp fields: Metadonada del perfil - filtered_languages: Lengas filtradas header: Bandièra locale: Lenga locked: Far venir lo compte privat diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 66f2a0f0b7..274af2b73b 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -26,8 +26,6 @@ pl: data: Plik CSV wyeksportowany z innej instancji Mastodona sessions: otp: 'Wprowadź kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodów zapasowych:' - user: - filtered_languages: Wpisy w wybranych językach nie będą wyświetlać się na publicznych osiach czasu labels: account: fields: @@ -44,7 +42,6 @@ pl: email: Adres e-mail expires_in: Wygaśnie po fields: Metadane profilu - filtered_languages: Filtrowane języki header: Nagłówek locale: Język locked: Ustaw konto jako prywatne diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml index 50ed5eb1a8..cec96739f9 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -22,8 +22,6 @@ pt-BR: data: Arquivo CSV exportado de outra instância do Mastodon sessions: otp: 'Insira o código de autenticação gerado pelo app no seu celular ou use um dos códigos de recuperação:' - user: - filtered_languages: Selecione os idiomas que devem ser removidos de suas timelines públicas labels: account: fields: @@ -40,7 +38,6 @@ pt-BR: email: Endereço de e-mail expires_in: Expira em fields: Metadados do perfil - filtered_languages: Idiomas filtrados header: Cabeçalho locale: Idioma locked: Trancar conta diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml index 67fed495cc..5b79bd29f7 100644 --- a/config/locales/simple_form.pt.yml +++ b/config/locales/simple_form.pt.yml @@ -19,8 +19,6 @@ pt: data: Arquivo CSV exportado de outra instância do Mastodon sessions: otp: Inserir o código de autenticação de dois factores do teu telemóvel ou usa um dos códigos de recuperação. - user: - filtered_languages: Seleciona os idiomas que devem ser removidos das tuas timelines públicas labels: defaults: avatar: Imagem de Perfil @@ -31,7 +29,6 @@ pt: display_name: Nome Público email: Endereço de e-mail expires_in: Expira em - filtered_languages: Idiomas filtrados header: Cabeçalho locale: Idioma locked: Trancar conta diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index a6b50b9d2e..6bb95b13fa 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -26,8 +26,6 @@ ru: data: Файл CSV, экспортированный с другого узла Mastodon sessions: otp: 'Введите код двухфакторной аутентификации, сгенерированный в мобильном приложении, или используйте один из Ваших кодов восстановления:' - user: - filtered_languages: Выбранные языки будут убраны из Ваших публичных лет. labels: account: fields: @@ -44,7 +42,6 @@ ru: email: Адрес e-mail expires_in: Срок действия fields: Метаданные профиля - filtered_languages: Фильтруемые языки header: Заголовок locale: Язык locked: Сделать аккаунт закрытым diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index 74cb3ac568..279e9a9672 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -25,8 +25,6 @@ sk: data: CSV súbor vyexportovaný z inej Mastodon inštancie sessions: otp: 'Napíš sem dvoj-faktorový kód z telefónu, alebo použi jeden z tvojích obnovovacích kódov:' - user: - filtered_languages: Zaškrtnuté jazyky budú pre teba vynechané z verejnej časovej osi labels: account: fields: @@ -44,7 +42,6 @@ sk: email: Emailová adresa expires_in: Expirovať po fields: Metadáta profilu - filtered_languages: Vynechanie jazykov header: Obrázok v hlavičke locale: Jazyk locked: Zamknúť účet diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml index 30f7eada70..608630c0ce 100644 --- a/config/locales/simple_form.sr-Latn.yml +++ b/config/locales/simple_form.sr-Latn.yml @@ -23,8 +23,6 @@ sr-Latn: data: CSV fajl izvezen sa druge Mastodont instance sessions: otp: Unesite dvofaktorski kod sa Vašeg telefona ili koristite jedan od kodova za oporavak. - user: - filtered_languages: Označeni jezici će za Vas biti isfiltrirani sa javnih lajni labels: defaults: avatar: Avatar @@ -35,7 +33,6 @@ sr-Latn: display_name: Ime za prikaz email: Adresa e-pošte expires_in: Ističe nakon - filtered_languages: Filtrirani jezici header: Zaglavlje locale: Jezik locked: Zaključaj nalog diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml index 3345f7b419..ab9ef0f492 100644 --- a/config/locales/simple_form.sr.yml +++ b/config/locales/simple_form.sr.yml @@ -23,8 +23,6 @@ sr: data: CSV фајл извезен са друге Мастодонт инстанце sessions: otp: Унесите двофакторски код са Вашег телефона или користите један од кодова за опоравак. - user: - filtered_languages: Означени језици ће за Вас бити исфилтрирани са јавних лајни labels: defaults: avatar: Аватар @@ -35,7 +33,6 @@ sr: display_name: Име за приказ email: Адреса е-поште expires_in: Истиче након - filtered_languages: Филтрирани језици header: Заглавље locale: Језик locked: Закључај налог diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml index f027d684b8..346ab39317 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -22,8 +22,6 @@ sv: data: CSV-fil som exporteras från en annan Mastodon-instans sessions: otp: 'Ange tvåfaktorkoden genererad från din telefonapp eller använd någon av dina återställningskoder:' - user: - filtered_languages: Kontrollerade språk filtreras från offentliga tidslinjer för dig labels: account: fields: @@ -40,7 +38,6 @@ sv: email: E-postadress expires_in: Förfaller efter fields: Profil-metadata - filtered_languages: Filtrerade språk header: Bakgrundsbild locale: Språk locked: Lås konto diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 3a315a7db1..f1947e9617 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -19,8 +19,6 @@ zh-CN: data: 请上传从其他 Mastodon 实例导出的 CSV 文件 sessions: otp: 输入你手机应用上生成的双重认证码，或者任意一个恢复代码： - user: - filtered_languages: 被勾选语言的嘟文将不会出现在你的公共时间轴上 labels: account: fields: @@ -38,7 +36,6 @@ zh-CN: email: 电子邮件地址 expires_in: 失效时间 fields: 个人资料附加信息 - filtered_languages: 语言过滤 header: 个人资料页横幅图片 locale: 语言 locked: 保护你的帐户（锁嘟） diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index 06d3f6f6c6..7a1cae68dc 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -22,8 +22,6 @@ zh-HK: data: 自其他服務站匯出的 CSV 檔案 sessions: otp: 輸入你手機上生成的雙重認證碼，或者任意一個恢復代碼： - user: - filtered_languages: 下面被選擇的語言的文章將不會出現在你的公共時間軸上 labels: account: fields: @@ -40,7 +38,6 @@ zh-HK: email: 電郵地址 expires_in: 失效時間 fields: 資料 - filtered_languages: 封鎖下面語言的文章 header: 個人頁面頂部 locale: 語言 locked: 將用戶轉為「私人」 diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index c7c5a37f03..a3f6627afd 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -10,8 +10,6 @@ zh-TW: note: 最多 160 個字元 imports: data: 自其他服務站匯出的 CSV 檔案 - user: - filtered_languages: 下面被選擇的語言的文章將不會出現在你的公共時間軸上。 labels: defaults: avatar: 大頭貼 @@ -21,7 +19,6 @@ zh-TW: data: 資料 display_name: 顯示名稱 email: 電子信箱 - filtered_languages: 封鎖下面語言的文章 header: 個人頁面頂部 locale: 語言 locked: 將帳號轉為「私密」 diff --git a/db/migrate/20180616192031_add_chosen_languages_to_users.rb b/db/migrate/20180616192031_add_chosen_languages_to_users.rb new file mode 100644 index 0000000000..48b53019d6 --- /dev/null +++ b/db/migrate/20180616192031_add_chosen_languages_to_users.rb @@ -0,0 +1,5 @@ +class AddChosenLanguagesToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :chosen_languages, :string, array: true, null: true, default: nil + end +end diff --git a/db/schema.rb b/db/schema.rb index 4c39de26a6..c06387ba67 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: 2018_06_15_122121) do +ActiveRecord::Schema.define(version: 2018_06_16_192031) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -525,6 +525,7 @@ ActiveRecord::Schema.define(version: 2018_06_15_122121) do t.boolean "moderator", default: false, null: false t.bigint "invite_id" t.string "remember_token" + t.string "chosen_languages", array: true t.index ["account_id"], name: "index_users_on_account_id" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["email"], name: "index_users_on_email", unique: true diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences_controller_spec.rb index 7877c73621..f2028cf39b 100644 --- a/spec/controllers/settings/preferences_controller_spec.rb +++ b/spec/controllers/settings/preferences_controller_spec.rb @@ -18,12 +18,12 @@ describe Settings::PreferencesController do describe 'PUT #update' do it 'updates the user record' do - put :update, params: { user: { locale: 'en', filtered_languages: ['es', 'fr', ''] } } + put :update, params: { user: { locale: 'en', chosen_languages: ['es', 'fr', ''] } } expect(response).to redirect_to(settings_preferences_path) user.reload expect(user.locale).to eq 'en' - expect(user.filtered_languages).to eq ['es', 'fr'] + expect(user.chosen_languages).to eq ['es', 'fr'] end it 'updates user settings' do diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index 5113b652fc..b3e475d99c 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -259,18 +259,18 @@ RSpec.describe Status, type: :model do end end - describe '.not_in_filtered_languages' do + describe '.in_chosen_languages' do context 'for accounts with language filters' do - let(:user) { Fabricate(:user, filtered_languages: ['en']) } + let(:user) { Fabricate(:user, chosen_languages: ['en']) } - it 'does not include statuses in filtered languages' do - status = Fabricate(:status, language: 'en') - expect(Status.not_in_filtered_languages(user.account)).not_to include status + it 'does not include statuses in not in chosen languages' do + status = Fabricate(:status, language: 'de') + expect(Status.in_chosen_languages(user.account)).not_to include status end it 'includes status with unknown language' do status = Fabricate(:status, language: nil) - expect(Status.not_in_filtered_languages(user.account)).to include status + expect(Status.in_chosen_languages(user.account)).to include status end end end @@ -518,7 +518,7 @@ RSpec.describe Status, type: :model do context 'with language preferences' do it 'excludes statuses in languages not allowed by the account user' do - user = Fabricate(:user, filtered_languages: [:fr]) + user = Fabricate(:user, chosen_languages: [:en, :es]) @account.update(user: user) en_status = Fabricate(:status, language: 'en') es_status = Fabricate(:status, language: 'es') @@ -531,7 +531,7 @@ RSpec.describe Status, type: :model do end it 'includes all languages when user does not have a setting' do - user = Fabricate(:user, filtered_languages: []) + user = Fabricate(:user, chosen_languages: nil) @account.update(user: user) en_status = Fabricate(:status, language: 'en') diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index cc8d88cc85..93a6c26fb2 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -41,9 +41,9 @@ RSpec.describe User, type: :model do end it 'cleans out empty string from languages' do - user = Fabricate.build(:user, filtered_languages: ['']) + user = Fabricate.build(:user, chosen_languages: ['']) user.valid? - expect(user.filtered_languages).to eq [] + expect(user.chosen_languages).to eq nil end end From b347d554326c810b82f4a9d9a7042e41b771967f Mon Sep 17 00:00:00 2001 From: Hinaloe Date: Mon, 18 Jun 2018 01:10:58 +0900 Subject: [PATCH 11/32] DataTransfer.types may Array-like object (#7827) --- app/javascript/mastodon/features/ui/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js index f1409b9467..3c1a266e30 100644 --- a/app/javascript/mastodon/features/ui/index.js +++ b/app/javascript/mastodon/features/ui/index.js @@ -230,7 +230,7 @@ export default class UI extends React.PureComponent { this.dragTargets.push(e.target); } - if (e.dataTransfer && e.dataTransfer.types.includes('Files')) { + if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files')) { this.setState({ draggingOver: true }); } } From bb21c6414db64739637b4ea81526efe8e539cce0 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 17 Jun 2018 18:49:35 +0200 Subject: [PATCH 12/32] Remove unused indexes (#7829) --- db/migrate/20180617162849_remove_unused_indexes.rb | 7 +++++++ db/schema.rb | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20180617162849_remove_unused_indexes.rb diff --git a/db/migrate/20180617162849_remove_unused_indexes.rb b/db/migrate/20180617162849_remove_unused_indexes.rb new file mode 100644 index 0000000000..61add63855 --- /dev/null +++ b/db/migrate/20180617162849_remove_unused_indexes.rb @@ -0,0 +1,7 @@ +class RemoveUnusedIndexes < ActiveRecord::Migration[5.2] + def change + remove_index :statuses, name: "index_statuses_on_conversation_id" + remove_index :users, name: "index_users_on_filtered_languages" + remove_index :backups, name: "index_backups_on_user_id" + end +end diff --git a/db/schema.rb b/db/schema.rb index c06387ba67..2853aef942 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: 2018_06_16_192031) do +ActiveRecord::Schema.define(version: 2018_06_17_162849) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -103,7 +103,6 @@ ActiveRecord::Schema.define(version: 2018_06_16_192031) do t.boolean "processed", default: false, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["user_id"], name: "index_backups_on_user_id" end create_table "blocks", force: :cascade do |t| @@ -448,7 +447,6 @@ ActiveRecord::Schema.define(version: 2018_06_16_192031) do t.bigint "application_id" t.bigint "in_reply_to_account_id" t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc } - t.index ["conversation_id"], name: "index_statuses_on_conversation_id" t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id" t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id" t.index ["uri"], name: "index_statuses_on_uri", unique: true @@ -529,7 +527,6 @@ ActiveRecord::Schema.define(version: 2018_06_16_192031) do t.index ["account_id"], name: "index_users_on_account_id" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["email"], name: "index_users_on_email", unique: true - t.index ["filtered_languages"], name: "index_users_on_filtered_languages", using: :gin t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end From a58ec29631f74259364dc71b408a8d66df657149 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 17 Jun 2018 18:57:31 +0200 Subject: [PATCH 13/32] Allow selecting default posting language instead of auto-detect (#7828) * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving --- app/controllers/api/v1/accounts/credentials_controller.rb | 1 + app/controllers/settings/preferences_controller.rb | 1 + app/javascript/styles/mastodon/forms.scss | 2 ++ app/lib/user_settings_decorator.rb | 5 +++++ app/models/user.rb | 2 +- app/serializers/rest/credential_account_serializer.rb | 1 + app/services/post_status_service.rb | 2 +- app/views/settings/preferences/show.html.haml | 2 ++ config/locales/en.yml | 1 + config/locales/simple_form.en.yml | 5 ++++- 10 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb index 259d07be87..2d0737ee46 100644 --- a/app/controllers/api/v1/accounts/credentials_controller.rb +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -32,6 +32,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController { 'setting_default_privacy' => source_params.fetch(:privacy, @account.user.setting_default_privacy), 'setting_default_sensitive' => source_params.fetch(:sensitive, @account.user.setting_default_sensitive), + 'setting_default_language' => source_params.fetch(:language, @account.user.setting_default_language), } end end diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 851e62d1b7..e2cb131671 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -35,6 +35,7 @@ class Settings::PreferencesController < ApplicationController params.require(:user).permit( :setting_default_privacy, :setting_default_sensitive, + :setting_default_language, :setting_unfollow_modal, :setting_boost_modal, :setting_delete_modal, diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index de16784a87..f1ed2c90bd 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -140,6 +140,8 @@ code { } .input.with_block_label { + padding-top: 15px; + & > label { font-family: inherit; font-size: 16px; diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb index a82f8974b7..8339593978 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -19,6 +19,7 @@ class UserSettingsDecorator user.settings['interactions'] = merged_interactions if change?('interactions') user.settings['default_privacy'] = default_privacy_preference if change?('setting_default_privacy') user.settings['default_sensitive'] = default_sensitive_preference if change?('setting_default_sensitive') + user.settings['default_language'] = default_language_preference if change?('setting_default_language') user.settings['unfollow_modal'] = unfollow_modal_preference if change?('setting_unfollow_modal') user.settings['boost_modal'] = boost_modal_preference if change?('setting_boost_modal') user.settings['delete_modal'] = delete_modal_preference if change?('setting_delete_modal') @@ -87,6 +88,10 @@ class UserSettingsDecorator settings['setting_theme'] end + def default_language_preference + settings['setting_default_language'] + end + def boolean_cast_setting(key) ActiveModel::Type::Boolean.new.cast(settings[key]) end diff --git a/app/models/user.rb b/app/models/user.rb index c95960dc6d..c820c553a7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -89,7 +89,7 @@ class User < ApplicationRecord delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal, :reduce_motion, :system_font_ui, :noindex, :theme, :display_sensitive_media, :hide_network, - to: :settings, prefix: :setting, allow_nil: false + :default_language, to: :settings, prefix: :setting, allow_nil: false attr_accessor :invite_code diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb index 56857cba88..fb195eb07d 100644 --- a/app/serializers/rest/credential_account_serializer.rb +++ b/app/serializers/rest/credential_account_serializer.rb @@ -9,6 +9,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer { privacy: user.setting_default_privacy, sensitive: user.setting_default_sensitive, + language: user.setting_default_language, note: object.note, fields: object.fields.map(&:to_h), } diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index a5a21c3592..7359857257 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -30,7 +30,7 @@ class PostStatusService < BaseService sensitive: (options[:sensitive].nil? ? account.user&.setting_default_sensitive : options[:sensitive]) || options[:spoiler_text].present?, spoiler_text: options[:spoiler_text] || '', visibility: options[:visibility] || account.user&.setting_default_privacy, - language: language_from_option(options[:language]) || LanguageDetector.instance.detect(text, account), + language: language_from_option(options[:language]) || account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(text, account), application: options[:application]) end diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 6ec03ab4bd..43430069f6 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -12,6 +12,8 @@ .fields-group = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale + = 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 + = 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' %h4= t 'preferences.publishing' diff --git a/config/locales/en.yml b/config/locales/en.yml index 46875d2ecb..01e5dd2f8d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -675,6 +675,7 @@ en: disallowed_hashtags: one: 'contained a disallowed hashtag: %{tags}' other: 'contained the disallowed hashtags: %{tags}' + language_detection: Automatically detect language open_in_web: Open in web over_character_limit: character limit of %{max} exceeded pin_errors: diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index a75a0f567f..6783f00452 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -12,10 +12,12 @@ en: other: %{count} characters left fields: You can have up to 4 items displayed as a table on your profile header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px + locale: The language of the user interface, e-mails and push notifications locked: Requires you to manually approve followers note: one: 1 character left other: %{count} characters left + setting_default_language: The language of your toots can be detected automatically, but it's not always accurate 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_theme: Affects how Mastodon looks when you're logged in from any device. @@ -24,7 +26,7 @@ en: sessions: otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' user: - chosen_languages: Only toots in selected languages will be displayed in public timelines. Select nothing to see toots in all languages + chosen_languages: When checked, only toots in selected languages will be displayed in public timelines labels: account: fields: @@ -53,6 +55,7 @@ en: password: Password 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_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot From eb6573e926dca5b395d3840fc222bb9cb488be9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quent=C3=AD?= <33203663+Quenty31@users.noreply.github.com> Date: Sun, 17 Jun 2018 21:08:23 +0200 Subject: [PATCH 14/32] [i18n] Update Occitan for #7823 and #7828 (#7830) * Update for #7828 Allow selecting default posting language instead of auto-detect * Update for #7828 and #7823 Allow selecting default posting language instead of auto-detect Change language opt-out to language opt-in --- config/locales/oc.yml | 1 + config/locales/simple_form.oc.yml | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/locales/oc.yml b/config/locales/oc.yml index af0b5c8a5d..fdaecbbbf7 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -732,6 +732,7 @@ oc: disallowed_hashtags: one: 'conten una etiqueta desactivada : %{tags}' other: 'conten las etiquetas desactivadas : %{tags}' + language_detection: Detectar automaticament la lenga open_in_web: Dobrir sul web over_character_limit: limit de %{max} caractèrs passat pin_errors: diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 510e76e383..df3ffe793e 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -12,10 +12,12 @@ oc: other: Demòran encara %{count} caractèrs fields: Podètz far veire cap a 4 elements sus vòstre perfil header: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhada en 700x335px + locale: La lenga de l’interfàcia d’utilizacion, los messatges e las notificacions locked: Demanda qu’acceptetz manualament lo mond que vos sègon e botarà la visibilitat de vòstras publicacions coma accessiblas a vòstres seguidors solament note: one: Demòra encara 1 caractèr other: Demòran encara %{count} caractèrs + setting_default_language: La lenga de vòstres tuts pòt èsser detectada automaticament, mas de còps es pas corrèctament determinada 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_theme: Aquò càmbia lo tèma grafic de Mastodon quand sètz connectat qual que siasque lo periferic. @@ -23,6 +25,8 @@ oc: data: Fichièr CSV exportat d’una autra instància Mastodon sessions: otp: 'Picatz lo còdi d’autentificacion en dos temps (Two factor code) de vòstra aplicacion mobil o utilizatz un de vòstres còdis de recuperacion :' + user: + chosen_languages: Quand seleccionadas, solament los tuts dins las lengas triadas seràn mostrats dins vòstre flux d’actualitat labels: account: fields: @@ -32,6 +36,7 @@ oc: 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 confirm_password: Confirmatz lo nòu senhal current_password: Senhal actual @@ -41,7 +46,7 @@ oc: expires_in: Expira aprèp fields: Metadonada del perfil header: Bandièra - locale: Lenga + locale: Lenga de l’interfàcia locked: Far venir lo compte privat max_uses: Limit d’utilizacions new_password: Nòu senhal @@ -50,6 +55,7 @@ oc: password: Senhal setting_auto_play_gif: Lectura automatica dels GIFS animats setting_boost_modal: Afichar una fenèstra de confirmacion abans de partejar un estatut + setting_default_language: Lenga de publicacion setting_default_privacy: Confidencialitat de las publicacions setting_default_sensitive: Totjorn marcar los mèdias coma sensibles setting_delete_modal: Afichar una fenèstra de confirmacion abans de suprimir un estatut From 63b05096c78521560516b0f5c7e900f33957fb8f Mon Sep 17 00:00:00 2001 From: Shuhei Kitagawa Date: Mon, 18 Jun 2018 10:45:20 +0900 Subject: [PATCH 15/32] Add tests for shares_controller (#7835) --- spec/controllers/shares_controller_spec.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 spec/controllers/shares_controller_spec.rb diff --git a/spec/controllers/shares_controller_spec.rb b/spec/controllers/shares_controller_spec.rb new file mode 100644 index 0000000000..a74e9af561 --- /dev/null +++ b/spec/controllers/shares_controller_spec.rb @@ -0,0 +1,22 @@ +require 'rails_helper' + +describe SharesController do + render_views + + let(:user) { Fabricate(:user) } + before { sign_in user } + + describe 'GTE #show' do + subject(:initial_state_json) { JSON.parse(assigns(:initial_state_json), symbolize_names: true) } + subject(:body_classes) { assigns(:body_classes) } + + before { get :show, params: { title: 'test title', text: 'test text', url: 'url1 url2' } } + + it 'assigns json' do + expect(response).to have_http_status :ok + expect(initial_state_json[:compose][:text]).to eq 'test title test text url1 url2' + expect(initial_state_json[:meta][:me]).to eq user.account.id.to_s + expect(body_classes).to eq 'modal-layout compose-standalone' + end + end +end From 434ec913dd6aba1f4d9a5729c7ce3902bb7f35d2 Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Mon, 18 Jun 2018 22:33:11 +0900 Subject: [PATCH 16/32] Change list icons different from the getting-started icons (#7838) --- app/javascript/mastodon/features/getting_started/index.js | 2 +- app/javascript/mastodon/features/list_timeline/index.js | 2 +- app/javascript/mastodon/features/lists/index.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 0df2d8bbfe..34c7a42980 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -95,7 +95,7 @@ export default class GettingStarted extends ImmutablePureComponent { navItems.push( , , - + ); height += 48*3; diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js index 9a1e3c6d69..f08e77b7a9 100644 --- a/app/javascript/mastodon/features/list_timeline/index.js +++ b/app/javascript/mastodon/features/list_timeline/index.js @@ -138,7 +138,7 @@ export default class ListTimeline extends React.PureComponent { return ( + @@ -66,7 +66,7 @@ export default class Lists extends ImmutablePureComponent { {lists.map(list => - + )} From 7e9e7c642d4cf5a5be9f2d5082282dab964b677e Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Mon, 18 Jun 2018 22:41:40 +0900 Subject: [PATCH 17/32] Weblate translations (2018-06-18) (#7839) * Translated using Weblate (German) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (German) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.6% (620 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 95.5% (65 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Japanese) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (French) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Occitan) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Basque) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Arabic) Currently translated at 95.0% (591 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (622 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Italian) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 84.5% (526 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Basque) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Galician) Currently translated at 100.0% (622 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused --- app/javascript/mastodon/locales/ar.json | 10 ++++---- app/javascript/mastodon/locales/de.json | 30 +++++++++++------------ app/javascript/mastodon/locales/eo.json | 20 ++++++++-------- app/javascript/mastodon/locales/eu.json | 10 ++++---- app/javascript/mastodon/locales/fr.json | 10 ++++---- app/javascript/mastodon/locales/gl.json | 2 +- app/javascript/mastodon/locales/it.json | 12 +++++----- app/javascript/mastodon/locales/ja.json | 10 ++++---- app/javascript/mastodon/locales/oc.json | 2 +- app/javascript/mastodon/locales/sk.json | 2 +- config/locales/ar.yml | 32 +++++++++++++++---------- config/locales/de.yml | 9 ++++--- config/locales/doorkeeper.de.yml | 1 + config/locales/eu.yml | 1 + config/locales/gl.yml | 1 + config/locales/it.yml | 4 ++++ config/locales/simple_form.de.yml | 5 +++- config/locales/simple_form.eo.yml | 2 ++ config/locales/simple_form.eu.yml | 2 ++ config/locales/simple_form.fr.yml | 2 ++ config/locales/simple_form.gl.yml | 2 ++ config/locales/simple_form.it.yml | 2 ++ 22 files changed, 101 insertions(+), 70 deletions(-) diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index c6d44f5a41..88f592a091 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -59,7 +59,7 @@ "column_header.show_settings": "عرض الإعدادات", "column_header.unpin": "فك التدبيس", "column_subheading.settings": "الإعدادات", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "الوسائط فقط", "compose_form.direct_message_warning": "لن يَظهر هذا التبويق إلا للمستخدمين المذكورين.", "compose_form.direct_message_warning_learn_more": "إقرأ المزيد", "compose_form.hashtag_warning": "هذا التبويق لن يُدرَج تحت أي وسم كان بما أنه غير مُدرَج. لا يُسمح بالبحث إلّا عن التبويقات العمومية عن طريق الوسوم.", @@ -114,13 +114,13 @@ "empty_column.public": "لا يوجد أي شيء هنا ! قم بنشر شيء ما للعامة، أو إتبع مستخدمين آخرين في الخوادم المثيلة الأخرى لملء خيط المحادثات العام", "follow_request.authorize": "ترخيص", "follow_request.reject": "رفض", - "getting_started.developers": "Developers", + "getting_started.developers": "المُطوِّرون", "getting_started.documentation": "Documentation", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "البحث عن أصدقاء على تويتر", "getting_started.heading": "إستعدّ للبدء", - "getting_started.invite": "Invite people", + "getting_started.invite": "دعوة أشخاص", "getting_started.open_source_notice": "ماستدون برنامج مفتوح المصدر. يمكنك المساهمة، أو الإبلاغ عن تقارير الأخطاء، على جيت هب {github}.", - "getting_started.security": "Security", + "getting_started.security": "الأمان", "getting_started.terms": "شروط الخدمة", "home.column_settings.advanced": "متقدمة", "home.column_settings.basic": "أساسية", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index a30a2a0dc8..2e32c86a4f 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -59,9 +59,9 @@ "column_header.show_settings": "Einstellungen anzeigen", "column_header.unpin": "Lösen", "column_subheading.settings": "Einstellungen", - "community.column_settings.media_only": "Media Only", + "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": "Learn more", + "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.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", @@ -81,11 +81,11 @@ "confirmations.delete_list.confirm": "Delete", "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} verbergen willst? In den meisten Fällen reichen ein paar gezielte Blocks aus.", + "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} verbergen willst? In den meisten Fällen reichen ein paar gezielte Blocks aus. Du wirst nicht den Inhalt von dieser Domain in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Deine Follower von dieser Domain werden entfernt.", "confirmations.mute.confirm": "Stummschalten", "confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "Löschen und neu erstellen", + "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Status löschen und neu machen möchtest? Du wirst alle Antworten, Boosts und Favoriten darauf verlieren.", "confirmations.unfollow.confirm": "Entfolgen", "confirmations.unfollow.message": "Bist du dir sicher, dass du {name} entfolgen möchtest?", "embed.instructions": "Du kannst diesen Beitrag auf deiner Webseite einbetten, indem du den folgenden Code einfügst.", @@ -114,14 +114,14 @@ "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Instanzen, um die Zeitleiste aufzufüllen", "follow_request.authorize": "Erlauben", "follow_request.reject": "Ablehnen", - "getting_started.developers": "Developers", + "getting_started.developers": "Entwickler", "getting_started.documentation": "Documentation", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "Finde Freunde von Twitter", "getting_started.heading": "Erste Schritte", - "getting_started.invite": "Invite people", + "getting_started.invite": "Leute einladen", "getting_started.open_source_notice": "Mastodon ist quelloffene Software. Du kannst auf GitHub unter {github} dazu beitragen oder Probleme melden.", - "getting_started.security": "Security", - "getting_started.terms": "Terms of service", + "getting_started.security": "Sicherheit", + "getting_started.terms": "Nutzungsbedingungen", "home.column_settings.advanced": "Erweitert", "home.column_settings.basic": "Einfach", "home.column_settings.filter_regex": "Mit regulären Ausdrücken filtern", @@ -165,7 +165,7 @@ "navigation_bar.blocks": "Blockierte Profile", "navigation_bar.community_timeline": "Lokale Zeitleiste", "navigation_bar.direct": "Direktnachrichten", - "navigation_bar.discover": "Discover", + "navigation_bar.discover": "Entdecken", "navigation_bar.domain_blocks": "Versteckte Domains", "navigation_bar.edit_profile": "Profil bearbeiten", "navigation_bar.favourites": "Favoriten", @@ -179,7 +179,7 @@ "navigation_bar.pins": "Angeheftete Beiträge", "navigation_bar.preferences": "Einstellungen", "navigation_bar.public_timeline": "Föderierte Zeitleiste", - "navigation_bar.security": "Security", + "navigation_bar.security": "Sicherheit", "notification.favourite": "{name} hat deinen Beitrag favorisiert", "notification.follow": "{name} folgt dir", "notification.mention": "{name} hat dich erwähnt", @@ -195,7 +195,7 @@ "notifications.column_settings.reblog": "Geteilte Beiträge:", "notifications.column_settings.show": "In der Spalte anzeigen", "notifications.column_settings.sound": "Ton abspielen", - "notifications.group": "{count} notifications", + "notifications.group": "{count} Benachrichtigungen", "onboarding.done": "Fertig", "onboarding.next": "Weiter", "onboarding.page_five.public_timelines": "Die lokale Zeitleiste zeigt alle Beiträge von Leuten, die auch auf {domain} sind. Das gesamte bekannte Netz zeigt Beiträge von allen, denen von Leuten auf {domain} gefolgt wird. Zusammen sind sie die öffentlichen Zeitleisten, ein guter Weg, um neue Leute zu finden.", @@ -271,7 +271,7 @@ "status.reblog": "Teilen", "status.reblog_private": "An das eigentliche Publikum teilen", "status.reblogged_by": "{name} teilte", - "status.redraft": "Delete & re-draft", + "status.redraft": "Löschen und neu erstellen", "status.reply": "Antworten", "status.replyAll": "Auf Thread antworten", "status.report": "@{name} melden", @@ -295,7 +295,7 @@ "upload_button.label": "Mediendatei hinzufügen", "upload_form.description": "Für Menschen mit Sehbehinderung beschreiben", "upload_form.focus": "Zuschneiden", - "upload_form.undo": "Entfernen", + "upload_form.undo": "Löschen", "upload_progress.label": "Wird hochgeladen …", "video.close": "Video schließen", "video.exit_fullscreen": "Vollbild verlassen", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 86e3b0e87b..c160ec0fbb 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -59,7 +59,7 @@ "column_header.show_settings": "Montri agordojn", "column_header.unpin": "Depingli", "column_subheading.settings": "Agordado", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "Nur aŭdovidaĵoj", "compose_form.direct_message_warning": "Tiu mesaĝo estos sendita nur al menciitaj uzantoj.", "compose_form.direct_message_warning_learn_more": "Lerni pli", "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.", @@ -81,11 +81,11 @@ "confirmations.delete_list.confirm": "Forigi", "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?", "confirmations.domain_block.confirm": "Kaŝi la tutan domajnon", - "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas.", + "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika tempolinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.", "confirmations.mute.confirm": "Silentigi", "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?", - "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.confirm": "Forigi kaj reskribi", + "confirmations.redraft.message": "Ĉu vi certas, ke vi volas forigi tiun mesaĝon kaj reskribi ĝin? Vi perdos ĉiujn respondojn, diskonigojn kaj stelumojn ligitajn al ĝi.", "confirmations.unfollow.confirm": "Ne plu sekvi", "confirmations.unfollow.message": "Ĉu vi certas, ke vi volas ĉesi sekvi {name}?", "embed.instructions": "Enkorpigu ĉi tiun mesaĝon en vian retejon per kopio de la suba kodo.", @@ -114,13 +114,13 @@ "empty_column.public": "Estas nenio ĉi tie! Publike skribu ion, aŭ mane sekvu uzantojn de aliaj nodoj por plenigi la publikan tempolinion", "follow_request.authorize": "Rajtigi", "follow_request.reject": "Rifuzi", - "getting_started.developers": "Developers", + "getting_started.developers": "Programistoj", "getting_started.documentation": "Dokumentado", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "Trovi amikojn el Twitter", "getting_started.heading": "Por komenci", - "getting_started.invite": "Invite people", + "getting_started.invite": "Inviti homojn", "getting_started.open_source_notice": "Mastodon estas malfermitkoda programo. Vi povas kontribui aŭ raporti problemojn en GitHub je {github}.", - "getting_started.security": "Security", + "getting_started.security": "Sekureco", "getting_started.terms": "Uzkondiĉoj", "home.column_settings.advanced": "Precizaj agordoj", "home.column_settings.basic": "Bazaj agordoj", @@ -175,7 +175,7 @@ "navigation_bar.lists": "Listoj", "navigation_bar.logout": "Elsaluti", "navigation_bar.mutes": "Silentigitaj uzantoj", - "navigation_bar.personal": "Personal", + "navigation_bar.personal": "Persone", "navigation_bar.pins": "Alpinglitaj mesaĝoj", "navigation_bar.preferences": "Preferoj", "navigation_bar.public_timeline": "Fratara tempolinio", @@ -271,7 +271,7 @@ "status.reblog": "Diskonigi", "status.reblog_private": "Diskonigi al la originala atentaro", "status.reblogged_by": "{name} diskonigis", - "status.redraft": "Delete & re-draft", + "status.redraft": "Forigi kaj reskribi", "status.reply": "Respondi", "status.replyAll": "Respondi al la fadeno", "status.report": "Signali @{name}", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index d11b0f8178..c92adcf4e9 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -59,7 +59,7 @@ "column_header.show_settings": "Erakutsi ezarpenak", "column_header.unpin": "Desfinkatu", "column_subheading.settings": "Ezarpenak", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "Multimedia besterik ez", "compose_form.direct_message_warning": "Toot hau aipatutako erabiltzaileei besterik ez zaie bidaliko.", "compose_form.direct_message_warning_learn_more": "Ikasi gehiago", "compose_form.hashtag_warning": "Toot hau ez da traoletan agertuko zerrendatu gabekoa baita. Traoletan toot publikoak besterik ez dira agertzen.", @@ -114,13 +114,13 @@ "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste instantzia batzuetako erabiltzailean hau betetzeko", "follow_request.authorize": "Baimendu", "follow_request.reject": "Ukatu", - "getting_started.developers": "Developers", + "getting_started.developers": "Garatzaileak", "getting_started.documentation": "Dokumentazioa", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "Aurkitu Twitter-eko lagunak", "getting_started.heading": "Menua", - "getting_started.invite": "Invite people", + "getting_started.invite": "Gonbidatu jendea", "getting_started.open_source_notice": "Mastodon software librea da. Ekarpenak egin ditzakezu edo akatsen berri eman GitHub bidez: {github}.", - "getting_started.security": "Security", + "getting_started.security": "Segurtasuna", "getting_started.terms": "Erabilera baldintzak", "home.column_settings.advanced": "Aurreratua", "home.column_settings.basic": "Oinarrizkoa", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index c64263316c..1e9756d051 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -59,7 +59,7 @@ "column_header.show_settings": "Afficher les paramètres", "column_header.unpin": "Retirer", "column_subheading.settings": "Paramètres", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "Média uniquement", "compose_form.direct_message_warning": "Ce pouet sera uniquement envoyé qu'aux personnes mentionnées. Cependant, l'administration de votre instance et des instances réceptrices pourront inspecter ce message.", "compose_form.direct_message_warning_learn_more": "En savoir plus", "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par hashtag car sa visibilité est réglée sur \"non-listé\". Seuls les pouets avec une visibilité \"publique\" peuvent être recherchés par hashtag.", @@ -114,13 +114,13 @@ "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres instances pour remplir le fil public", "follow_request.authorize": "Accepter", "follow_request.reject": "Rejeter", - "getting_started.developers": "Developers", + "getting_started.developers": "Développeurs", "getting_started.documentation": "Documentation", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "Trouver des amis depuis Twitter", "getting_started.heading": "Pour commencer", - "getting_started.invite": "Invite people", + "getting_started.invite": "Inviter des gens", "getting_started.open_source_notice": "Mastodon est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et rapports de bogues via {github} sur GitHub.", - "getting_started.security": "Security", + "getting_started.security": "Sécurité", "getting_started.terms": "Conditions d’utilisation", "home.column_settings.advanced": "Avancé", "home.column_settings.basic": "Basique", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 52ebf8a961..da4fa83b5a 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -81,7 +81,7 @@ "confirmations.delete_list.confirm": "Delete", "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.", + "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.", "confirmations.mute.confirm": "Acalar", "confirmations.mute.message": "Está segura de que quere acalar a {name}?", "confirmations.redraft.confirm": "Delete & redraft", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 7192811e7a..61eba2f5ab 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -59,7 +59,7 @@ "column_header.show_settings": "Mostra impostazioni", "column_header.unpin": "Non fissare in cima", "column_subheading.settings": "Impostazioni", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "Solo media", "compose_form.direct_message_warning": "Questo toot sarà mandato solo a tutti gli utenti menzionati.", "compose_form.direct_message_warning_learn_more": "Per saperne di piu'", "compose_form.hashtag_warning": "Questo toot non è listato, quindi non sarà trovato nelle ricerche per hashtag. Solo i toot pubblici possono essere cercati per hashtag.", @@ -114,13 +114,13 @@ "empty_column.public": "Qui non c'è nulla! Scrivi qualcosa pubblicamente, o aggiungi utenti da altri server per riempire questo spazio", "follow_request.authorize": "Autorizza", "follow_request.reject": "Rifiuta", - "getting_started.developers": "Developers", - "getting_started.documentation": "Documentation", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.developers": "Sviluppatori", + "getting_started.documentation": "Documentazione", + "getting_started.find_friends": "Trova amici da Twitter", "getting_started.heading": "Come iniziare", - "getting_started.invite": "Invite people", + "getting_started.invite": "Invita qualcuno", "getting_started.open_source_notice": "Mastodon è un software open source. Puoi contribuire o segnalare errori su GitHub all'indirizzo {github}.", - "getting_started.security": "Security", + "getting_started.security": "Sicurezza", "getting_started.terms": "Condizioni del servizio", "home.column_settings.advanced": "Avanzato", "home.column_settings.basic": "Semplice", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 984f1c4983..b7613b87ab 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -59,7 +59,7 @@ "column_header.show_settings": "設定を表示", "column_header.unpin": "ピン留めを外す", "column_subheading.settings": "設定", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "メディアのみ表示", "compose_form.direct_message_warning": "このトゥートはメンションされた人にのみ送信されます。", "compose_form.direct_message_warning_learn_more": "もっと詳しく", "compose_form.hashtag_warning": "このトゥートは未収載なのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。", @@ -114,13 +114,13 @@ "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のインスタンスのユーザーをフォローしたりしていっぱいにしましょう", "follow_request.authorize": "許可", "follow_request.reject": "拒否", - "getting_started.developers": "Developers", + "getting_started.developers": "開発", "getting_started.documentation": "ドキュメント", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "Twitterでの友達を探す", "getting_started.heading": "スタート", - "getting_started.invite": "Invite people", + "getting_started.invite": "招待", "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub（{github}）から開発に参加したり、問題を報告したりできます。", - "getting_started.security": "Security", + "getting_started.security": "セキュリティ", "getting_started.terms": "プライバシーポリシー", "home.column_settings.advanced": "高度な設定", "home.column_settings.basic": "基本設定", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 0c65fbad5f..bf92ff4334 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -59,7 +59,7 @@ "column_header.show_settings": "Mostrar los paramètres", "column_header.unpin": "Despenjar", "column_subheading.settings": "Paramètres", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "Solament los mèdias", "compose_form.direct_message_warning": "Sols los mencionats poiràn veire aqueste tut.", "compose_form.direct_message_warning_learn_more": "Ne saber mai", "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pas cercar que los tuts publics per etiqueta.", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index bdc3636697..394c5cef40 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -59,7 +59,7 @@ "column_header.show_settings": "Ukáž nastavenia", "column_header.unpin": "Odopnúť", "column_subheading.settings": "Nastavenia", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "Iba media", "compose_form.direct_message_warning": "Tento príspevok bude videný výhradne iba spomenutými užívateľmi. Ber ale na vedomie že správci tvojej a všetkých iných zahrnutých instancií majú možnosť skontrolovať túto správu.", "compose_form.direct_message_warning_learn_more": "Zistiť viac", "compose_form.hashtag_warning": "Tento toot nebude zobrazený pod žiadným haštagom lebo nieje listovaný. Iba verejné tooty môžu byť nájdené podľa haštagu.", diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 9e32447082..0ee607db7f 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -504,6 +504,7 @@ ar: '86400': يوم واحد expires_in_prompt: أبدا generate: توليد + invited_by: 'تمت دعوتك من طرف :' max_uses: one: إستعمال واحد other: "%{count} استخدامات" @@ -589,7 +590,8 @@ ar: prompt: 'إنك بصدد متابعة :' remote_unfollow: error: خطأ - title: '' + title: العنوان + unfollowed: غير متابَع sessions: activity: آخر نشاط browser: المتصفح @@ -603,6 +605,7 @@ ar: generic: متصفح مجهول ie: إنترنت إكسبلورر micro_messenger: مايكرو ميسنجر + nokia: متصفح Nokia S40 Ovi opera: أوبرا otter: أوتر phantom_js: فانتوم جي آس @@ -647,17 +650,18 @@ ar: your_apps: تطبيقاتك statuses: attached: + description: 'مُرفَق : %{attached}' image: - one: '' - other: '' + one: "%{count} صورة" + other: "%{count} صور" video: - one: '' - other: '' - content_warning: '' + one: "%{count} فيديو" + other: "%{count} فيديوهات" + content_warning: 'تحذير عن المحتوى : %{warning}' open_in_web: إفتح في الويب over_character_limit: تم تجاوز حد الـ %{max} حرف المسموح بها pin_errors: - limit: '' + limit: لقد بلغت الحد الأقصى للتبويقات المدبسة ownership: لا يمكن تدبيس تبويق نشره شخص آخر private: لا يمكن تثبيت تبويق لم يُنشر للعامة reblog: لا يمكن تثبيت ترقية @@ -678,7 +682,9 @@ ar: terms: title: شروط الخدمة وسياسة الخصوصية على %{instance} themes: + contrast: تباين عالٍ default: ماستدون + mastodon-light: ماستدون (فاتح) time: formats: default: "%b %d, %Y, %H:%M" @@ -702,15 +708,17 @@ ar: subject: نسخة بيانات حسابك جاهزة للتنزيل title: المغادرة بأرشيف الحساب welcome: - edit_profile_action: '' - explanation: '' - full_handle: '' - review_preferences_action: '' - subject: '' + edit_profile_action: تهيئة الملف الشخصي + explanation: ها هي بعض النصائح قبل بداية الإستخدام + final_action: اشرَع في النشر + full_handle: عنوانك الكامل + review_preferences_action: تعديل التفضيلات + subject: أهلًا بك على ماستدون tips: نصائح title: أهلاً بك، %{name} ! users: invalid_email: عنوان البريد الإلكتروني غير صالح invalid_otp_token: رمز المصادقة بخطوتين غير صالح + otp_lost_help_html: إن فقدتَهُما ، يمكنك الإتصال بـ %{email} seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة. signed_in_as: 'تم تسجيل دخولك بصفة :' diff --git a/config/locales/de.yml b/config/locales/de.yml index fbd81b6eb9..cd06ef0e6c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -283,7 +283,7 @@ de: create_and_resolve: Mit Kommentar lösen create_and_unresolve: Mit Kommentar wieder öffnen delete: Löschen - placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder andere Neuigkeiten zu dieser Meldung… + placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder irgendwelche andere Neuigkeiten… reopen: Meldung wieder öffnen report: 'Meldung #%{id}' report_contents: Inhalt @@ -424,7 +424,7 @@ de: following: 'Erfolg! Du folgst nun:' post_follow: close: Oder du schließt einfach dieses Fenster. - return: Zurück zum Profil dieses Wesens + return: Zeige Profil des Benutzers web: Das Web öffnen title: "%{acct} folgen" datetime: @@ -514,6 +514,7 @@ de: '86400': 1 Tag expires_in_prompt: Nie generate: Generieren + invited_by: 'Du wurdest eingeladen von:' max_uses: one: 1 mal verwendet other: "%{count} mal verwendet" @@ -550,7 +551,7 @@ de: subject: one: "1 neue Mitteilung seit deinem letzten Besuch \U0001F418" other: "%{count} neue Mitteilungen seit deinem letzten Besuch \U0001F418" - title: In deiner Abwesenheit… + title: In deiner Abwesenheit... favourite: body: 'Dein Beitrag wurde von %{name} favorisiert:' subject: "%{name} hat deinen Beitrag favorisiert" @@ -669,6 +670,7 @@ de: video: one: "%{count} Video" other: "%{count} Videos" + boosted_from_html: Geteilt von %{acct_link} content_warning: 'Inhaltswarnung: %{warning}' disallowed_hashtags: one: 'Enthält den unerlaubten Hashtag: %{tags}' @@ -699,6 +701,7 @@ de: themes: contrast: Hoher Kontrast default: Mastodon + mastodon-light: Mastodon (hell) time: formats: default: "%d.%m.%Y %H:%M" diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml index 670f5ec2aa..cec4a586b2 100644 --- a/config/locales/doorkeeper.de.yml +++ b/config/locales/doorkeeper.de.yml @@ -115,5 +115,6 @@ de: title: OAuth-Autorisierung nötig scopes: follow: Konten folgen, blocken, entblocken und entfolgen + push: erhalte Push-Benachrichtigungen von deinem Account read: deine Daten auslesen write: Beiträge in deinem Namen veröffentlichen diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 00341893dc..78cb82abe9 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -514,6 +514,7 @@ eu: '86400': Egun 1 expires_in_prompt: Inoiz ez generate: Sortu + invited_by: 'Honek gonbidatu zaitu:' max_uses: one: Erabilera 1 other: "%{count} erabilera" diff --git a/config/locales/gl.yml b/config/locales/gl.yml index ffa6ebe057..305d5b17fd 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -514,6 +514,7 @@ gl: '86400': 1 día expires_in_prompt: Nunca generate: Xerar + invited_by: 'Vostede foi convidada por:' max_uses: one: 1 uso other: "%{count} usos" diff --git a/config/locales/it.yml b/config/locales/it.yml index a4733024bf..cc79f352bd 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -157,13 +157,17 @@ it: confirm_user: "%{name} ha confermato l'indirizzo email per l'utente %{target}" create_custom_emoji: "%{name} ha caricato un nuovo emoji %{target}" create_domain_block: "%{name} ha bloccato il dominio %{target}" + create_email_domain_block: "%{name} ha messo il dominio email %{target} nella blacklist" destroy_domain_block: "%{name} ha sbloccato il dominio %{target}" + destroy_email_domain_block: "%{name}ha messo il dominio email %{target} nella whitelist" destroy_status: "%{name} ha eliminato lo status di %{target}" disable_2fa_user: "%{name} ha disabilitato l'obbligo dei due fattori per l'utente %{target}" disable_custom_emoji: "%{name} ha disabilitato l'emoji %{target}" disable_user: "%{name} ha disabilitato il login per l'utente %{target}" enable_custom_emoji: "%{name} ha abilitato l'emoji %{target}" enable_user: "%{name} ha abilitato il login per l'utente %{target}" + memorialize_account: "%{name} ha trasformato l'account di %{target} in una pagina in memoriam" + promote_user: "%{name} ha promosso l'utente %{target}" remove_avatar_user: "%{name} ha eliminato l'avatar di %{target}" reopen_report: "%{name} ha riaperto il rapporto %{target}" reset_password_user: "%{name} ha reimpostato la password dell'utente %{target}" diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index f09f717f0a..596d89d81e 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -3,6 +3,7 @@ de: simple_form: hints: defaults: + autofollow: Leute die sich über deine Einladung registrieren werden dir automatisch folgen avatar: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 400×400 px herunterskaliert bot: Dieser Account führt hauptsächlich automatische Aktionen aus und wird möglicherweise nicht überwacht digest: Wenn du lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen in deiner Abwesenheit zugeschickt @@ -15,7 +16,7 @@ de: note: one: 1 Zeichen verbleibt other: %{count} Zeichen verbleiben - setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt + 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_theme: Wirkt sich darauf aus, wie Mastodon aussieht, egal auf welchem Gerät du eingeloggt bist. imports: @@ -28,6 +29,7 @@ de: name: Bezeichnung value: Inhalt defaults: + autofollow: Einladen, um deinen Account zu folgen avatar: Profilbild bot: Dies ist ein bot Benutzer confirm_new_password: Neues Passwort bestätigen @@ -52,6 +54,7 @@ de: setting_default_sensitive: Medien immer als heikel markieren setting_delete_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag gelöscht wird setting_display_sensitive_media: Medien, die als heikel markiert sind, immer anzeigen + setting_hide_network: Verstecke dein Netzwerk setting_noindex: Suchmaschinen-Indexierung verhindern setting_reduce_motion: Bewegung in Animationen verringern setting_system_font_ui: Standardschriftart des Systems verwenden diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml index c235929ad0..884c3a989b 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -3,6 +3,7 @@ eo: simple_form: hints: defaults: + autofollow: Homoj, kiuj registriĝos per la invito aŭtomate sekvos vin avatar: Formato PNG, GIF aŭ JPG. Ĝis 2MB. Estos malgrandigita al 400x400px bot: Tiu konto ĉefe faras aŭtomatajn agojn, kaj povas esti ne kontrolata digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto @@ -28,6 +29,7 @@ eo: name: Etikedo value: Enhavo defaults: + autofollow: Inviti al sekvi vian konton avatar: Profilbildo bot: Tio estas robota konto confirm_new_password: Konfirmi novan pasvorton diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index f89786dc9e..ff34fdf503 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -3,6 +3,7 @@ eu: simple_form: hints: defaults: + autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko zaituzte avatar: PNG, GIF edo JPG. Gehienez 2MB. 400x400px neurrira eskalatuko da bot: Kontu honek nagusiki automatizatutako ekintzak burutzen ditu eta agian ez du inork monitorizatzen digest: Soilik jarduerarik gabeko epe luze bat eta gero, eta soilik ez zeudela mezu pertsonalen bat jaso baduzu @@ -28,6 +29,7 @@ eu: name: Etiketa value: Edukia defaults: + autofollow: Gonbidatu zure kontua jarraitzera avatar: Abatarra bot: Hau bot kontu bat da confirm_new_password: Berretsi pasahitz berria diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 8af0201e6a..5da562e19f 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -3,6 +3,7 @@ fr: simple_form: hints: defaults: + autofollow: Les personnes qui s'inscrivent grâce à l'invitation vous suivront automatiquement avatar: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à 400x400px bot: Ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé digest: Uniquement envoyé après une longue période d’inactivité et uniquement si vous avez reçu des messages personnels pendant votre absence @@ -28,6 +29,7 @@ fr: name: Étiquette value: Contenu defaults: + autofollow: Invitation à suivre votre compte avatar: Image de profil bot: Ceci est un robot confirm_new_password: Confirmation du nouveau mot de passe diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index f621d35878..f4e1ec6405 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -3,6 +3,7 @@ gl: simple_form: hints: defaults: + autofollow: As persoas que se conectaron a través de un convite seguirana automáticamente a vostede avatar: PNG, GIF ou JPG. Máximo 2MB. Será reducida a 400x400px bot: Esta conta realiza principalmente accións automatizadas e podería non estar monitorizada digest: Enviar só tras un longo período de inactividade e só si recibeu algunha mensaxe personal na súa ausencia @@ -28,6 +29,7 @@ gl: name: Etiqueta value: Contido defaults: + autofollow: Convide a seguir a súa conta avatar: Avatar bot: Esta conta é de un bot confirm_new_password: Confirme o novo contrasinal diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index 6a0658395e..9483432407 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -3,6 +3,7 @@ it: simple_form: hints: defaults: + autofollow: Le persone che si iscrivono attraverso l'invito ti seguiranno automaticamente avatar: PNG, GIF o JPG. Al massimo 2MB. Verranno scalate a 400x400px bot: Questo account esegue principalmente operazioni automatiche e potrebbe non essere tenuto sotto controllo da una persona digest: Inviata solo dopo un lungo periodo di inattività e solo se hai ricevuto qualche messaggio personale in tua assenza @@ -28,6 +29,7 @@ it: name: Etichetta value: Contenuto defaults: + autofollow: Invita a seguire il tuo account avatar: Avatar bot: Questo account è un bot confirm_new_password: Conferma nuova password From 50689f0d41b1f02c2d26c353571dfd15d8a4f186 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 18 Jun 2018 17:27:05 +0200 Subject: [PATCH 18/32] Create special case to prefer "jpeg" over "jpe" file extension (#7841) --- app/models/concerns/attachmentable.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index 6f8489b89b..db63c3ecac 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -41,7 +41,9 @@ module Attachmentable extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions original_extension = Paperclip::Interpolations.extension(attachment, :original) + proper_extension = extensions_for_mime_type.first.to_s + proper_extension = 'jpeg' if proper_extension == 'jpe' - extensions_for_mime_type.include?(original_extension) ? original_extension : extensions_for_mime_type.first + extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension end end From 908a9671d0e7bcf1c6bea180e2e13be84485694d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 18 Jun 2018 22:43:01 +0200 Subject: [PATCH 19/32] Serialize language into ActivityPub JSON (#7840) * Serialize language into ActivityPub JSON * Only use contentMap if language is present --- app/serializers/activitypub/note_serializer.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index ddafb540d0..eafd409ba1 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -1,12 +1,15 @@ # frozen_string_literal: true class ActivityPub::NoteSerializer < ActiveModel::Serializer - attributes :id, :type, :summary, :content, + attributes :id, :type, :summary, :in_reply_to, :published, :url, :attributed_to, :to, :cc, :sensitive, :atom_uri, :in_reply_to_atom_uri, :conversation + attribute :content, unless: :language? + attribute :content_map, if: :language? + has_many :media_attachments, key: :attachment has_many :virtual_tags, key: :tag @@ -26,6 +29,14 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer Formatter.instance.format(object) end + def content_map + { object.language => Formatter.instance.format(object) } + end + + def language? + object.language.present? + end + def in_reply_to return unless object.reply? && !object.thread.nil? From a04dca36a365e3f7f5f22e10d103245a4a8758f3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 18 Jun 2018 23:01:52 +0200 Subject: [PATCH 20/32] Bump version to 2.4.2rc2 --- lib/mastodon/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 18055b3f73..7ba71ba0ec 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc1' + 'rc2' end def to_a From fc09b3722a1d2489044952f2d4bddc145473f5a5 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 18 Jun 2018 23:58:13 +0200 Subject: [PATCH 21/32] Always send content for backwards-compatibility (#7844) --- app/serializers/activitypub/note_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index eafd409ba1..82b7ffe95c 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -7,7 +7,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer :atom_uri, :in_reply_to_atom_uri, :conversation - attribute :content, unless: :language? + attribute :content attribute :content_map, if: :language? has_many :media_attachments, key: :attachment From 1a9124f50b6a41137787ddc95e573255da712660 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 19 Jun 2018 00:19:17 +0200 Subject: [PATCH 22/32] Update bcrypt to 3.1.12 fix issue with Fedora (#7845) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fd4452f7d5..a99575147d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) aws-sigv4 (1.0.2) - bcrypt (3.1.11) + bcrypt (3.1.12) benchmark-ips (2.7.2) better_errors (2.4.0) coderay (>= 1.0.0) From 86cce466b6e07e989e423c41394a77b2fe9d3e67 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 19 Jun 2018 00:19:54 +0200 Subject: [PATCH 23/32] Bump version to 2.4.2rc3 --- lib/mastodon/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 7ba71ba0ec..28938782c8 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc2' + 'rc3' end def to_a From d017f240f9a5fe92ff734a866c8eac669e7257ec Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 19 Jun 2018 01:45:00 +0200 Subject: [PATCH 24/32] Bump version to 2.4.2 --- lib/mastodon/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 28938782c8..45211f5358 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc3' + '' end def to_a From 2a1089839db64ceb2e9f9d3d62217da3812d3ad0 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 19 Jun 2018 02:25:29 +0200 Subject: [PATCH 25/32] Weblate translations (2018-06-19) (#7847) * Translated using Weblate (Dutch) Currently translated at 100.0% (623 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Greek) Currently translated at 99.6% (621 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Japanese) Currently translated at 92.9% (66 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Arabic) Currently translated at 97.1% (69 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Catalan) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 95.8% (597 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 94.3% (67 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Greek) Currently translated at 99.6% (621 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Dutch) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Persian) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Korean) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Slovak) Currently translated at 96.3% (600 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.7% (68 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Normalize --- app/javascript/mastodon/locales/fa.json | 10 +++++----- app/javascript/mastodon/locales/nl.json | 10 +++++----- app/javascript/mastodon/locales/sk.json | 8 ++++---- config/locales/ar.yml | 8 ++++++++ config/locales/ca.yml | 1 + config/locales/el.yml | 6 ++++-- config/locales/ja.yml | 1 + config/locales/nl.yml | 1 + config/locales/pl.yml | 2 ++ config/locales/simple_form.ar.yml | 8 +++++++- config/locales/simple_form.ca.yml | 8 +++++++- config/locales/simple_form.ja.yml | 6 ++++++ config/locales/simple_form.ko.yml | 8 +++++++- config/locales/simple_form.nl.yml | 8 +++++++- config/locales/simple_form.pl.yml | 12 ++++++++++-- config/locales/simple_form.sk.yml | 4 +++- config/locales/sk.yml | 1 + 17 files changed, 79 insertions(+), 23 deletions(-) diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 33a515ecfb..ff039324dd 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -59,7 +59,7 @@ "column_header.show_settings": "نمایش تنظیمات", "column_header.unpin": "رهاکردن", "column_subheading.settings": "تنظیمات", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "فقط عکس و ویدیو", "compose_form.direct_message_warning": "این بوق تنها به کاربرانی که از آن‌ها نام برده شده فرستاده خواهد شد.", "compose_form.direct_message_warning_learn_more": "بیشتر بدانید", "compose_form.hashtag_warning": "از آن‌جا که این بوق فهرست‌نشده است، در نتایج جستجوی هشتگ‌ها پیدا نخواهد شد. تنها بوق‌های عمومی را می‌توان با جستجوی هشتگ پیدا کرد.", @@ -114,13 +114,13 @@ "empty_column.public": "این‌جا هنوز چیزی نیست! خودتان چیزی بنویسید یا کاربران دیگر را پی بگیرید تا این‌جا پر شود", "follow_request.authorize": "اجازه دهید", "follow_request.reject": "اجازه ندهید", - "getting_started.developers": "Developers", + "getting_started.developers": "برای برنامه‌نویسان", "getting_started.documentation": "راهنما", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "یافتن دوستان از توییتر", "getting_started.heading": "آغاز کنید", - "getting_started.invite": "Invite people", + "getting_started.invite": "دعوت از دوستان", "getting_started.open_source_notice": "ماستدون یک نرم‌افزار آزاد است. می‌توانید در ساخت آن مشارکت کنید یا مشکلاتش را در {github} گزارش دهید.", - "getting_started.security": "Security", + "getting_started.security": "امنیت", "getting_started.terms": "شرایط استفاده", "home.column_settings.advanced": "پیشرفته", "home.column_settings.basic": "اصلی", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 8c6f7cee0b..891e5b45b2 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -59,7 +59,7 @@ "column_header.show_settings": "Instellingen tonen", "column_header.unpin": "Losmaken", "column_subheading.settings": "Instellingen", - "community.column_settings.media_only": "Media Only", + "community.column_settings.media_only": "Alleen media", "compose_form.direct_message_warning": "Deze toot wordt alleen naar vermelde gebruikers verstuurd. Echter, de beheerders en moderatoren van jouw en de ontvangende Mastodonserver(s) kunnen dit bericht mogelijk wel bekijken.", "compose_form.direct_message_warning_learn_more": "Meer leren", "compose_form.hashtag_warning": "Deze toot valt niet onder een hashtag te bekijken, omdat deze niet op openbare tijdlijnen wordt getoond. Alleen openbare toots kunnen via hashtags gevonden worden.", @@ -114,13 +114,13 @@ "empty_column.public": "Er is hier helemaal niks! Toot iets in het openbaar of volg mensen van andere servers om het te vullen", "follow_request.authorize": "Goedkeuren", "follow_request.reject": "Afkeuren", - "getting_started.developers": "Developers", + "getting_started.developers": "Ontwikkelaars", "getting_started.documentation": "Documentatie", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "Vind vrienden van Twitter", "getting_started.heading": "Aan de slag", - "getting_started.invite": "Invite people", + "getting_started.invite": "Mensen uitnodigen", "getting_started.open_source_notice": "Mastodon is vrije software. Je kunt bijdragen of problemen melden op GitHub via {github}.", - "getting_started.security": "Security", + "getting_started.security": "Beveiliging", "getting_started.terms": "Voorwaarden", "home.column_settings.advanced": "Geavanceerd", "home.column_settings.basic": "Algemeen", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 394c5cef40..efe0a2f30c 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -114,13 +114,13 @@ "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne alebo začnite sledovať používateľov z iných Mastodon serverov aby tu niečo pribudlo", "follow_request.authorize": "Povoľ prístup", "follow_request.reject": "Odmietni", - "getting_started.developers": "Developers", + "getting_started.developers": "Vývojári", "getting_started.documentation": "Dokumentácia", - "getting_started.find_friends": "Find friends from Twitter", + "getting_started.find_friends": "Nájdi priateľov z Twitteru", "getting_started.heading": "Začni tu", - "getting_started.invite": "Invite people", + "getting_started.invite": "Pozvať ľudí", "getting_started.open_source_notice": "Mastodon má otvorený kód. Nahlásiť chyby, alebo prispieť môžeš na GitHube v {github}.", - "getting_started.security": "Security", + "getting_started.security": "Zabezpečenie", "getting_started.terms": "Podmienky prevozu", "home.column_settings.advanced": "Pokročilé", "home.column_settings.basic": "Základné", diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 0ee607db7f..bea04e9425 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -455,6 +455,7 @@ ar: '422': content: فشل التحقق الآمن. ربما منعتَ كعكات الكوكيز ؟ title: فشِل التحقق الآمن + '429': طلبات كثيرة جدا '500': content: نحن متأسفون، لقد حدث خطأ ما مِن جانبنا. title: هذه الصفحة خاطئة @@ -476,6 +477,9 @@ ar: followers_count: عدد المتابِعين lock_link: قم بتجميد حسابك purge: تنحية من بين متابعيك + success: + one: جارية عملية حظر المتابِعين بسلاسة من نطاق آخر ... + other: جارية عملية حظر المتابِعين بسلاسة من %{count} نطاقات أخرى ... unlocked_warning_title: إنّ حسابك غير مقفل generic: changes_saved_msg: تم حفظ التعديلات بنجاح ! @@ -658,6 +662,10 @@ ar: one: "%{count} فيديو" other: "%{count} فيديوهات" content_warning: 'تحذير عن المحتوى : %{warning}' + disallowed_hashtags: + one: 'يحتوي على وسم ممنوع : %{tags}' + other: 'يحتوي على وسوم ممنوعة : %{tags}' + language_detection: اكتشاف اللغة تلقائيا open_in_web: إفتح في الويب over_character_limit: تم تجاوز حد الـ %{max} حرف المسموح بها pin_errors: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 0b403c5e4e..3cd4281f09 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -675,6 +675,7 @@ ca: disallowed_hashtags: one: 'conté una etiqueta no permesa: %{tags}' other: 'conté les etiquetes no permeses: %{tags}' + language_detection: Detecta automàticament el llenguatge open_in_web: Obre en la web over_character_limit: Límit de caràcters de %{max} superat pin_errors: diff --git a/config/locales/el.yml b/config/locales/el.yml index 6bcf0ad46e..e160396f3d 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -444,11 +444,11 @@ el: deletes: bad_password_msg: Καλή προσπάθεια χάκερς! Λάθος συνθηματικό confirm_password: Γράψε το τρέχον συνθηματικό σου για να πιστοποιήσεις την ταυτότητά σου - description_html: Αυτό θα οριστικά και αμετάκλητα διαγράψει το περιεχόμενο του λογαριασμού σου και θα τον απενεργοποιήσει. Το όνομα χρήστη θα παραμείνει δεσμευμένο για να αποφευχθούν μελλοντικές πλαστοπροσωπίες. + description_html: Αυτό θα διαγράψει οριστικά και αμετάκλητα το περιεχόμενο του λογαριασμού σου και θα τον απενεργοποιήσει. Το όνομα χρήστη θα παραμείνει δεσμευμένο για να αποφευχθούν μελλοντικές πλαστοπροσωπίες. proceed: Διαγραφή λογαριασμού success_msg: Ο λογαριασμός σου διαγράφηκε με επιτυχία warning_html: Μόνο η διαγραφή περιεχομένου από αυτό τον συγκεκριμένο κόμβο είναι εγγυημένη. Το περιεχόμενο που έχει διαμοιραστεί ευρέως είναι πιθανό να αφήσει ίχνη. Όσοι διακομιστές είναι εκτός σύνδεσης και όσοι έχουν διακόψει τη λήψη των ενημερώσεων του κόμβου σου, δε θα ενημερώσουν τις βάσεις δεδομένων τους. - warning_title: Διαθεσιμότητα περιεχομένου προς διανομή + warning_title: Διαθεσιμότητα ήδη διανεμημένου περιεχομένου errors: '403': Δεν έχεις δικαίωμα πρόσβασης σε αυτή τη σελίδα. '404': Η σελίδα που ψάχνεις δεν υπάρχει. @@ -514,6 +514,7 @@ el: '86400': 1 μέρα expires_in_prompt: Ποτέ generate: Δημιούργησε + invited_by: 'Σε προσκάλεσε ο/η:' max_uses: one: 1 χρήσης other: "%{count} χρήσεων" @@ -673,6 +674,7 @@ el: disallowed_hashtags: one: 'περιέχει μη επιτρεπτή ταμπέλα: %{tags}' other: 'περιέχει μη επιτρεπτές ταμπέλες: %{tags}' + language_detection: Αυτόματη αναγνώριση γλώσσας open_in_web: Δες στο διαδίκτυο over_character_limit: υπέρβαση μέγιστου ορίου %{max} χαρακτήρων pin_errors: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 94a0c817cf..ffc450038e 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -675,6 +675,7 @@ ja: disallowed_hashtags: one: '許可されていないハッシュタグが含まれています: %{tags}' other: '許可されていないハッシュタグが含まれています: %{tags}' + language_detection: 自動的に言語を検出する open_in_web: Webで開く over_character_limit: 上限は %{max}文字までです pin_errors: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index df655c5463..d6d2183cf4 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -675,6 +675,7 @@ nl: disallowed_hashtags: one: 'bevatte een niet toegestane hashtag: %{tags}' other: 'bevatte niet toegestane hashtags: %{tags}' + language_detection: Taal automatisch detecteren open_in_web: In de webapp openen over_character_limit: Limiet van %{max} tekens overschreden pin_errors: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 3e342da425..94d1e6c7c3 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -517,6 +517,7 @@ pl: '86400': dobie expires_in_prompt: Nigdy generate: Wygeneruj + invited_by: 'Zostałeś zaproszony przez:' max_uses: few: "%{count} użycia" many: "%{count} użyć" @@ -687,6 +688,7 @@ pl: disallowed_hashtags: one: 'zawiera niedozwolony hashtag: %{tags}' other: 'zawiera niedozwolone hashtagi: %{tags}' + language_detection: Automatycznie wykrywaj język open_in_web: Otwórz w przeglądarce over_character_limit: limit %{max} znaków przekroczony pin_errors: diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index 06f9613412..d560a92289 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -12,10 +12,12 @@ ar: other: %{count} حرف باق fields: يُمكنك عرض 4 عناصر على شكل جدول في ملفك الشخصي header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 700x335px + locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات locked: يتطلب منك الموافقة يدويا على طلبات المتابعة note: one: 1 حرف باق other: %{count} حرف باق + setting_default_language: يمكن الكشف التلقائي للّغة اللتي استخدمتها في تحرير تبويقاتك ، غيرَ أنّ العملية ليست دائما دقيقة setting_hide_network: الحسابات التي تُتابعها و التي تُتابِعك على حد سواء لن تُعرَض على صفحتك الشخصية setting_noindex: ذلك يؤثر على حالة ملفك الشخصي و صفحاتك setting_theme: ذلك يؤثر على الشكل الذي سيبدو عليه ماستدون عندما تقوم بالدخول مِن أي جهاز. @@ -23,6 +25,8 @@ ar: data: ملف CSV تم تصديره مِن مثيل خادوم ماستدون آخر sessions: otp: 'قم بإدخال رمز المصادقة بخطوتين الذي قام بتوليده تطبيق جهازك أو إستخدم أحد رموز النفاذ الإحتياطية :' + user: + chosen_languages: لن تظهر على الخيوط العمومية إلّا التبويقات المنشورة في اللغات المختارة labels: account: fields: @@ -32,6 +36,7 @@ ar: autofollow: إرسال دعوة لمتابعة حسابك avatar: الصورة الرمزية bot: إنّ هذا الحساب روبوت آلي + chosen_languages: تصفية اللغات confirm_new_password: تأكيد كلمة السر الجديدة confirm_password: تأكيد كلمة السر current_password: كلمة السر الحالية @@ -41,7 +46,7 @@ ar: expires_in: تنتهي مدة صلاحيته بعد fields: واصفات بيانات الملف الشخصي header: الرأسية - locale: اللغة + locale: لغة الواجهة locked: تجميد الحساب max_uses: عدد مرات استخدام الرابط new_password: كلمة السر الجديدة @@ -50,6 +55,7 @@ ar: password: كلمة السر setting_auto_play_gif: تشغيل تلقائي لِوَسائط جيف المتحركة setting_boost_modal: إظهار مربع حوار للتأكيد قبل ترقية أي تبويق + setting_default_language: لغة النشر setting_default_privacy: خصوصية المنشور setting_default_sensitive: إعتبر الوسائط دائما كمحتوى حساس setting_delete_modal: إظهار مربع حوار للتأكيد قبل حذف أي تبويق diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index 43230e5cf7..eb0d67dfda 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -12,10 +12,12 @@ ca: other: %{count} càracters restans fields: Pots tenir fins a 4 elements que es mostren com a taula al teu perfil header: PNG, GIF o JPG. Màxim 2MB. S'escalarà a 700x335px + locale: El llenguatge de l’interfície d’usuari, els correus i les notificacions push locked: Requereix que aprovis manualment els seguidors note: one: 1 càracter restant other: %{count} caràcters restants + setting_default_language: La llengua dels teus toots pot ser detectada automàticament però no sempre acuradament 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_theme: Afecta l'aspecte de Mastodon quan es visita des de qualsevol dispositiu. @@ -23,6 +25,8 @@ ca: data: Fitxer CSV exportat des de una altra instància de Mastodon sessions: otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:' + user: + chosen_languages: Quan estigui marcat, només es mostraran els toots de les llengües seleccionades en les línies de temps públiques labels: account: fields: @@ -32,6 +36,7 @@ ca: autofollow: Convida a seguir el teu compte avatar: Avatar bot: Aquest compte és un bot + chosen_languages: Filtrar llengües confirm_new_password: Confirma la contrasenya nova confirm_password: Confirma la contrasenya current_password: Contrasenya actual @@ -41,7 +46,7 @@ ca: expires_in: Expira després fields: Metadades del perfil header: Capçalera - locale: Llengua + locale: Llengua de la interfície locked: Fes aquest compte privat max_uses: Nombre màxim d'usos new_password: Contrasenya nova @@ -50,6 +55,7 @@ ca: password: Contrasenya setting_auto_play_gif: Reproducció automàtica de GIFs animats setting_boost_modal: Mostra la finestra de confirmació abans d'un retoot + setting_default_language: Llengua de les publicacions setting_default_privacy: Privacitat de les publicacions setting_default_sensitive: Marca sempre els elements multimèdia com a sensibles setting_delete_modal: Mostra la finestra de confirmació abans de suprimir un toot diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index dd5caa0ba8..4a475f8315 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -10,8 +10,10 @@ ja: display_name: あと%{count}文字入力できます。 fields: プロフィールに表として4つまでの項目を表示することができます header: 2MBまでのPNG、GIF、JPGが利用可能です。 700x335pxまで縮小されます + locale: ユーザーインターフェース、メールやプッシュ通知の言語 locked: フォロワーを手動で承認する必要があります note: あと%{count}文字入力できます。 + setting_default_language: トゥートの言語は自動的に検出されますが、必ずしも正確とは限りません setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします setting_noindex: 公開プロフィールおよび各投稿ページに影響します setting_theme: ログインしている全てのデバイスで適用されるデザインです。 @@ -19,6 +21,8 @@ ja: data: 他の Mastodon インスタンスからエクスポートしたCSVファイルを選択して下さい sessions: otp: '携帯電話のアプリで生成された二段階認証コードを入力するか、リカバリーコードを使用してください:' + user: + chosen_languages: 選択すると、選択した言語のトゥートのみが公開タイムラインに表示されるようになります labels: account: fields: @@ -28,6 +32,7 @@ ja: autofollow: あなたのアカウントに招待する avatar: アイコン bot: これは BOT アカウントです + chosen_languages: 除外する言語 confirm_new_password: 新しいパスワード（確認用） confirm_password: パスワード（確認用） current_password: 現在のパスワード @@ -46,6 +51,7 @@ ja: password: パスワード setting_auto_play_gif: アニメーションGIFを自動再生する setting_boost_modal: ブーストする前に確認ダイアログを表示する + setting_default_language: 投稿する言語 setting_default_privacy: 投稿の公開範囲 setting_default_sensitive: メディアを常に閲覧注意としてマークする setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 421357b492..7eb0da8b10 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -12,10 +12,12 @@ ko: other: %{count} 글자 남음 fields: 당신의 프로파일에 최대 4개까지 표 형식으로 나타낼 수 있습니다 header: PNG, GIF 혹은 JPG. 최대 2MB. 700x335px로 다운스케일 됨 + locale: 유저 인터페이스, 이메일, 푸시 알림 언어 locked: 수동으로 팔로워를 승인하고, 기본 툿 프라이버시 설정을 팔로워 전용으로 변경 note: one: 1 글자 남음 other: %{count} 글자 남음 + setting_default_language: 작성한 툿의 언어는 자동으로 인식할 수 있지만, 언제나 정확한 건 아닙니다 setting_hide_network: 나를 팔로우 하는 사람들과 내가 팔로우 하는 사람들이 내 프로필에 표시되지 않게 합니다 setting_noindex: 공개 프로필 및 각 툿페이지에 영향을 미칩니다 setting_theme: 로그인중인 모든 디바이스에 적용되는 디자인입니다. @@ -23,6 +25,8 @@ ko: data: 다른 마스토돈 인스턴스에서 추출된 CSV 파일 sessions: otp: '휴대전화에서 생성 된 2단계 인증 코드를 입력하거나, 복구 코드 중 하나를 사용하세요:' + user: + chosen_languages: 체크하면, 선택 된 언어들만 공개 타임라인에 보여집니다 labels: account: fields: @@ -32,6 +36,7 @@ ko: autofollow: 초대를 통한 팔로우 avatar: 아바타 bot: 이것은 봇 계정입니다 + chosen_languages: 언어 필터링 confirm_new_password: 새로운 비밀번호 다시 입력 confirm_password: 현재 비밀번호 다시 입력 current_password: 현재 비밀번호 입력 @@ -41,7 +46,7 @@ ko: expires_in: 만료시각 fields: 프로필 메타데이터 header: 헤더 - locale: 언어 + locale: 인터페이스 언어 locked: 계정 잠금 max_uses: 사용 횟수 제한 new_password: 새로운 비밀번호 입력 @@ -50,6 +55,7 @@ ko: password: 비밀번호 setting_auto_play_gif: 애니메이션 GIF를 자동 재생 setting_boost_modal: 부스트 전 확인 창을 표시 + setting_default_language: 게시물 언어 setting_default_privacy: 툿 프라이버시 setting_default_sensitive: 미디어를 언제나 민감한 컨텐츠로 설정 setting_delete_modal: 툿 삭제 전 확인 창을 표시 diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index f3320f46bc..591a9f2d9f 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -12,10 +12,12 @@ nl: other: %{count} tekens over fields: Je kan maximaal 4 items als een tabel op je profiel weergeven header: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 700x335px + locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen locked: Vereist dat je handmatig volgers moet accepteren note: one: 1 teken over other: %{count} tekens over + setting_default_language: De taal van jouw toots kan automatisch worden gedetecteerd, maar het is niet altijd accuraat 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_theme: Heeft invloed op hoe de webapp van Mastodon eruitziet (op elk apparaat waarmee je inlogt). @@ -23,6 +25,8 @@ nl: data: CSV-bestand dat op een andere Mastodonserver werd geëxporteerd sessions: otp: Voer de tweestaps-aanmeldcode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes. + user: + chosen_languages: Alleen toots in de aangevinkte talen worden op de openbare tijdlijnen getoond labels: account: fields: @@ -32,6 +36,7 @@ nl: autofollow: Uitnodigen om jouw account te volgen avatar: Avatar bot: Dit is een bot-account + chosen_languages: Talen filteren confirm_new_password: Nieuw wachtwoord bevestigen confirm_password: Wachtwoord bevestigen current_password: Huidig wachtwoord @@ -41,7 +46,7 @@ nl: expires_in: Vervalt na fields: Metadata profiel header: Omslagfoto - locale: Taal + locale: Taal van de gebruikersomgeving locked: Maak account besloten max_uses: Max. aantal keer te gebruiken new_password: Nieuwe wachtwoord @@ -50,6 +55,7 @@ nl: password: Wachtwoord setting_auto_play_gif: Speel geanimeerde GIF's automatisch af setting_boost_modal: Vraag voor het boosten van een toot een bevestiging + setting_default_language: Taal van jouw toots setting_default_privacy: Zichtbaarheid toots setting_default_sensitive: Media altijd als gevoelig markeren setting_delete_modal: Vraag voor het verwijderen van een toot een bevestiging diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 274af2b73b..237bd0342b 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -3,8 +3,9 @@ pl: simple_form: hints: defaults: + autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię śledzić avatar: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 400x400px - bot: Informuje użytkowników, że konto nie jest prowadzone przez człowieka + bot: To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią display_name: few: Pozostały %{count} znaki. @@ -13,12 +14,14 @@ pl: other: Pozostało %{count} znaków fields: Możesz ustawić maksymalnie 4 niestandardowe pola wyświetlane jako tabela na Twoim profilu header: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 700x335px + locale: Język interfejsu, wiadomości e-mail i powiadomieniach push locked: Musisz akceptować prośby o śledzenie note: few: Pozostały %{count} znaki. many: Pozostało %{count} znaków one: Pozostał 1 znak other: Pozostało %{count} znaków + setting_default_language: Język Twoich wpisów może być wykrywany automatycznie, ale nie zawsze jest to dokładne 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_theme: Zmienia wygląd Mastodona po zalogowaniu z dowolnego urządzenia. @@ -26,14 +29,18 @@ pl: data: Plik CSV wyeksportowany z innej instancji Mastodona sessions: otp: 'Wprowadź kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodów zapasowych:' + user: + chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu labels: account: fields: name: Nazwa value: Zawartość defaults: + autofollow: Zapraszaj do śledzenia swojego konta avatar: Awatar bot: To konto jest prowadzone przez bota + chosen_languages: Filtrowanie języków confirm_new_password: Potwierdź nowe hasło confirm_password: Potwierdź hasło current_password: Obecne hasło @@ -43,7 +50,7 @@ pl: expires_in: Wygaśnie po fields: Metadane profilu header: Nagłówek - locale: Język + locale: Język interfejsu locked: Ustaw konto jako prywatne max_uses: Maksymalna liczba użyć new_password: Nowe hasło @@ -52,6 +59,7 @@ pl: password: Hasło setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy setting_boost_modal: Pytaj o potwierdzenie przed podbiciem + setting_default_language: Język wpisów setting_default_privacy: Widoczność wpisów setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index 279e9a9672..7ebd266306 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -13,6 +13,7 @@ sk: other: Ostáva ti %{count} znakov fields: Môžeš mať 4 položky na svojom profile zobrazené vo forme tabuľky header: PNG, GIF alebo JPG. Maximálne 2MB. Bude zmenšený na 700x335px + locale: Jazyk užívateľského rozhrania, emailových a nástenkových oboznámení locked: Vyžaduje manuálne schvalovať sledujúcich note: few: Ostávajú ti %{count} znaky @@ -34,6 +35,7 @@ sk: autofollow: Pozvi k následovaniu tvojho profilu avatar: Avatar bot: Toto je automatizovaný bot účet + chosen_languages: Filtruj jazyky confirm_new_password: Znovu tvoje nové heslo, pre potvrdenie confirm_password: Potvrď heslo current_password: Súčasné heslo @@ -43,7 +45,7 @@ sk: expires_in: Expirovať po fields: Metadáta profilu header: Obrázok v hlavičke - locale: Jazyk + locale: Jazyk rozhrania locked: Zamknúť účet max_uses: Maximálne možno použiť new_password: Nové heslo diff --git a/config/locales/sk.yml b/config/locales/sk.yml index ad5080e6b1..2781915990 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -662,6 +662,7 @@ sk: disallowed_hashtags: one: 'obsahuje nepovolený haštag: %{tags}' other: 'obsahuje nepovolené haštagy: %{tags}' + language_detection: Zisti jazyk automaticky open_in_web: Otvor v okne prehliadača over_character_limit: limit počtu %{max} znakov bol presiahnutý pin_errors: From 80bda9719db387fea9742cef3ff35deee7440afa Mon Sep 17 00:00:00 2001 From: Isao Sugimoto Date: Tue, 19 Jun 2018 11:11:45 +0900 Subject: [PATCH 26/32] fix filter languages label on settings (ja) (#7848) ref: #7823 --- config/locales/simple_form.ja.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 4a475f8315..dcd9ff5b42 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -32,7 +32,7 @@ ja: autofollow: あなたのアカウントに招待する avatar: アイコン bot: これは BOT アカウントです - chosen_languages: 除外する言語 + chosen_languages: 表示する言語 confirm_new_password: 新しいパスワード（確認用） confirm_password: パスワード（確認用） current_password: 現在のパスワード From 926bfce46565a9b33a627fa8e600c39d0140f8b3 Mon Sep 17 00:00:00 2001 From: kedama Date: Wed, 20 Jun 2018 22:22:07 +0900 Subject: [PATCH 27/32] Fix broken single column getting-started menu (Fix #7854) (#7862) * Fix lack of height of the getting-started menu. (Fix #7854) Include the height of navigation bar at the height of getting-started menu. * Remove item "Security" on the getting-started menu. --- app/javascript/mastodon/features/getting_started/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 34c7a42980..99642c9115 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -79,7 +79,7 @@ export default class GettingStarted extends ImmutablePureComponent { const navItems = []; let i = 1; - let height = 0; + let height = (multiColumn) ? 0 : 60; if (multiColumn) { navItems.push( @@ -109,10 +109,9 @@ export default class GettingStarted extends ImmutablePureComponent { navItems.push( , , - ); - height += 34 + 48*2; + height += 34 + 48; } return ( From cd1b90d22326972e31698c2cb9056a833995a08c Mon Sep 17 00:00:00 2001 From: Daigo 3 Dango Date: Wed, 20 Jun 2018 13:22:37 +0000 Subject: [PATCH 28/32] Update sprockets gem (#7858) https://blog.heroku.com/rails-asset-pipeline-vulnerability --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a99575147d..e1929a05c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -567,7 +567,7 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -764,4 +764,4 @@ RUBY VERSION ruby 2.5.0p0 BUNDLED WITH - 1.16.1 + 1.16.2 From c3b40a6950f5e77813c292fc9997cf24b58130ea Mon Sep 17 00:00:00 2001 From: Hinaloe Date: Thu, 21 Jun 2018 03:55:17 +0900 Subject: [PATCH 29/32] Return collect response when fail put cache to storage (#7863) * return collect response when fail put cache to storage * cleanup callback --- .../mastodon/service_worker/entry.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/javascript/mastodon/service_worker/entry.js b/app/javascript/mastodon/service_worker/entry.js index 2435da1170..17b05a837b 100644 --- a/app/javascript/mastodon/service_worker/entry.js +++ b/app/javascript/mastodon/service_worker/entry.js @@ -32,8 +32,11 @@ self.addEventListener('fetch', function(event) { const asyncCache = openWebCache(); event.respondWith(asyncResponse.then( - response => asyncCache.then(cache => cache.put('/', response.clone())) - .then(() => response), + response => { + const clonedResponse = response.clone(); + asyncCache.then(cache => cache.put('/', clonedResponse)).catch(); + return response; + }, () => asyncCache.then(cache => cache.match('/')))); } else if (url.pathname === '/auth/sign_out') { const asyncResponse = fetch(event.request); @@ -58,14 +61,9 @@ self.addEventListener('fetch', function(event) { return asyncResponse.then(response => { if (response.ok) { - const put = cache.put(event.request.url, response.clone()); - - put.catch(() => freeStorage()); - - return put.then(() => { - freeStorage(); - return response; - }); + cache + .put(event.request.url, response.clone()) + .catch(()=>{}).then(freeStorage()).catch(); } return response; From 459394a02021ae927d135669e7472a4c7c32eaec Mon Sep 17 00:00:00 2001 From: Shuhei Kitagawa Date: Thu, 21 Jun 2018 10:40:23 +0900 Subject: [PATCH 30/32] Add missing tests for confirmations controller (#7866) --- .../auth/confirmations_controller_spec.rb | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/spec/controllers/auth/confirmations_controller_spec.rb b/spec/controllers/auth/confirmations_controller_spec.rb index b3af5e0ec8..35eed4f513 100644 --- a/spec/controllers/auth/confirmations_controller_spec.rb +++ b/spec/controllers/auth/confirmations_controller_spec.rb @@ -3,6 +3,8 @@ require 'rails_helper' describe Auth::ConfirmationsController, type: :controller do + render_views + describe 'GET #new' do it 'returns http success' do @request.env['devise.mapping'] = Devise.mappings[:user] @@ -48,4 +50,45 @@ describe Auth::ConfirmationsController, type: :controller do end end end + + describe 'GET #finish_signup' do + subject { get :finish_signup } + + let(:user) { Fabricate(:user) } + before do + sign_in user, scope: :user + @request.env['devise.mapping'] = Devise.mappings[:user] + end + + it 'renders finish_signup' do + is_expected.to render_template :finish_signup + expect(assigns(:user)).to have_attributes id: user.id + end + end + + describe 'PATCH #finish_signup' do + subject { patch :finish_signup, params: { user: { email: email }} } + + let(:user) { Fabricate(:user) } + before do + sign_in user, scope: :user + @request.env['devise.mapping'] = Devise.mappings[:user] + end + + context 'when email is valid' do + let(:email) { 'new_' + user.email } + + it 'redirects to root_path' do + is_expected.to redirect_to root_path + end + end + + context 'when email is invalid' do + let(:email) { '' } + + it 'renders finish_signup' do + is_expected.to render_template :finish_signup + end + end + end end From 7f59206944193591d7aef5cbd73edc7f5303add7 Mon Sep 17 00:00:00 2001 From: Shuhei Kitagawa Date: Thu, 21 Jun 2018 10:41:49 +0900 Subject: [PATCH 31/32] Replace bypass option with bypass_sign_in (#7867) --- app/controllers/auth/confirmations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index a240425cd8..068e71cada 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -10,7 +10,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController return unless request.patch? && params[:user] if @user.update(user_params) @user.skip_reconfirmation! - sign_in(@user, bypass: true) + bypass_sign_in(@user) redirect_to root_path, notice: I18n.t('devise.confirmations.send_instructions') else @show_errors = true From 0c3a337e045dbd4b7be6ae6c3f07969b42f08857 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 21 Jun 2018 23:48:54 +0200 Subject: [PATCH 32/32] Fix confirmations_controller --- app/controllers/auth/confirmations_controller.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 322f8683e8..de0fcd3e32 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -6,12 +6,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController before_action :set_user, only: [:finish_signup] before_action :set_pack - private - - def set_pack - use_pack 'auth' - end - # GET/PATCH /users/:id/finish_signup def finish_signup return unless request.patch? && params[:user] @@ -26,6 +20,10 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController private + def set_pack + use_pack 'auth' + end + def set_user @user = current_user end