diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss index bc99b36a671..ceccc14cd29 100644 --- a/app/assets/stylesheets/forms.scss +++ b/app/assets/stylesheets/forms.scss @@ -14,13 +14,17 @@ code { margin-bottom: 15px; } - .hint { + span.hint { display: block; color: $color3; font-size: 12px; margin-top: 4px; } + p.hint { + margin-bottom: 15px; + } + .label_input { display: flex; diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml index 84f8e788f4d..be5e406c57b 100644 --- a/app/views/about/index.html.haml +++ b/app/views/about/index.html.haml @@ -80,7 +80,7 @@ .info = link_to t('about.terms'), terms_path · - = link_to t('apps'), 'https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/Apps.md' + = link_to t('about.apps'), 'https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/Apps.md' · = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon' · diff --git a/app/views/settings/two_factor_auths/show.html.haml b/app/views/settings/two_factor_auths/show.html.haml index 646369a97d1..87bfadc6921 100644 --- a/app/views/settings/two_factor_auths/show.html.haml +++ b/app/views/settings/two_factor_auths/show.html.haml @@ -3,15 +3,15 @@ .simple_form - if current_user.otp_required_for_login - %p= t('two_factor_auth.instructions_html') + %p.hint= t('two_factor_auth.instructions_html') .qr-code= raw @qrcode.as_svg(padding: 0, module_size: 5) - %p= t('two_factor_auth.plaintext_secret_html', secret: current_user.otp_secret) + %p.hint= t('two_factor_auth.plaintext_secret_html', secret: current_user.otp_secret) - %p= t('two_factor_auth.warning') + %p.hint= t('two_factor_auth.warning') = link_to t('two_factor_auth.disable'), disable_settings_two_factor_auth_path, data: { method: 'POST' }, class: 'block-button' - else - %p= t('two_factor_auth.description_html') + %p.hint= t('two_factor_auth.description_html') = link_to t('two_factor_auth.enable'), enable_settings_two_factor_auth_path, data: { method: 'POST' }, class: 'block-button' diff --git a/config/locales/de.yml b/config/locales/de.yml index 2b91053d9ca..320bd3144f4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,7 +1,6 @@ --- de: about: - about_instance: "%{instance} ist eine Instanz von Mastodon." about_mastodon: Mastodon ist ein freier, quelloffener soziales Netzwerkserver. Eine dezentralisierte Alternative zu kommerziellen Plattformen, verhindert es die Risiken, die entstehen, wenn eine einzelne Firma deine Kommunikation monopolisiert. Jeder kann Mastodon verwenden und ganz einfach am sozialen Netzwerk teilnehmen. get_started: Erste Schritte source_code: Quellcode diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index 97dd9c04943..6412b8b48ba 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -67,6 +67,7 @@ en: application: Application created_at: Authorized date_format: "%Y-%m-%d %H:%M:%S" + scopes: Scopes title: Your authorized applications errors: messages: diff --git a/config/locales/en.yml b/config/locales/en.yml index eaaf853b1d1..3e130aaf84e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,9 +1,9 @@ --- en: about: - about_instance: "%{instance} is a Mastodon instance." about_mastodon: Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly. about_this: About this instance + apps: Apps business_email: 'Business e-mail:' contact: Contact description_headline: What is %{domain}? @@ -20,7 +20,6 @@ en: public: Public timelines features_headline: What sets Mastodon apart get_started: Get started - learn_more: Learn more links: Links other_instances: Other instances source_code: Source code diff --git a/config/locales/es.yml b/config/locales/es.yml index 7a5e0639ac5..19f2c71b8aa 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,7 +1,6 @@ --- es: about: - about_instance: "%{instance} es una instancia de Mastodon." about_mastodon: Mastodon es un servidor de red social libre y de código abierto. Una alternativa descentralizada a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la red social. get_started: Comenzar source_code: Código fuente diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d83952529aa..173e8d16cf2 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,7 +1,6 @@ --- fr: about: - about_instance: "%{instance} est une instance de Mastodon." about_mastodon: Mastodon est un serveur libre de réseautage social. Alternative décentralisée aux plateformes commerciales, la monopolisation de vos communications par une entreprise unique est évitée. Tout un chacun peut faire tourner Mastodon et participer au réseau social de manière transparente. get_started: Rejoindre le réseau source_code: Code source diff --git a/config/locales/hu.yml b/config/locales/hu.yml index ee4157a8148..915d02c198b 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1,7 +1,6 @@ --- hu: about: - about_instance: "%{instance} egy Mastodon másolat." about_mastodon: Mastodon egy szabad, nyílt forráskódú szociális hálózati kiszolgálo. Egy központosítatlan alternatíva a kereskedelmi platformokra, elkerüli a kommunikációd monopolizációját veszélyét. Bárki futtathatja a Mastodon-t és részt vehet a szociális hálózatban. get_started: Első lépések source_code: Forráskód diff --git a/config/locales/pt.yml b/config/locales/pt.yml index abb9ff0b792..ad7d05e3b1e 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1,7 +1,6 @@ --- pt: about: - about_instance: "%{instance} é uma instância de Mastodon." about_mastodon: Mastodon é um servidor de rede social grátis, e open-source. Uma alternativa descentralizada ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Qualquer um pode ter uma instância Mastodon e assim participar na rede social federada sem problemas. get_started: Como começar source_code: Source code diff --git a/config/locales/uk.yml b/config/locales/uk.yml index d82567fea26..27e8135df6b 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1,7 +1,6 @@ --- uk: about: - about_instance: "%{instance} є інстанцією Mastodon." about_mastodon: Mastodon - це вільний соціальний мережевий сервер з відкритим вихідним кодом. Він є децентралізованою альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Будь-який користувач може запустити Mastodon та без проблем брати участь в соціальній мережі. get_started: Почати source_code: Вихідний код diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index a02f28d9887..78c4d46e2c2 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1,10 +1,9 @@ --- zh-CN: about: - about_instance: "%{instance} 源自于 Mastodon。" about_mastodon: Mastodon 开源、自由社交网络。去中心化的商业平台替代，避免单一商业公司垄断沟通。可选择、可信任地任意交流。任何人均可以运行自己的 Mastodon 并进行无缝交流。 about_this: 关于本实例 - business_email: '商务邮件：' + business_email: 商务邮件： contact: 联络 description_headline: 去中心化 %{domain} 是什么？ domain_count_after: 其它实例 @@ -14,13 +13,12 @@ zh-CN: blocks: Rich block and muting tools characters: 每个推多达 500 字符 chronology: 按时间线排序 - ethics: '良心之作：没有广告，没有数据追踪' + ethics: 良心之作：没有广告，没有数据追踪 gifv: GIFV 与小视频 privacy: 细粒度，可按推设置隐私 public: 公共时间线 features_headline: Mastodon 与众不同之处 get_started: 立即开始 - learn_more: 了解更多 links: 链接 other_instances: 其它实例 source_code: 源码 @@ -42,7 +40,7 @@ zh-CN: application_mailer: settings: '更改邮件设置: %{link}' signature: 来自 %{instance} 的提醒 - view: '查看：' + view: 查看： applications: invalid_url: URL 无效 auth: @@ -62,14 +60,14 @@ zh-CN: title: 关注 %{acct} datetime: distance_in_words: - about_x_hours: "大约 %{count} 小时" - about_x_months: "大约 %{count} 月" - about_x_years: "大约 %{count} 年" - almost_x_years: "几乎 %{count} 年" + about_x_hours: 大约 %{count} 小时 + about_x_months: 大约 %{count} 月 + about_x_years: 大约 %{count} 年 + almost_x_years: 几乎 %{count} 年 half_a_minute: 刚刚 less_than_x_minutes: "%{count} 分" less_than_x_seconds: 刚刚 - over_x_years: "超过 %{count} 年" + over_x_years: 超过 %{count} 年 x_days: "%{count} 天" x_minutes: "%{count} 分" x_months: "%{count} 月" @@ -98,7 +96,7 @@ zh-CN: one: "你有一个新提醒 \U0001F418" other: "%{count} 个提醒太多，赶快去看看 \U0001F418" favourite: - body: '%{name} 赞你' + body: "%{name} 赞你" subject: "%{name} 对你点赞" follow: body: "%{name} 关注了你" @@ -147,7 +145,7 @@ zh-CN: disable: 禁用 enable: 启用 instructions_html: "使用 Google Authenticator 或类似 APP 扫描二维码。现在起，APP 将会生成登陆时必须的两步验证码。" - plaintext_secret_html: '密钥： %{secret}' + plaintext_secret_html: 密钥： %{secret} warning: 如果你现在没有 Google Authenticator 或类似授权 APP，你应该先「禁用」本功能，否则你将不能正常登陆。 users: invalid_email: 无效的邮箱