diff --git a/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po b/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
index 3d71e298..1215b6b3 100644
--- a/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
@@ -1,25 +1,15 @@
-# Translations template for PROJECT.
-# Copyright (C) 2018 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-04-22 12:10+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.3\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Mailu\n"
+"Language: ja\n"
 
 #: mailu/ui/forms.py:32
 msgid "Invalid email address."
-msgstr ""
+msgstr "無効なメールアドレスです"
 
 #: mailu/ui/forms.py:36
 msgid "Confirm"
@@ -27,40 +17,32 @@ msgstr ""
 
 #: mailu/ui/forms.py:40 mailu/ui/forms.py:77
 msgid "E-mail"
-msgstr ""
+msgstr "E-Mailアドレス"
 
 #: mailu/ui/forms.py:41 mailu/ui/forms.py:78 mailu/ui/forms.py:90
 #: mailu/ui/forms.py:109 mailu/ui/forms.py:162
 #: mailu/ui/templates/client.html:32 mailu/ui/templates/client.html:59
 msgid "Password"
-msgstr ""
+msgstr "パスワード"
 
 #: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
 #: mailu/ui/templates/sidebar.html:111
 msgid "Sign in"
-msgstr ""
+msgstr "ログイン"
 
 #: mailu/ui/forms.py:46 mailu/ui/forms.py:56
 #: mailu/ui/templates/domain/details.html:27
 #: mailu/ui/templates/domain/list.html:18 mailu/ui/templates/relay/list.html:17
 msgid "Domain name"
-msgstr ""
+msgstr "ドメイン名"
 
 #: mailu/ui/forms.py:47
 msgid "Maximum user count"
-msgstr ""
+msgstr "最大ユーザー数"
 
 #: mailu/ui/forms.py:48
 msgid "Maximum alias count"
-msgstr ""
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr ""
-
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr ""
+msgstr "最大エイリアス数"
 
 #: mailu/ui/forms.py:51 mailu/ui/forms.py:72 mailu/ui/forms.py:83
 #: mailu/ui/forms.py:128 mailu/ui/forms.py:140
@@ -68,136 +50,86 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19
 #: mailu/ui/templates/user/list.html:23
 msgid "Comment"
-msgstr ""
+msgstr "コメント"
 
 #: mailu/ui/forms.py:52 mailu/ui/forms.py:61 mailu/ui/forms.py:66
 #: mailu/ui/forms.py:73 mailu/ui/forms.py:132 mailu/ui/forms.py:141
 msgid "Create"
-msgstr ""
-
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr ""
-
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr ""
+msgstr "作成"
 
 #: mailu/ui/forms.py:59 mailu/ui/forms.py:79 mailu/ui/forms.py:91
 msgid "Confirm password"
-msgstr ""
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr ""
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr ""
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr ""
+msgstr "パスワード(再入力)"
 
 #: mailu/ui/forms.py:80 mailu/ui/templates/user/list.html:22
 #: mailu/ui/templates/user/signup_domain.html:16
 msgid "Quota"
-msgstr ""
+msgstr "容量"
 
 #: mailu/ui/forms.py:81
 msgid "Allow IMAP access"
-msgstr ""
+msgstr "IMAPアクセスを許可"
 
 #: mailu/ui/forms.py:82
 msgid "Allow POP3 access"
-msgstr ""
-
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr ""
+msgstr "POP3アクセスを許可"
 
 #: mailu/ui/forms.py:85
 msgid "Save"
-msgstr ""
-
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr ""
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr ""
+msgstr "保存"
 
 #: mailu/ui/forms.py:97
 msgid "Displayed name"
-msgstr ""
+msgstr "表示名"
 
 #: mailu/ui/forms.py:98
 msgid "Enable spam filter"
-msgstr ""
+msgstr "スパムフィルターを有効"
 
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr ""
-
-#: mailu/ui/forms.py:100
-msgid "Enable forwarding"
-msgstr ""
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr ""
-
-#: mailu/ui/forms.py:103 mailu/ui/forms.py:139
-#: mailu/ui/templates/alias/list.html:20
-msgid "Destination"
+#: mailu/ui/forms.py:80
+msgid "Spam filter threshold"
 msgstr ""
 
 #: mailu/ui/forms.py:105
 msgid "Save settings"
-msgstr ""
+msgstr "設定を保存"
 
 #: mailu/ui/forms.py:110
 msgid "Password check"
-msgstr ""
+msgstr "パスワード(再入力)"
 
 #: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
 msgid "Update password"
-msgstr ""
+msgstr "パスワード変更"
 
-#: mailu/ui/forms.py:115
-msgid "Enable automatic reply"
-msgstr ""
+#: mailu/ui/forms.py:100
+msgid "Enable forwarding"
+msgstr "自動転送を有効"
 
-#: mailu/ui/forms.py:116
-msgid "Reply subject"
-msgstr ""
-
-#: mailu/ui/forms.py:117
-msgid "Reply body"
-msgstr ""
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr ""
+#: mailu/ui/forms.py:103 mailu/ui/forms.py:139
+#: mailu/ui/templates/alias/list.html:20
+msgid "Destination"
+msgstr "宛先"
 
 #: mailu/ui/forms.py:120
 msgid "Update"
-msgstr ""
+msgstr "更新"
 
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr ""
+#: mailu/ui/forms.py:115
+msgid "Enable automatic reply"
+msgstr "自動返信を有効"
 
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr ""
+#: mailu/ui/forms.py:116
+msgid "Reply subject"
+msgstr "返信件名"
+
+#: mailu/ui/forms.py:117
+msgid "Reply body"
+msgstr "返信本文"
 
 #: mailu/ui/forms.py:136
 msgid "Alias"
-msgstr ""
+msgstr "エイリアス名"
 
 #: mailu/ui/forms.py:138
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
@@ -213,15 +145,15 @@ msgstr ""
 
 #: mailu/ui/forms.py:150
 msgid "Manager email"
-msgstr ""
+msgstr "管理者メールアドレス"
 
 #: mailu/ui/forms.py:155
 msgid "Protocol"
-msgstr ""
+msgstr "プロトコル"
 
 #: mailu/ui/forms.py:158
 msgid "Hostname or IP"
-msgstr ""
+msgstr "ホスト名またはIPアドレス"
 
 #: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
 #: mailu/ui/templates/client.html:47
@@ -235,12 +167,277 @@ msgstr ""
 #: mailu/ui/forms.py:161 mailu/ui/templates/client.html:28
 #: mailu/ui/templates/client.html:55 mailu/ui/templates/fetch/list.html:20
 msgid "Username"
+msgstr "ユーザー名"
+
+#: mailu/ui/templates/confirm.html:4
+msgid "Confirm action"
 msgstr ""
 
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
+#: mailu/ui/templates/confirm.html:13
+msgid "You are about to %(action)s. Please confirm your action."
 msgstr ""
 
+#: mailu/ui/templates/docker-error.html:4
+msgid "Docker error"
+msgstr "Docker エラー"
+
+#: mailu/ui/templates/docker-error.html:12
+msgid "An error occurred while talking to the Docker server."
+msgstr ""
+
+#: mailu/admin/templates/login.html:6
+msgid "Your account"
+msgstr ""
+
+#: mailu/ui/templates/login.html:8
+msgid "to access the administration tools"
+msgstr "管理画面"
+
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+msgstr "サービス稼働状態"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr ""
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Docker イメージ"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr ""
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:8
+msgid "My account"
+msgstr "アカウント設定"
+
+#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+msgid "Settings"
+msgstr "設定"
+
+#: mailu/ui/templates/user/settings.html:22
+msgid "Auto-forward"
+msgstr "自動転送"
+
+#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+msgid "Auto-reply"
+msgstr "自動返信"
+
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
+#: mailu/ui/templates/user/list.html:36
+msgid "Fetched accounts"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:105
+msgid "Sign out"
+msgstr "ログアウト"
+
+#: mailu/ui/templates/sidebar.html:35
+msgid "Administration"
+msgstr "サービス設定"
+
+#: mailu/ui/templates/sidebar.html:49
+msgid "Administrators"
+msgstr "管理者"
+
+#: mailu/ui/templates/sidebar.html:66
+msgid "Mail domains"
+msgstr "メールドメイン"
+
+#: mailu/ui/templates/sidebar.html:92
+msgid "Help"
+msgstr "ヘルプ"
+
+#: mailu/ui/templates/working.html:4
+msgid "We are still working on this feature!"
+msgstr ""
+
+#: mailu/ui/templates/admin/create.html:4
+msgid "Add a global administrator"
+msgstr "グローバル管理者を追加"
+
+#: mailu/ui/templates/admin/list.html:4
+msgid "Global administrators"
+msgstr "グローバル管理者"
+
+#: mailu/ui/templates/admin/list.html:9
+msgid "Add administrator"
+msgstr "管理者を追加"
+
+#: mailu/ui/templates/admin/list.html:16 mailu/ui/templates/alias/list.html:18
+#: mailu/ui/templates/alternative/list.html:18
+#: mailu/ui/templates/domain/list.html:16 mailu/ui/templates/fetch/list.html:18
+#: mailu/ui/templates/manager/list.html:18
+#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18
+#: mailu/ui/templates/user/list.html:18
+msgid "Actions"
+msgstr ""
+
+#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
+#: mailu/ui/templates/manager/list.html:19 mailu/ui/templates/user/list.html:20
+msgid "Email"
+msgstr "メールアドレス"
+
+#: mailu/ui/templates/admin/list.html:22 mailu/ui/templates/alias/list.html:29
+#: mailu/ui/templates/alternative/list.html:25
+#: mailu/ui/templates/domain/list.html:31 mailu/ui/templates/fetch/list.html:31
+#: mailu/ui/templates/manager/list.html:24
+#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26
+#: mailu/ui/templates/user/list.html:31
+msgid "Delete"
+msgstr "削除"
+
+#: mailu/ui/templates/alias/create.html:4
+msgid "Create alias"
+msgstr "エイリアスを作成"
+
+#: mailu/ui/templates/alias/edit.html:4
+msgid "Edit alias"
+msgstr ""
+
+#: mailu/ui/templates/alias/list.html:4
+msgid "Alias list"
+msgstr "エイリアス一覧"
+
+#: mailu/ui/templates/alias/list.html:12
+msgid "Add alias"
+msgstr "エイリアスを作成"
+
+#: mailu/ui/templates/alias/list.html:22
+#: mailu/ui/templates/alternative/list.html:20
+#: mailu/ui/templates/domain/list.html:22 mailu/ui/templates/fetch/list.html:24
+#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21
+#: mailu/ui/templates/user/list.html:24
+msgid "Created"
+msgstr "作成日"
+
+#: mailu/ui/templates/alias/list.html:23 mailu/ui/templates/domain/list.html:23
+#: mailu/ui/templates/fetch/list.html:25 mailu/ui/templates/relay/list.html:21
+#: mailu/ui/templates/user/list.html:25
+msgid "Last edit"
+msgstr "最終更新日"
+
+#: mailu/ui/templates/alias/list.html:28 mailu/ui/templates/domain/list.html:30
+#: mailu/ui/templates/fetch/list.html:30 mailu/ui/templates/relay/list.html:26
+#: mailu/ui/templates/user/list.html:30
+msgid "Edit"
+msgstr ""
+
+#: mailu/ui/templates/domain/create.html:4
+#: mailu/ui/templates/domain/list.html:9
+msgid "New domain"
+msgstr "ドメイン名を追加"
+
+#: mailu/ui/templates/domain/details.html:4
+msgid "Domain details"
+msgstr "ドメイン名詳細"
+
+#: mailu/ui/templates/domain/details.html:15
+msgid "Regenerate keys"
+msgstr "鍵を再生成"
+
+#: mailu/ui/templates/domain/details.html:31
+msgid "DNS MX entry"
+msgstr "DNS MXエントリ"
+
+#: mailu/ui/templates/domain/details.html:35
+msgid "DNS SPF entries"
+msgstr "DNS SPFエントリ"
+
+#: mailu/ui/templates/domain/details.html:42
+msgid "DKIM public key"
+msgstr "DKIM公開鍵"
+
+#: mailu/ui/templates/domain/details.html:46
+msgid "DNS DKIM entry"
+msgstr "DNS DKIMエントリ"
+
+#: mailu/ui/templates/domain/details.html:50
+msgid "DNS DMARC entry"
+msgstr "DNS DMARCエントリ"
+
+#: mailu/ui/templates/domain/edit.html:4
+msgid "Edit domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:4
+msgid "Domain list"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:17
+msgid "Manage"
+msgstr "管理"
+
+#: mailu/ui/templates/domain/list.html:19
+msgid "Mailbox count"
+msgstr "メールボックス数"
+
+#: mailu/ui/templates/domain/list.html:20
+msgid "Alias count"
+msgstr "エイリアス数"
+
+#: mailu/ui/templates/domain/list.html:28
+msgid "Details"
+msgstr "詳細"
+
+#: mailu/ui/templates/domain/list.html:35
+msgid "Users"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:36
+msgid "Aliases"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:37
+msgid "Managers"
+msgstr ""
+
+#: mailu/ui/templates/fetch/create.html:4
+msgid "Add a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/edit.html:4
+msgid "Update a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:12
+msgid "Add an account"
+msgstr "アカウントを追加"
+
+#: mailu/ui/templates/fetch/list.html:19
+msgid "Endpoint"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:22
+msgid "Last check"
+msgstr ""
+
+#: mailu/ui/templates/manager/create.html:4
+msgid "Add a manager"
+msgstr ""
+
+#: mailu/ui/templates/manager/list.html:4
+msgid "Manager list"
+msgstr "管理者一覧"
+
+#: mailu/ui/templates/manager/list.html:12
+msgid "Add manager"
+msgstr "管理者を追加"
+
 #: mailu/ui/forms.py:168
 msgid "Announcement subject"
 msgstr ""
@@ -257,178 +454,89 @@ msgstr ""
 msgid "Public announcement"
 msgstr ""
 
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr ""
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr ""
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr ""
-
-#: mailu/ui/templates/confirm.html:4
-msgid "Confirm action"
-msgstr ""
-
-#: mailu/ui/templates/confirm.html:13
-#, python-format
-msgid "You are about to %(action)s. Please confirm your action."
-msgstr ""
-
-#: mailu/ui/templates/docker-error.html:4
-msgid "Docker error"
-msgstr ""
-
-#: mailu/ui/templates/docker-error.html:12
-msgid "An error occurred while talking to the Docker server."
-msgstr ""
-
-#: mailu/ui/templates/login.html:8
-msgid "to access the administration tools"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
-msgid "Settings"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
-msgid "Auto-reply"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
-#: mailu/ui/templates/user/list.html:36
-msgid "Fetched accounts"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:35
-msgid "Administration"
+#: mailu/ui/templates/announcement.html:8
+msgid "from"
 msgstr ""
 
 #: mailu/ui/templates/sidebar.html:44
 msgid "Announcement"
 msgstr ""
 
-#: mailu/ui/templates/sidebar.html:49
-msgid "Administrators"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "ユーザーを作成"
+
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "ユーザーを編集"
+
+#: mailu/ui/templates/user/forward.html:4
+msgid "Forward emails"
+msgstr ""
+
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr ""
+
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr ""
+
+#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "ユーザー設定"
+
+#: mailu/ui/templates/user/list.html:21
+msgid "Features"
+msgstr "サーバ機能"
+
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "パスワード変更"
+
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "自動返信"
+
+#: mailu/ui/forms.py:49
+msgid "Maximum user quota"
+msgstr "ユーザーの最大容量"
+
+#: mailu/ui/forms.py:101
+msgid "Keep a copy of the emails"
+msgstr "メールのコピーを残す"
+
+#: mailu/ui/forms.py:163
+msgid "Keep emails on the server"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:21
+msgid "Keep emails"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "yes"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "no"
+msgstr ""
+
+#: mailu/ui/forms.py:65
+msgid "Alternative name"
+msgstr ""
+
+#: mailu/ui/forms.py:70
+msgid "Relayed domain name"
+msgstr "リレードメイン名"
+
+#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
+msgid "Remote host"
 msgstr ""
 
 #: mailu/ui/templates/sidebar.html:54
 msgid "Relayed domains"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:66
-msgid "Mail domains"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:92
-msgid "Help"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:105
-msgid "Sign out"
-msgstr ""
-
-#: mailu/ui/templates/working.html:4
-msgid "We are still working on this feature!"
-msgstr ""
-
-#: mailu/ui/templates/admin/create.html:4
-msgid "Add a global administrator"
-msgstr ""
-
-#: mailu/ui/templates/admin/list.html:4
-msgid "Global administrators"
-msgstr ""
-
-#: mailu/ui/templates/admin/list.html:9
-msgid "Add administrator"
-msgstr ""
-
-#: mailu/ui/templates/admin/list.html:16 mailu/ui/templates/alias/list.html:18
-#: mailu/ui/templates/alternative/list.html:18
-#: mailu/ui/templates/domain/list.html:16 mailu/ui/templates/fetch/list.html:18
-#: mailu/ui/templates/manager/list.html:18
-#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18
-#: mailu/ui/templates/user/list.html:18
-msgid "Actions"
-msgstr ""
-
-#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
-#: mailu/ui/templates/manager/list.html:19 mailu/ui/templates/user/list.html:20
-msgid "Email"
-msgstr ""
-
-#: mailu/ui/templates/admin/list.html:22 mailu/ui/templates/alias/list.html:29
-#: mailu/ui/templates/alternative/list.html:25
-#: mailu/ui/templates/domain/list.html:31 mailu/ui/templates/fetch/list.html:31
-#: mailu/ui/templates/manager/list.html:24
-#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26
-#: mailu/ui/templates/user/list.html:31
-msgid "Delete"
-msgstr ""
-
-#: mailu/ui/templates/alias/create.html:4
-msgid "Create alias"
-msgstr ""
-
-#: mailu/ui/templates/alias/edit.html:4
-msgid "Edit alias"
-msgstr ""
-
-#: mailu/ui/templates/alias/list.html:4
-msgid "Alias list"
-msgstr ""
-
-#: mailu/ui/templates/alias/list.html:12
-msgid "Add alias"
-msgstr ""
-
-#: mailu/ui/templates/alias/list.html:22
-#: mailu/ui/templates/alternative/list.html:20
-#: mailu/ui/templates/domain/list.html:22 mailu/ui/templates/fetch/list.html:24
-#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21
-#: mailu/ui/templates/user/list.html:24
-msgid "Created"
-msgstr ""
-
-#: mailu/ui/templates/alias/list.html:23 mailu/ui/templates/domain/list.html:23
-#: mailu/ui/templates/fetch/list.html:25 mailu/ui/templates/relay/list.html:21
-#: mailu/ui/templates/user/list.html:25
-msgid "Last edit"
-msgstr ""
-
-#: mailu/ui/templates/alias/list.html:28 mailu/ui/templates/domain/list.html:30
-#: mailu/ui/templates/fetch/list.html:30 mailu/ui/templates/relay/list.html:26
-#: mailu/ui/templates/user/list.html:30
-msgid "Edit"
-msgstr ""
+msgstr "リレードメイン"
 
 #: mailu/ui/templates/alternative/create.html:4
 msgid "Create alternative domain"
@@ -446,147 +554,13 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: mailu/ui/templates/domain/create.html:4
-#: mailu/ui/templates/domain/list.html:9
-msgid "New domain"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:4
-msgid "Domain details"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:15
-msgid "Regenerate keys"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:31
-msgid "DNS MX entry"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:35
-msgid "DNS SPF entries"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:42
-msgid "DKIM public key"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:46
-msgid "DNS DKIM entry"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:50
-msgid "DNS DMARC entry"
-msgstr ""
-
-#: mailu/ui/templates/domain/edit.html:4
-msgid "Edit domain"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:4
-msgid "Domain list"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:17
-msgid "Manage"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:19
-msgid "Mailbox count"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:20
-msgid "Alias count"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:28
-msgid "Details"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:35
-msgid "Users"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:36
-msgid "Aliases"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:37
-msgid "Managers"
-msgstr ""
-
 #: mailu/ui/templates/domain/list.html:39
 msgid "Alternatives"
 msgstr ""
 
-#: mailu/ui/templates/domain/signup.html:13
-msgid ""
-"In order to register a new domain, you must first setup the\n"
-"    domain zone so that the domain <code>MX</code> points to this server"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid ""
-"If you do not know how to setup an <code>MX</code> record for your DNS "
-"zone,\n"
-"    please contact your DNS provider or administrator. Also, please wait "
-"a\n"
-"    couple minutes after the <code>MX</code> is set so the local server "
-"cache\n"
-"    expires."
-msgstr ""
-
-#: mailu/ui/templates/fetch/create.html:4
-msgid "Add a fetched account"
-msgstr ""
-
-#: mailu/ui/templates/fetch/edit.html:4
-msgid "Update a fetched account"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:12
-msgid "Add an account"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:19
-msgid "Endpoint"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:22
-msgid "Last check"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr ""
-
-#: mailu/ui/templates/manager/create.html:4
-msgid "Add a manager"
-msgstr ""
-
-#: mailu/ui/templates/manager/list.html:4
-msgid "Manager list"
-msgstr ""
-
-#: mailu/ui/templates/manager/list.html:12
-msgid "Add manager"
-msgstr ""
-
 #: mailu/ui/templates/relay/create.html:4
 msgid "New relay domain"
-msgstr ""
+msgstr "リレードメイン名を追加"
 
 #: mailu/ui/templates/relay/edit.html:4
 msgid "Edit relayd domain"
@@ -598,62 +572,120 @@ msgstr ""
 
 #: mailu/ui/templates/relay/list.html:9
 msgid "New relayed domain"
-msgstr ""
+msgstr "リレードメイン名を追加"
+
+#: mailu/ui/forms.py:125
+msgid "Your token (write it down, as it will never be displayed again)"
+msgstr "トークン (一度だけしか表示されません。書き留めてください。)"
+
+#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
+msgid "Authorized IP"
+msgstr "認証するIPアドレス"
+
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
+msgid "Authentication tokens"
+msgstr "認証トークン"
+
+#: mailu/ui/templates/sidebar.html:72
+msgid "Go to"
+msgstr "リンク"
+
+#: mailu/ui/templates/sidebar.html:76
+msgid "Webmail"
+msgstr "Webメール"
+
+#: mailu/ui/templates/sidebar.html:87
+msgid "Website"
+msgstr "Webサイト"
 
 #: mailu/ui/templates/token/create.html:4
 msgid "Create an authentication token"
-msgstr ""
+msgstr "認証トークンを作成"
 
 #: mailu/ui/templates/token/list.html:12
 msgid "New token"
-msgstr ""
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr ""
+msgstr "トークンを作成"
 
 #: mailu/ui/templates/user/create.html:15
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #: mailu/ui/templates/user/create.html:22
 msgid "Features and quotas"
+msgstr "サーバ機能と容量"
+
+#: mailu/ui/templates/user/settings.html:14
+msgid "General settings"
+msgstr "一般設定"
+
+#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
+msgid "Antispam"
+msgstr "スパムメール対策"
+
+#: mailu/ui/forms.py:99
+msgid "Spam filter tolerance"
 msgstr ""
 
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
+#: mailu/ui/forms.py:50
+msgid "Enable sign-up"
 msgstr ""
 
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
+#: mailu/ui/forms.py:57
+msgid "Initial admin"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
+#: mailu/ui/forms.py:58
+msgid "Admin password"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
+#: mailu/ui/forms.py:84
+msgid "Enabled"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
+#: mailu/ui/forms.py:89
+msgid "Email address"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
+#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
+#: mailu/ui/templates/user/signup.html:4
+#: mailu/ui/templates/user/signup_domain.html:4
+msgid "Sign up"
 msgstr ""
 
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
+#: mailu/ui/forms.py:119
+msgid "End of vacation"
+msgstr "自動返信終了日"
+
+#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
+msgid "Client setup"
 msgstr ""
 
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
+#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
+msgid "Mail protocol"
 msgstr ""
 
-#: mailu/ui/templates/user/settings.html:22
-msgid "Auto-forward"
+#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
+msgid "Server name"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
+msgid "Register a domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:17
+msgid "Generate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:13
+msgid "In order to register a new domain, you must first setup the\n"
+"    domain zone so that the domain <code>MX</code> points to this server"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid "If you do not know how to setup an <code>MX</code> record for your DNS zone,\n"
+"    please contact your DNS provider or administrator. Also, please wait a\n"
+"    couple minutes after the <code>MX</code> is set so the local server cache\n"
+"    expires."
 msgstr ""
 
 #: mailu/ui/templates/user/signup_domain.html:8
@@ -667,3 +699,4 @@ msgstr ""
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
 msgstr ""
+