Fix up some localizations

diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
index bc99b36a671bb1a2982fba3370f8cc48c45489ec..ceccc14cd296057baa42fc3c3227c518d253a454 100644 (file)
--- 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 84f8e788f4d94bc0343194389589fc97836bba88..be5e406c57b102d52f3d29962c57dcb0b0d95f8c 100644 (file)
--- 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 646369a97d1d20fec31d8957ba93468e1ca4639d..87bfadc6921d42e94be014f17f6a82c83a49ec91 100644 (file)
--- 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 2b91053d9ca2cb4cee7aa3ca34823e866cb34f77..320bd3144f4e9268ba86d7a489931c13167e05e9 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,7 +1,6 @@
 ---
 de:
   about:
-    about_instance: "<em>%{instance}</em> ist eine Instanz von Mastodon."
     about_mastodon: Mastodon ist ein <em>freier, quelloffener</em> soziales Netzwerkserver. Eine <em>dezentralisierte</em> 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 <em>sozialen Netzwerk</em> teilnehmen.
     get_started: Erste Schritte
     source_code: Quellcode

diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 97dd9c04943405b2ae528688555bbdd672e6a654..6412b8b48ba51e66423bf7292b8fc6765abea106 100644 (file)
--- 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 eaaf853b1d146be02cef19363471a50265a67aa4..3e130aaf84ee6d5c7ed9a48b8fdd608334a3fc11 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,9 +1,9 @@
 ---
 en:
   about:
-    about_instance: "<em>%{instance}</em> is a Mastodon instance."
     about_mastodon: Mastodon is a <em>free, open-source</em> social network. A <em>decentralized</em> alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust &mdash; whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the <em>social network</em> 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 7a5e0639ac5050c9c32dcf9b57f99826eeaa7438..19f2c71b8aa50b7a4a033349408fb4ade40939ca 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,7 +1,6 @@
 ---
 es:
   about:
-    about_instance: "<em>%{instance}</em> es una instancia de Mastodon."
     about_mastodon: Mastodon es un servidor de red social <em>libre y de código abierto</em>. Una alternativa <em>descentralizada</em> 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 <em>red social</em>.
     get_started: Comenzar
     source_code: Código fuente

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d83952529aa366680ca18cd8cefb9a4b9b816f0e..173e8d16cf29291ca672598500f0327707ef4e79 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,7 +1,6 @@
 ---
 fr:
   about:
-    about_instance: "<em>%{instance}</em> est une instance de Mastodon."
     about_mastodon: Mastodon est un serveur <em>libre</em> de réseautage social. Alternative <em>décentralisée</em> 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 <em>réseau social</em> 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 ee4157a81484fa3ef0f836017f026689a4464ce3..915d02c198bff257b5fd62c7681accb1cf3c1144 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1,7 +1,6 @@
 ---
 hu:
   about:
-    about_instance: "<em>%{instance}</em> egy Mastodon másolat."
     about_mastodon: Mastodon egy <em>szabad, nyílt forráskódú</em> szociális hálózati kiszolgálo. Egy <em>központosítatlan</em> 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 <em>szociális hálózatban</em>.
     get_started: Első lépések
     source_code: Forráskód

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index abb9ff0b792e4f9e143c6e479f56b13d94318ae9..ad7d05e3b1ee35bc0f47138048ac93e17f3e0289 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1,7 +1,6 @@
 ---
 pt:
   about:
-    about_instance: "<em>%{instance}</em> é uma instância de Mastodon."
     about_mastodon: Mastodon é um servidor de rede social <em>grátis, e open-source</em>. Uma alternativa <em>descentralizada</em> á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 <em>rede social federada</em> sem problemas.
     get_started: Como começar
     source_code: Source code

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index d82567fea26e7d4bc43dbaece75aa8c29fb3b1dc..27e8135df6bd8f7ce6575d8f87fd26dee9cd2bdc 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1,7 +1,6 @@
 ---
 uk:
   about:
-    about_instance: "<em>%{instance}</em> є інстанцією Mastodon."
     about_mastodon: Mastodon <em> - це вільний</em> соціальний мережевий сервер <em> з відкритим вихідним кодом</em>. Він є <em>децентралізованою</em> альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Будь-який користувач може запустити Mastodon та без проблем брати участь в <em>соціальній мережі</em>.
     get_started: Почати
     source_code: Вихідний код

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a02f28d9887c65b121660de863d38077d85d4eca..78c4d46e2c2c62a86d8cff12d0b4456a2c6d8423 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,10 +1,9 @@
 ---
 zh-CN:
   about:
-    about_instance: "<em>%{instance}</em> 源自于 Mastodon。"
     about_mastodon: Mastodon <em>开源、自由</em>社交网络。<em>去中心化</em>的商业平台替代，避免单一商业公司垄断沟通。可选择、可信任地任意交流。任何人均可以运行自己的 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: "<strong>使用 Google Authenticator 或类似 APP 扫描二维码</strong>。现在起，APP 将会生成登陆时必须的两步验证码。"
-    plaintext_secret_html: '密钥： <samp>%{secret}</samp>'
+    plaintext_secret_html: 密钥： <samp>%{secret}</samp>
     warning: 如果你现在没有 Google Authenticator 或类似授权 APP，你应该先「禁用」本功能，否则你将不能正常登陆。
   users:
     invalid_email: 无效的邮箱