about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/application.rb3
-rw-r--r--config/locales/ar.yml1
-rw-r--r--config/locales/bg.yml1
-rw-r--r--config/locales/ca.yml1
-rw-r--r--config/locales/de.yml1
-rw-r--r--config/locales/devise.zh-CN.yml6
-rw-r--r--config/locales/en.yml20
-rw-r--r--config/locales/eo.yml1
-rw-r--r--config/locales/es.yml1
-rw-r--r--config/locales/fa.yml1
-rw-r--r--config/locales/fi.yml1
-rw-r--r--config/locales/fr.yml1
-rw-r--r--config/locales/gl.yml1
-rw-r--r--config/locales/he.yml1
-rw-r--r--config/locales/hr.yml1
-rw-r--r--config/locales/hu.yml2
-rw-r--r--config/locales/id.yml1
-rw-r--r--config/locales/io.yml1
-rw-r--r--config/locales/it.yml1
-rw-r--r--config/locales/ja.yml1
-rw-r--r--config/locales/ko.yml1
-rw-r--r--config/locales/nl.yml1
-rw-r--r--config/locales/no.yml1
-rw-r--r--config/locales/oc.yml1
-rw-r--r--config/locales/pl.yml20
-rw-r--r--config/locales/pt-BR.yml1
-rw-r--r--config/locales/pt.yml1
-rw-r--r--config/locales/ru.yml1
-rw-r--r--config/locales/sr-Latn.yml1
-rw-r--r--config/locales/sr.yml1
-rw-r--r--config/locales/sv.yml1
-rw-r--r--config/locales/th.yml1
-rw-r--r--config/locales/tr.yml1
-rw-r--r--config/locales/uk.yml1
-rw-r--r--config/locales/zh-CN.yml22
-rw-r--r--config/locales/zh-HK.yml1
-rw-r--r--config/locales/zh-TW.yml1
-rw-r--r--config/webpack/configuration.js2
38 files changed, 65 insertions, 41 deletions
diff --git a/config/application.rb b/config/application.rb
index c1bf3cef2..ef97dbc06 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -19,6 +19,9 @@ require_relative '../lib/mastodon/redis_config'
 
 module Mastodon
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 82e8e998a..eadeaef3e 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -140,7 +140,6 @@ ar:
   application_mailer:
     salutation: "%{name}،"
     settings: 'تغيير تفضيلات البريد الإلكتروني : %{link}'
-    signature: إشعارات ماستدون من %{instance}
     view: 'View:'
   applications:
     created: تم إنشاء التطبيق بنجاح
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 13d0394a3..56a904895 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -26,7 +26,6 @@ bg:
     unfollow: Не следвай
   application_mailer:
     settings: 'Промяна на предпочитанията за e-mail: %{link}'
-    signature: Mastodon известия от %{instance}
     view: 'Преглед:'
   applications:
     invalid_url: Предоставеният URL е невалиден
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 5e30abaf5..1092da38d 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -340,7 +340,6 @@ ca:
   application_mailer:
     salutation: "%{name},"
     settings: 'Canvia les preferències de correu: %{link}'
-    signature: Notificacions de Mastodon des de %{instance}
     view: 'Vista:'
   applications:
     created: L'aplicació s'ha creat correctament
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 39867e373..7d0cf6349 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -321,7 +321,6 @@ de:
   application_mailer:
     salutation: "%{name},"
     settings: 'E-Mail-Einstellungen ändern: %{link}'
-    signature: Mastodon-Benachrichtigungen von %{instance}
     view: 'Ansehen:'
   applications:
     created: Anwendung erstellt
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index dd6b48795..4ee021fcc 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -18,7 +18,7 @@ zh-CN:
     mailer:
       confirmation_instructions:
         action: 验证电子邮件地址
-        explanation: 你在 %{host} 上使用这个电子邮件地址创建了一个帐户。只需点击下面的按钮,即可完成激活。如果你并没有创建过帐户,请忽略此邮件。
+        explanation: 你在 %{host} 上使用这个电子邮件地址创建了一个帐户。只需点击下面的链接,即可完成激活。如果你并没有创建过帐户,请忽略此邮件。
         extra_html: 请记得阅读<a href="%{terms_path}">本实例的相关规定</a>和<a href="%{policy_path}">我们的使用条款</a>。
         subject: Mastodon:确认 %{instance} 帐户信息
         title: 验证电子邮件地址
@@ -33,13 +33,13 @@ zh-CN:
         subject: Mastodon:密码已被更改
         title: 密码已被重置
       reconfirmation_instructions:
-        explanation: 请确认你的新电子邮件地址以完成更改。
+        explanation: 点击下面的链接来确认你的新电子邮件地址。
         extra: 如果你并没有请求本次变更,请忽略此邮件。Mastodon 帐户的电子邮件地址只有在你点击上面的链接后才会更改。
         subject: Mastodon:确认 %{instance} 电子邮件地址
         title: 验证电子邮件地址
       reset_password_instructions:
         action: 更改密码
-        explanation: 你正在请求更改帐户的密码。
+        explanation: 点击下面的链接来更改帐户的密码。
         extra: 如果你并没有请求本次变更,请忽略此邮件。你的密码只有在你点击上面的链接并输入新密码后才会更改。
         subject: Mastodon:重置密码信息
         title: 重置密码
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bc1e98c56..7c3cd922b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -341,7 +341,6 @@ en:
     notification_preferences: Change e-mail preferences
     salutation: "%{name},"
     settings: 'Change e-mail preferences: %{link}'
-    signature: Mastodon notifications from %{instance}
     view: 'View:'
     view_profile: View Profile
     view_status: View status
@@ -734,6 +733,25 @@ en:
     recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. <strong>Keep the recovery codes safe</strong>. For example, you may print them and store them with other important documents.
     setup: Set up
     wrong_code: The entered code was invalid! Are server time and device time correct?
+  user_mailer:
+    welcome:
+      edit_profile_action: Setup profile
+      edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
+      explanation: Here are some tips to get you started
+      final_action: Start posting
+      final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.'
+      full_handle: Your full handle
+      full_handle_hint: This is what you would tell your friends so they can message or follow you from another instance.
+      review_preferences_action: Change preferences
+      review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay.
+      subject: Welcome to Mastodon
+      tip_bridge_html: If you are coming from Twitter, you can find your friends on Mastodon by using the <a href="%{bridge_url}">bridge app</a>. It only works if they also used the bridge app though!
+      tip_federated_timeline: The federated timeline is a firehose view of the Mastodon network. But it only includes people your neighbours are subscribed to, so it's not complete.
+      tip_following: You follow your server's admin(s) by default. To find more interesting people, check the local and federated timelines.
+      tip_local_timeline: The local timeline is a firehose view of people on %{instance}. These are your immediate neighbours!
+      tip_mobile_webapp: If your mobile browser offers you to add Mastodon to your homescreen, you can receive push notifications. It acts like a native app in many ways!
+      tips: Tips
+      title: Welcome aboard, %{name}!
   users:
     invalid_email: The e-mail address is invalid
     invalid_otp_token: Invalid two-factor code
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 847299ac7..bc259957d 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -237,7 +237,6 @@ eo:
       subject: Nova raporto por %{instance} (#%{id})
   application_mailer:
     settings: 'Ŝanĝi la retpoŝt-mesaĝajn preferojn: %{link}'
-    signature: Sciigoj de Mastodon el %{instance}
     view: 'Vidi:'
   applications:
     created: Aplikaĵo sukcesa kreis
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d9084787d..7ee2876a9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -332,7 +332,6 @@ es:
   application_mailer:
     salutation: "%{name},"
     settings: 'Cambiar preferencias de correo: %{link}'
-    signature: Notificaciones de Mastodon desde %{instance}
     view: 'Vista:'
   applications:
     created: Aplicación creada exitosamente
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 94d4e7594..c498c592c 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -334,7 +334,6 @@ fa:
   application_mailer:
     salutation: "%{name}،"
     settings: 'تغییر تنظیمات ایمیل: %{link}'
-    signature: اعلان‌های ماستدون از %{instance}
     view: 'نمایش:'
   applications:
     created: برنامه با موفقیت ساخته شد
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 2da8427b8..f2ee28ba0 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -25,7 +25,6 @@ fi:
     unfollow: Lopeta seuraaminen
   application_mailer:
     settings: 'Muokkaa sähköpostiasetuksia: %{link}'
-    signature: Mastodon-ilmoituksia palvelimelta %{instance}
     view: 'Katso:'
   applications:
     invalid_url: Annettu URL on väärä
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index adcb11f18..09338fdfd 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -334,7 +334,6 @@ fr:
   application_mailer:
     salutation: "%{name},"
     settings: 'Changer les préférences courriel : %{link}'
-    signature: Notifications de Mastodon depuis %{instance}
     view: 'Voir :'
   applications:
     created: Application créée avec succès
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 55f717249..100e2954c 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -340,7 +340,6 @@ gl:
   application_mailer:
     salutation: "%{name},"
     settings: 'Mudar as preferencias de e-mail: %{link}'
-    signature: Notificacións Mastodon de %{instance}
     view: 'Vista:'
   applications:
     created: Creouse con éxito este aplicativo
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 4b977ce1b..1f27dda7a 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -229,7 +229,6 @@ he:
     title: ניהול
   application_mailer:
     settings: 'שינוי הגדרות דוא"ל: %{link}'
-    signature: התראות מסטודון מקהילת %{instance}
     view: 'תצוגה:'
   applications:
     invalid_url: כתובת הקישורית אינה חוקית
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 581912420..a3c9aa436 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -26,7 +26,6 @@ hr:
     unfollow: Prestani slijediti
   application_mailer:
     settings: 'Promijeni e-mail postavke: %{link}'
-    signature: Mastodon notifikacije sa %{instance}
     view: 'Vidi:'
   applications:
     invalid_url: Uneseni link nije valjan
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 77551223f..586503a35 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -12,8 +12,6 @@ hu:
     people_who_follow: "%{name} követői"
     posts: Bejegyzések
     unfollow: Követés abbahagyása
-  application_mailer:
-    signature: "%{instance} Mastodon értesítései"
   auth:
     change_password: Jelszó változtatása
     didnt_get_confirmation: Nem kaptad meg a megerősítési lépéseket?
diff --git a/config/locales/id.yml b/config/locales/id.yml
index f3a6649d1..6e4d60fd8 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -151,7 +151,6 @@ id:
     title: Administrasi
   application_mailer:
     settings: 'Ubah pilihan email: %{link}'
-    signature: Notifikasi Mastodon dari %{instance}
     view: 'Tampilan:'
   applications:
     invalid_url: URL tidak sesuai
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 4114e5231..db8214768 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -149,7 +149,6 @@ io:
     title: Administration
   application_mailer:
     settings: 'Chanjar la retpost-mesajala preferi: %{link}'
-    signature: Savigi di Mastodon de %{instance}
     view: 'Vidar:'
   applications:
     invalid_url: La URL donita ne esas valida
diff --git a/config/locales/it.yml b/config/locales/it.yml
index ec0209bc1..6ab57d2fc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -26,7 +26,6 @@ it:
     unfollow: Non seguire più
   application_mailer:
     settings: 'Cambia le impostazioni per le e-mail: %{link}'
-    signature: Notifiche Mastodon da %{instance}
     view: 'Guarda:'
   applications:
     invalid_url: L'URL fornito non è valido
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 8b7b678c6..141b5141a 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -341,7 +341,6 @@ ja:
     notification_preferences: メール設定の変更
     salutation: "%{name} さん"
     settings: 'メール設定の変更: %{link}'
-    signature: Mastodon %{instance} インスタンスからの通知
     view: 'リンク:'
     view_profile: プロフィールを表示
     view_status: トゥートを表示
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 997dc4856..b254636f3 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -340,7 +340,6 @@ ko:
   application_mailer:
     notification_preferences: 메일 설정 변경
     settings: '메일 설정을 변경: %{link}'
-    signature: Mastodon %{instance} 인스턴스로에서 알림
     view: 'View:'
     view_profile: 프로필 보기
     view_status: 게시물 보기
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 600d5225d..973dc65d1 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -340,7 +340,6 @@ nl:
   application_mailer:
     salutation: "%{name},"
     settings: 'E-mailvoorkeuren wijzigen: %{link}'
-    signature: Mastodon-meldingen van %{instance}
     view: 'Bekijk:'
   applications:
     created: Aanmaken toepassing geslaagd
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 57f8547fc..3b212932e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -163,7 +163,6 @@
     title: Administrasjon
   application_mailer:
     settings: 'Endre foretrukne e-postinnstillinger: %{link}'
-    signature: Mastodon-notiser fra %{instance}
     view: 'Se:'
   applications:
     invalid_url: Den oppgitte URLen er ugyldig
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 40387de70..beb5d1f87 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -340,7 +340,6 @@ oc:
   application_mailer:
     salutation: "%{name},"
     settings: 'Cambiar las preferéncias de corrièl : %{link}'
-    signature: Notificacion de Mastodon sus %{instance}
     view: 'Veire :'
   applications:
     created: Aplicacion ben creada
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index efb955b37..949099a71 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -342,7 +342,6 @@ pl:
     notification_preferences: Zmień ustawienia e-maili
     salutation: "%{name},"
     settings: 'Zmień ustawienia powiadamiania: %{link}'
-    signature: Powiadomienie Mastodona z instancji %{instance}
     view: 'Zobacz:'
     view_status: Wyświetl wpis
   applications:
@@ -740,6 +739,25 @@ pl:
     recovery_instructions_html: Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. <strong>Trzymaj je w bezpiecznym miejscu</strong>. Na przykład, wydrukuj je i przechowuj z ważnymi dokumentami.
     setup: Skonfiguruj
     wrong_code: Wprowadzony kod jest niepoprawny! Czy czas serwera i urządzenia jest poprawny?
+  user_mailer:
+    welcome:
+      edit_profile_action: Skonfiguruj profil
+      edit_profile_step: Możesz dostować profil wysyłając awatar, obraz nagłówka, zmieniając wyświetlaną nazwę i wiele więcej. Jeżeli chcesz, możesz zablokować konto, aby kontrolować, kto może Cię śledzić.
+      explanation: Kilka wskazówek, które pomogą Ci rozpocząć
+      final_action: Zacznij pisać
+      final_step: 'Zacznij tworzyć! Nawet jeżeli nikt Cię nie śledzi, Twoje publiczne wiadomości będą widziane przez innych, na przykład na lokalnej osi czasu i w hashtagach. Możesz też utworzyć wpis wprowadzający używając hashtagu #introductions.'
+      full_handle: Twój pełny adres
+      full_handle_hint: Ten adres możesz podać znajomym, aby mogli skontaktować się z Tobą lub zacząć śledzić z innej instancji.
+      review_preferences_action: Zmień ustawienia
+      review_preferences_step: Upewnij się, że zmieniłeś ustawienia, takie jak maile, które chciałbyś otrzymywać lub domyślne opcje prywatności. Jeżeli nie masz choroby lokomocyjnej, możesz włączyć automatyczne odtwarzanie animacji GIF.
+      subject: Witaj w Mastodonie
+      tip_bridge_html: Jeżeli przybywasz z Twittera, możesz znaleźć znajomych na Mastodonie używając <a href="%{bridge_url}">aplikacji mostku</a>. Działa to tylko, jeżeli oni również z niej korzystali!
+      tip_federated_timeline: Oś czasu federacji przedstawia całą sieć Mastodona. Wyświetla tylko wpisy osób, które śledzą użytkownicy Twojej instancji, więc nie jest kompletna.
+      tip_following: Domyślnie śledzisz administratora/ów swojej instancji. Aby znaleźć więcej ciekawych ludzi, zajrzyj na lokalną i federalną oś czasu.
+      tip_local_timeline: Lokalna oś czasu przedstawia osoby z %{instance}. To Twoi najbliżsi sąsiedzi!
+      tip_mobile_webapp: Jeżeli Twoja przeglądarka pozwala na dodanie Mastodona na ekran główny, będziesz otrzymywać natychmiastowe powiadomienia. Działa to prawie jak natywna aplikacja!
+      tips: Wskazówki
+      title: Witaj na pokładzie, %{name}!
   users:
     invalid_email: Adres e-mail jest niepoprawny
     invalid_otp_token: Kod uwierzytelniający jest niepoprawny
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 39683bd88..c2830b754 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -340,7 +340,6 @@ pt-BR:
   application_mailer:
     salutation: "%{name},"
     settings: 'Mudar e-mail de preferência: %{link}'
-    signature: Notificações do Mastodon de %{instance}
     view: 'Visualizar:'
   applications:
     created: Aplicação criada com sucesso
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index c0056af4f..618373b91 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -328,7 +328,6 @@ pt:
   application_mailer:
     salutation: "%{name},"
     settings: 'Alterar preferências de email: %{link}'
-    signature: notificações Mastodon do %{instance}
     view: 'Ver:'
   applications:
     created: Aplicação criada com sucesso
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6e63aadda..842fd7d54 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -342,7 +342,6 @@ ru:
     notification_preferences: Изменить настройки e-mail
     salutation: "%{name},"
     settings: 'Изменить настройки e-mail: %{link}'
-    signature: Уведомления Mastodon от %{instance}
     view: 'Просмотр:'
     view_status: Просмотреть статус
   applications:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 964a82d64..ac80e81ec 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -336,7 +336,6 @@ sr-Latn:
   application_mailer:
     salutation: "%{name},"
     settings: 'Promeni podešavanja e-pošte: %{link}'
-    signature: Mastodont obaveštenje sa instance %{instance}
     view: 'Pogledaj:'
   applications:
     created: Aplikacija uspešno napravljena
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 57ccf2008..755396828 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -336,7 +336,6 @@ sr:
   application_mailer:
     salutation: "%{name},"
     settings: 'Промени подешавања е-поште: %{link}'
-    signature: Мастодонт обавештење са инстанце %{instance}
     view: 'Погледај:'
   applications:
     created: Апликација успешно направљена
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index ebb6d6595..b6595cb0d 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -272,7 +272,6 @@ sv:
   application_mailer:
     salutation: "%{name},"
     settings: 'Change e-mail preferences: %{link}'
-    signature: Mastodon meddelande från %{instance}
     view: 'Granska:'
   applications:
     created: Ansökan är framgångsrikt skapad
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2db3aee8a..737b3aa95 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -153,7 +153,6 @@ th:
     title: แอดมิน
   application_mailer:
     settings: 'เปลี่ยนอีเมล์ preferences: %{link}'
-    signature: ฟอร์มการแจ้งเตือนแมสโทดอน %{instance}
     view: 'วิว:'
   applications:
     invalid_url: URL ที่ระบุไม่ถูกตั้ง
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 6aff78fa1..23b4d7a24 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -152,7 +152,6 @@ tr:
     title: Yönetim
   application_mailer:
     settings: 'E-mail tercihlerini değiştir: %{link}'
-    signature: "%{instance} sunucusundan Mastodon bildirimleri"
     view: 'Görüntüle:'
   applications:
     invalid_url: Verilen URL geçerli değil
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 995a682a7..0ddfa9190 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -143,7 +143,6 @@ uk:
     title: Адміністрування
   application_mailer:
     settings: 'Змінити налаштування email: %{link}'
-    signature: Сповіщення Mastodon від %{instance}
     view: 'Перегляд:'
   applications:
     invalid_url: Введена URL неправильна
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 14382331b..7deb241a1 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -339,7 +339,6 @@ zh-CN:
     notification_preferences: 更改电子邮件首选项
     salutation: "%{name}:"
     settings: 使用此链接更改你的电子邮件首选项:%{link}
-    signature: 这是一封来自 %{instance} 的 Mastodon 电子邮件通知。
     view: 点此链接查看详情:
     view_profile: 查看个人资料页
     view_status: 查看嘟文
@@ -592,7 +591,7 @@ zh-CN:
     back: 回到 Mastodon
     delete: 删除帐户
     development: 开发
-    edit_profile: 更改个人信息
+    edit_profile: 更改个人资料
     export: 导出
     followers: 已授权的关注者
     import: 导入
@@ -713,6 +712,25 @@ zh-CN:
     recovery_instructions_html: 如果你的手机无法使用,你可以使用下列任意一个恢复代码来重新获得对帐户的访问权。<strong>请妥善保管好你的恢复代码</strong>(例如,你可以将它们打印出来,然后和其他重要的文件放在一起)。
     setup: 设置
     wrong_code: 输入的认证码无效!请核对一下你的设备显示的时间,如果正确,你可能需要联系一下实例的管理员,让他们校准服务器的时间。
+  user_mailer:
+    welcome:
+      edit_profile_action: 设置个人资料
+      edit_profile_step: 你可以自定义你的个人资料,包括上传头像、横幅图片、更改昵称等等。如果你想在新的关注者关注你之前对他们进行审核,你也可以选择为你的帐户开启保护。
+      explanation: 下面是几个小贴士,希望它们能帮到你
+      final_action: 开始嘟嘟
+      final_step: '开始嘟嘟吧!即便你现在没有关注者,其他人仍然能在本站时间轴或者话题标签等地方看到你的公开嘟文。试着用 #introductions 这个话题标签介绍一下自己吧。'
+      full_handle: 你的完整用户地址
+      full_handle_hint: 你需要把这个告诉你的朋友们,这样他们就能从另一个实例向你发送信息或者关注你。
+      review_preferences_action: 更改首选项
+      review_preferences_step: 记得调整你的偏好设置,比如你想接收什么类型的邮件,或者你想把你的嘟文可见范围默认设置为什么级别。如果你没有晕动病的话,考虑一下启用“自动播放 GIF 动画”这个选项吧。
+      subject: 欢迎来到 Mastodon
+      tip_bridge_html: 如果你刚从 Twitter 来到这里,你可以在<a href="%{bridge_url}">桥梁站(bridge app)</a>上寻找你的朋友。当然,前提是他们也登录了桥梁站!
+      tip_federated_timeline: 跨站公共时间轴可以让你一窥更广阔的 Mastodon 网络。不过,由于它只显示你的邻居们所订阅的内容,所以并不是全部。
+      tip_following: 默认情况下,你会自动关注你所在实例的管理员。想结交更多有趣的人的话,记得多逛逛本站时间轴和跨站公共时间轴哦。
+      tip_local_timeline: 本站时间轴可以让你一窥 %{instance} 上的用户。他们就是离你最近的邻居!
+      tip_mobile_webapp: 如果你的移动设备浏览器允许你将 Mastodon 添加到主屏幕,你就能够接收推送消息。它就像本地应用一样好使!
+      tips: 小贴士
+      title: "%{name},欢迎你的加入!"
   users:
     invalid_email: 输入的电子邮件地址无效
     invalid_otp_token: 输入的双重认证代码无效
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 8ff6d1bf8..ed73b7244 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -152,7 +152,6 @@ zh-HK:
     title: 管理
   application_mailer:
     settings: 修改電郵設定︰%{link}
-    signature: 來自 %{instance} 的 Mastodon 通知
     view: 進入瀏覽︰
   applications:
     invalid_url: 所提供的網址不正確
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e73dbf9cc..bd9f85840 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -123,7 +123,6 @@ zh-TW:
     title: 管理介面
   application_mailer:
     settings: 修改信箱設定︰ %{link}
-    signature: 來自 %{instance} 的 Mastodon 通知
     view: 進入瀏覽︰
   applications:
     invalid_url: 網址不正確
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index a38d9d11d..f6b4d4c61 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -73,7 +73,7 @@ function formatPublicPath(host = '', path = '') {
 
 const output = {
   path: resolve('public', settings.public_output_path),
-  publicPath: formatPublicPath(env.ASSET_HOST, settings.public_output_path),
+  publicPath: formatPublicPath(env.ASSET_HOST || env.LOCAL_DOMAIN, settings.public_output_path),
 };
 
 module.exports = {