about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-26 19:12:07 +0200
committerGitHub <noreply@github.com>2018-08-26 19:12:07 +0200
commitaf934b90710a2ce1099d3ceda5de7bcf0e94595c (patch)
tree71e25690e6300d0235d515ccd0241d082c8d1abe /config
parent2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff)
parentbe20eb4b2f4e55c472263a98a2c07b4e805d9bd5 (diff)
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
-rw-r--r--config/initializers/paperclip.rb4
-rw-r--r--config/locales/cs.yml3
-rw-r--r--config/locales/doorkeeper.da.yml2
-rw-r--r--config/locales/en.yml3
-rw-r--r--config/locales/ja.yml21
-rw-r--r--config/locales/ka.yml6
-rw-r--r--config/locales/ko.yml2
-rw-r--r--config/locales/simple_form.fr.yml2
-rw-r--r--config/webpack/production.js4
9 files changed, 35 insertions, 12 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 59ab9b9a1..df0205879 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -47,10 +47,10 @@ if ENV['S3_ENABLED'] == 'true'
     Paperclip::Attachment.default_options[:url] = ':s3_path_url'
   end
 
-  if ENV.has_key?('S3_CLOUDFRONT_HOST')
+  if ENV.has_key?('S3_ALIAS_HOST') || ENV.has_key?('S3_CLOUDFRONT_HOST')
     Paperclip::Attachment.default_options.merge!(
       url: ':s3_alias_url',
-      s3_host_alias: ENV['S3_CLOUDFRONT_HOST']
+      s3_host_alias: ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST']
     )
   end
 elsif ENV['SWIFT_ENABLED'] == 'true'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 9ae9c259c..5f1f415ec 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -414,6 +414,9 @@ cs:
       last_delivery: Poslední doručení
       title: WebSub
       topic: Téma
+    suspensions:
+      proceed: Pokračovat
+      title: Suspendovat účet %{acct}
     title: Administrace
   admin_mailer:
     new_report:
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index dd45a5078..df964e4b1 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -91,7 +91,9 @@ da:
           unknown: Adgangs-beviset er ugyldigt
         resource_owner_authenticator_not_configured: Ressource ejeren kunne ikke blive fundet grundet Doorkeeper.configure.resource_owner_authenticator ikke er konfigureret.
         server_error: Autoriserings serveren blev mødt med en uventet betingelse der forhindrede den i at færdiggøre anmodningen.
+        temporarily_unavailable: Autoriserings serveren er på nuværende tidspunkt ikke i stand til at håndtere anmodningen grundet midlertidig overlast eller serveren er ved at blive opdateret.
         unauthorized_client: Klienten er ikke godkendt til at udføre denne anmodning ved at bruge denne metode.
+        unsupported_grant_type: Autoriserings typen understøttes ikke af autoriserings serveren.
         unsupported_response_type: Godkendelses serveren understøtter ikke denne type respons.
     flash:
       applications:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7e062781c..2dbb82b9a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -350,6 +350,9 @@ en:
       contact_information:
         email: Business e-mail
         username: Contact username
+      custom_css:
+        desc_html: Modify the look with CSS loaded on every page
+        title: Custom CSS
       hero:
         desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail
         title: Hero image
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 47177b809..ef62ab32a 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -30,10 +30,14 @@ ja:
     other_instances: 他のインスタンス
     privacy_policy: プライバシーポリシー
     source_code: ソースコード
-    status_count_after: トゥート
+    status_count_after:
+      one: トゥート
+      other: トゥート
     status_count_before: トゥート数
     terms: 利用規約
-    user_count_after: 人
+    user_count_after:
+      one: 人
+      other: 人
     user_count_before: ユーザー数
     what_is_mastodon: Mastodon とは?
   accounts:
@@ -49,7 +53,7 @@ ja:
     people_followed_by: "%{name} さんがフォロー中のアカウント"
     people_who_follow: "%{name} さんをフォロー中のアカウント"
     pin_errors:
-      following: 推薦したい人はあなたが既にフォローしている必要があります
+      following: おすすめしたい人はあなたが既にフォローしている必要があります
     posts: トゥート
     posts_with_replies: トゥートと返信
     reserved_username: このユーザー名は予約されています
@@ -185,7 +189,7 @@ ja:
         unsuspend_account: "%{name} さんが %{target} さんの停止を解除しました"
         update_custom_emoji: "%{name} さんがカスタム絵文字 %{target} を更新しました"
         update_status: "%{name} さんが %{target} さんの投稿を更新しました"
-      deleted_status: "(削除されました)"
+      deleted_status: "(削除済)"
       title: 操作履歴
     custom_emojis:
       by_domain: ドメイン
@@ -414,6 +418,12 @@ ja:
       last_delivery: 最終配送
       title: WebSub
       topic: トピック
+    suspensions:
+      bad_acct_msg: 値が一致しませんでした。停止しようとしているアカウントに間違いはありませんか?
+      hint_html: 'アカウントの停止を確認するには、以下のフィールドに %{value} と入力してください:'
+      proceed: 完全に活動停止させる
+      title: "%{acct} を停止"
+      warning_html: 'このアカウントを停止すると、このアカウントから次のようなデータが<strong>不可逆的に</strong>削除されます:'
     title: 管理
   admin_mailer:
     new_report:
@@ -645,7 +655,6 @@ ja:
           quadrillion: Q
           thousand: K
           trillion: T
-          unit: ''
   pagination:
     newer: 新しいトゥート
     next: 次
@@ -868,7 +877,7 @@ ja:
     recovery_codes_regenerated: リカバリーコードが再生成されました
     recovery_instructions_html: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。<strong>リカバリーコードは大切に保全してください。</strong>たとえば印刷してほかの重要な書類と一緒に保管することができます。
     setup: 初期設定
-    wrong_code: コードが間違っています。サーバー上の時間とデバイス上の時間が一致していることを確認してください。
+    wrong_code: コードが間違っています。サーバー上の時間とデバイス上の時間が一致していますか?
   user_mailer:
     backup_ready:
       explanation: Mastodonアカウントのアーカイブを受け付けました。今すぐダウンロードできます!
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 86d982665..c1105b017 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -6,6 +6,7 @@ ka:
     about_this: შესახებ
     administered_by: 'ადმინისტრატორი:'
     api: აპი
+    apps: მობილური აპლიკაციები
     closed_registrations: რეგისტრაციები ამჟამად ინსტანციაზე დახურულია. თუმცა! ანგარიშის შესაქმნელად შეგიძლიათ იპოვოთ სხვა ინსტანცია და იმავე ქსელზე იქონიოთ წვდომა იქიდან.
     contact: კონტაქტი
     contact_missing: არაა დაყენებული
@@ -281,6 +282,7 @@ ka:
       search: ძებნა
       title: ცნობილი ინსტანციები
     invites:
+      deactivate_all: ყველას დეაქტივაცია
       filter:
         all: ყველა
         available: ხელმისაწვდომი
@@ -660,6 +662,9 @@ ka:
     no_account_html: არ გაქვთ ანგარიში? შეგიძლიათ <a href='%{sign_up_path}' target='_blank'>დარეგისტრირდეთ აქ</a>
     proceed: გააგრძელეთ გასაყოლად
     prompt: 'თქვენ გაჰყვებით:'
+  remote_interaction:
+    proceed: გააგრძელეთ ურთიერთქმედება
+    prompt: 'თქვენ გსურთ ურთიერთქმედება ამ ტუტთან:'
   remote_unfollow:
     error: შეცდომა
     title: სათაური
@@ -743,6 +748,7 @@ ka:
       private: არა-საჯარო ტუტი ვერ აიპინება
       reblog: ბუსტი ვერ აიპინება
     show_more: მეტის ჩვენება
+    sign_in_to_participate: საუბარში მონაწილეობისთვის გაიარეთ ავტორიზაცია
     title: '%{name}: "%{quote}"'
     visibilities:
       private: მხოლოდ-მიმდევრები
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b5da99049..1ae825443 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -640,7 +640,7 @@ ko:
     publishing: 퍼블리싱
     web: 웹
   remote_follow:
-    acct: 아이디@도메인을 입력해 주십시오
+    acct: 당신이 사용하는 아이디@도메인을 입력해 주십시오
     missing_resource: 리디렉션 대상을 찾을 수 없습니다
     no_account_html: 계정이 없나요? <a href='%{sign_up_path}' target='_blank'>여기에서 가입 할 수 있습니다</a>
     proceed: 팔로우 하기
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index b08f4aa9b..c13cfa50d 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -30,7 +30,7 @@ fr:
       imports:
         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 :'
+        otp: 'Entrez le code d’authentification à deux facteurs généré par l''application de votre téléphone ou utilisez un de vos codes de récupération :'
       user:
         chosen_languages: Lorsque coché, seuls les pouets dans les langues sélectionnées seront affichés sur les fils publics
     labels:
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 4966807a1..27a78108b 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -23,8 +23,8 @@ try {
 let attachmentHost;
 
 if (process.env.S3_ENABLED === 'true') {
-  if (process.env.S3_CLOUDFRONT_HOST) {
-    attachmentHost = process.env.S3_CLOUDFRONT_HOST;
+  if (process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST) {
+    attachmentHost = process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST;
   } else {
     attachmentHost = process.env.S3_HOSTNAME || `s3-${process.env.S3_REGION || 'us-east-1'}.amazonaws.com`;
   }