From 8fcfcddc8fc3d36a5b1daa1f74e69512fc66d565 Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Thu, 21 Sep 2017 02:41:35 +0900 Subject: [PATCH] Fix theme translations alphabetically (#5031) --- config/locales/en.yml | 4 ++-- config/locales/ja.yml | 4 ++-- config/locales/oc.yml | 4 ++-- config/locales/pl.yml | 4 ++-- config/locales/simple_form.en.yml | 2 +- config/locales/simple_form.ja.yml | 2 +- config/locales/simple_form.oc.yml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 0f3812aff..13280303c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -461,8 +461,6 @@ en: settings: Settings two_factor_authentication: Two-factor Authentication your_apps: Your applications - themes: - default: Mastodon statuses: open_in_web: Open in web over_character_limit: character limit of %{max} exceeded @@ -554,6 +552,8 @@ en:

Originally adapted from the Discourse privacy policy.

title: "%{instance} Terms of Service and Privacy Policy" + themes: + default: Mastodon time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index be9e355ef..5ffc09ab9 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -460,8 +460,6 @@ ja: settings: 設定 two_factor_authentication: 二段階認証 your_apps: アプリ - themes: - default: Mastodon statuses: open_in_web: Webで開く over_character_limit: 上限は %{max}文字までです @@ -553,6 +551,8 @@ ja:

オリジナルの出典 Discourse privacy policy.

title: "%{instance} 利用規約・プライバシーポリシー" + themes: + default: Mastodon time: formats: default: "%Y年%m月%d日 %H:%M" diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 8f3119c69..584f4c609 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -539,8 +539,6 @@ oc: settings: Paramètres two_factor_authentication: Autentificacion en dos temps your_apps: Vòstras aplicacions - themes: - default: Mastodon statuses: open_in_web: Dobrir sul web over_character_limit: limit de %{max} caractèrs passat @@ -632,6 +630,8 @@ oc:

Prima adaptacion de la politica de confidencialitat de Discourse.

title: Condicions d’utilizacion e politica de confidencialitat de %{instance} + themes: + default: Mastodon time: formats: default: Lo %d %b de %Y a %Ho%M diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 91754429e..8254e3293 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -462,8 +462,6 @@ pl: settings: Ustawienia two_factor_authentication: Uwierzytelnianie dwuetapowe your_apps: Twoje aplikacje - themes: - default: Mastodon statuses: open_in_web: Otwórz w przeglądarce over_character_limit: limit %{max} znaków przekroczony @@ -555,6 +553,8 @@ pl:

Tekst bazuje na polityce prywatności Discourse.

title: Zasady korzystania i polityka prywatności %{instance} + themes: + default: Mastodon time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c535a22fe..6f8b88898 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -44,8 +44,8 @@ en: setting_delete_modal: Show confirmation dialog before deleting a toot setting_noindex: Opt-out of search engine indexing setting_system_font_ui: Use system's default font - setting_unfollow_modal: Show confirmation dialog before unfollowing someone setting_theme: Site theme + setting_unfollow_modal: Show confirmation dialog before unfollowing someone severity: Severity type: Import type username: Username diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 0e1b48cf0..17b35ba8f 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -40,8 +40,8 @@ ja: setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する setting_noindex: 検索エンジンによるインデックスを拒否する setting_system_font_ui: システムのデフォルトフォントを使う - setting_unfollow_modal: フォロー解除する前に確認ダイアログを表示する setting_theme: サイトテーマ + setting_unfollow_modal: フォロー解除する前に確認ダイアログを表示する severity: 重大性 type: インポートする項目 username: ユーザー名 diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index b07aa5b37..d45f98e66 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -44,8 +44,8 @@ oc: setting_delete_modal: Afichar una fenèstra de confirmacion abans de suprimir un estatut setting_noindex: Èsser pas indexat pels motors de recèrca setting_system_font_ui: Utilizar la policia Font del sisèma - setting_unfollow_modal: Afichar una confirmacion abans de quitar de sègre qualqu’un setting_theme: Tèma del site + setting_unfollow_modal: Afichar una confirmacion abans de quitar de sègre qualqu’un severity: Severitat type: Tip d’impòrt username: Nom d’utilizaire