diff --git a/i18n/fr.toml b/i18n/fr.toml
index 1db40d5..dd1a281 100644
--- a/i18n/fr.toml
+++ b/i18n/fr.toml
@@ -9,21 +9,21 @@ apply = "Appliquer"
 article_max_length = "Longueur maximale de l'article"
 avatar_help = "Veuillez vider le cache du navigateur"
 banned = "Banni"
-batch_delete_read = "Batch delete notifications you have read" # @TODO
-batch_mark_as_read = "Batch mark as read" # @TODO
+batch_delete_read = "Supprimer en masse les notifications lues"
+batch_mark_as_read = "Marquer tout comme lu"
 captcha = "Captcha"
 captcha_difficulty = "Difficulté du captcha"
 captcha_name = "Nom du captcha"
 comment = "Commentaire"
 comment_interval = "Intervalle des commentaires"
 comment_max_length = "Longueur maximale du commentaire"
-comments = "Comments" # @TODO
+comments = "Commentaires"
 created = "Créé"
-custom_footer_code = "Custom footer code" # @TODO
+custom_footer_code = "Code de pied de page personnalisé"
 db_view = "Vue de la base de données"
 delete = "Supprimer"
 delete_draft = "Supprimer le brouillon"
-delete_notification = "Delete notification" # @TODO
+delete_notification = "Supprimer la notification"
 delete_permanently = "Supprimer définitivement"
 delete_sure = "Êtes-vous sûr de vouloir supprimer ceci ?"
 description = "Description"
@@ -39,10 +39,10 @@ exit = "Quitter"
 explore = "Explorer"
 feed_add_help = "Ne fonctionne que lorsque 'Nouveau' est sélectionné"
 feed_url_help = "URL du flux rss/atom"
-feeds = "Feeds" # @TODO
+feeds = "Flux"
 fellow = "Membre"
 folder = "Dossier"
-follow = "Follow" # @TODO
+follow = "Suivre"
 followers = "Abonnés"
 following = "Abonnements"
 forgot_password = "Mot de passe oublié ?"
@@ -51,14 +51,14 @@ hard = "Difficile"
 hidden = "Caché"
 hide = "Cacher"
 home_page = "Page d'accueil par défaut"
-inn = "Inn" # @TODO
+inn = "Auberge"
 inn_feed_help = "Soumettez à nouveau l'URL pour vous désabonner."
 inn_mod_max = "Max modérateurs"
 inn_name = "Nom de l'auberge"
 inn_type = "Type d'auberge"
 intern = "Stagiaire"
 is_public = "Est public"
-javascript_is_required_for_rich_editor = "JavaScript is required for rich editing; falling back to plain textarea." # @TODO
+javascript_is_required_for_rich_editor = "JavaScript est requis pour l'édition enrichie ; retour à la zone de texte simple."
 join = "Rejoindre"
 join_to_comment = "Rejoignez pour commenter"
 joined = "Rejoint"
@@ -74,7 +74,7 @@ lock = "Verrouiller"
 login_captcha = "Captcha de connexion"
 medium = "Moyen"
 members = "Membres"
-message = "Message" # @TODO
+message = "Message"
 mod = "Modérateur"
 new = "Nouveau"
 new_comment = "Nouveau commentaire"
@@ -82,10 +82,10 @@ new_folder = "Nouveau dossier"
 new_password = "Nouveau mot de passe"
 new_post = "Nouvel article"
 next = "Suivant"
-no = "No" # @TODO
-notifications = "Notifications" # @TODO
+no = "Non"
+notifications = "Notifications"
 old_password = "Ancien mot de passe"
-only_you_can_see = "Only you can see" # @TODO
+only_you_can_see = "Vous seul pouvez voir"
 password = "Mot de passe"
 password_help = "Le mot de passe doit comporter entre 7 et 20 caractères"
 password_reset = "Réinitialiser le mot de passe"
@@ -94,13 +94,13 @@ per_page = "Par page"
 pin = "Épingler"
 post = "Publier"
 post_interval = "Intervalle de publication"
-posts = "Posts" # @TODO
+posts = "Publications"
 prev = "Précédent"
 preview = "Aperçu"
 private = "Privé"
 private_help = "L'auberge privée ne peut pas être changée en un autre type."
 private_hidden = "Privé caché"
-profile = "Profile" # @TODO
+profile = "Profil"
 public = "Public"
 re_enter_password = "Confirmer le mot de passe"
 read_only = "Lecture seule"
@@ -114,22 +114,22 @@ recovery_help = "Vous devez saisir votre mot de passe pour générer ou réiniti
 refresh = "Actualiser"
 rejected = "Rejeté"
 remove = "Supprimer"
-replying_to = "Replying to" # @TODO
-rss = "Rss" # @TODO
+replying_to = "En réponse à"
+rss = "RSS"
 role = "Rôle"
 save = "Enregistrer"
 save_draft = "Enregistrer le brouillon"
 search = "Recherche"
 senior = "Sénior"
 sessions = "Sessions"
-settings = "Settings" # @TODO
+settings = "Paramètres"
 sign_in = "Se connecter"
 sign_in_to_comment = "Connectez-vous pour commenter"
 sign_out = "Se déconnecter"
 sign_up = "S'inscrire"
 site_name = "Nom du site"
 site_settings = "Paramètres du site"
-solo = "Solo" # @TODO
+solo = "Solo"
 solo_interval = "Intervalle solo"
 source = "Source"
 spam_regex = "Regex spam"
@@ -140,14 +140,14 @@ stay_logged_in = "Rester connecté"
 submit = "Soumettre"
 subscribe = "S'abonner"
 super = "Super"
-tags_separated_by = "tags, separated by #" # @TODO
+tags_separated_by = "tags, séparés par #"
 terms = "termes et conditions"
 title = "Titre"
 title_max_length = "Longueur maximale du titre"
 topics = "Sujets"
 topics_help = "Séparés par #"
 uname_or_id = "Nom d'utilisateur ou uid"
-unfollow = "Unfollow" # @TODO
+unfollow = "Ne plus suivre"
 unhide = "Révéler"
 unlock = "Déverrouiller"
 unpin = "Détacher"
@@ -159,5 +159,5 @@ url = "URL"
 user_name = "Nom d'utilisateur"
 user_name_help = "Nom d'utilisateur, ne commence pas par un chiffre, 2 à 10 caractères"
 users = "Utilisateurs"
-yes = "Yes" # @TODO
+yes = "Oui"
 warning = "Avertissement"
diff --git a/i18n/ja.toml b/i18n/ja.toml
index 8aa6619..df2ae13 100644
--- a/i18n/ja.toml
+++ b/i18n/ja.toml
@@ -9,21 +9,21 @@ apply = "適用"
 article_max_length = "記事の最大長"
 avatar_help = "ブラウザのキャッシュをクリアしてください"
 banned = "禁止"
-batch_delete_read = "Batch delete notifications you have read" # @TODO
-batch_mark_as_read = "Batch mark as read" # @TODO
+batch_delete_read = "既読の通知を一括削除"
+batch_mark_as_read = "一括で既読にする"
 captcha = "キャプチャ"
 captcha_difficulty = "キャプチャの難易度"
 captcha_name = "キャプチャ名"
 comment = "コメント"
 comment_interval = "コメントの間隔"
 comment_max_length = "コメントの最大長"
-comments = "Comments" # @TODO
+comments = "コメント"
 created = "作成日時"
-custom_footer_code = "Custom footer code" # @TODO
+custom_footer_code = "カスタムフッターコード"
 db_view = "データベースビュー"
 delete = "削除"
 delete_draft = "ドラフトを削除"
-delete_notification = "Delete notification" # @TODO
+delete_notification = "通知を削除"
 delete_permanently = "完全に削除"
 delete_sure = "本当に削除しますか？"
 description = "説明"
@@ -39,10 +39,10 @@ exit = "終了"
 explore = "探索"
 feed_add_help = "新規選択時のみ機能します"
 feed_url_help = "rss/atom フィードURL"
-feeds = "Feeds" # @TODO
+feeds = "フィード"
 fellow = "フェロー"
 folder = "フォルダ"
-follow = "Follow" # @TODO
+follow = "フォロー"
 followers = "フォロワー"
 following = "フォロー中"
 forgot_password = "パスワードをお忘れですか？"
@@ -51,14 +51,14 @@ hard = "難しい"
 hidden = "非表示"
 hide = "非表示"
 home_page = "デフォルトホームページ"
-inn = "Inn" # @TODO
+inn = "イン"
 inn_feed_help = "もう一度 URL を送信して購読を解除します。"
 inn_mod_max = "最大管理者数"
 inn_name = "イン名"
 inn_type = "インタイプ"
 intern = "インターン"
 is_public = "公開されていますか？"
-javascript_is_required_for_rich_editor = "JavaScript is required for rich editing; falling back to plain textarea." # @TODO
+javascript_is_required_for_rich_editor = "リッチエディタにはJavaScriptが必要です。通常のテキストエリアにフォールバックします。"
 join = "参加"
 join_to_comment = "コメントするには参加"
 joined = "参加済み"
@@ -74,7 +74,7 @@ lock = "ロック"
 login_captcha = "ログインキャプチャ"
 medium = "中"
 members = "メンバー"
-message = "Message" # @TODO
+message = "メッセージ"
 mod = "モデレーター"
 new = "新規"
 new_comment = "新しいコメント"
@@ -82,10 +82,10 @@ new_folder = "新しいフォルダ"
 new_password = "新しいパスワード"
 new_post = "新しい投稿"
 next = "次"
-no = "No" # @TODO
-notifications = "Notifications" # @TODO
+no = "いいえ"
+notifications = "通知"
 old_password = "旧パスワード"
-only_you_can_see = "Only you can see" # @TODO
+only_you_can_see = "あなただけが見ることができます"
 password = "パスワード"
 password_help = "パスワードは7〜20文字で入力してください"
 password_reset = "パスワードのリセット"
@@ -94,13 +94,13 @@ per_page = "1ページあたり"
 pin = "ピン"
 post = "投稿"
 post_interval = "投稿の間隔"
-posts = "Posts" # @TODO
+posts = "投稿"
 prev = "前"
 preview = "プレビュー"
 private = "非公開"
 private_help = "非公開のインは他のタイプに変更できません。"
 private_hidden = "非公開の非表示"
-profile = "Profile" # @TODO
+profile = "プロフィール"
 public = "公開"
 re_enter_password = "パスワードを再入力"
 read_only = "読み取り専用"
@@ -114,22 +114,22 @@ recovery_help = "回復コードを生成またはリセットするには、パ
 refresh = "更新"
 rejected = "拒否されました"
 remove = "削除"
-replying_to = "Replying to" # @TODO
-rss = "Rss" # @TODO
+replying_to = "返信先"
+rss = "RSS"
 role = "役割"
 save = "保存"
 save_draft = "ドラフトを保存"
 search = "検索"
 senior = "シニア"
 sessions = "セッション"
-settings = "Settings" # @TODO
+settings = "設定"
 sign_in = "ログイン"
 sign_in_to_comment = "コメントするにはログイン"
 sign_out = "ログアウト"
 sign_up = "サインアップ"
 site_name = "サイト名"
 site_settings = "サイト設定"
-solo = "Solo" # @TODO
+solo = "ソロ"
 solo_interval = "個別投稿間隔"
 source = "ソース"
 spam_regex = "スパムの正規表現"
@@ -140,14 +140,14 @@ stay_logged_in = "ログイン状態を維持"
 submit = "送信"
 subscribe = "購読"
 super = "スーパー"
-tags_separated_by = "tags, separated by #" # @TODO
+tags_separated_by = "タグ、# で区切る"
 terms = "利用規約"
 title = "タイトル"
 title_max_length = "タイトルの最大長"
 topics = "トピック"
 topics_help = "# で区切り"
 uname_or_id = "ユーザー名またはユーザーID"
-unfollow = "Unfollow" # @TODO
+unfollow = "フォロー解除"
 unhide = "非表示を解除"
 unlock = "アンロック"
 unpin = "ピンを外す"
@@ -159,5 +159,5 @@ url = "URL"
 user_name = "ユーザー名"
 user_name_help = "ユーザー名、数字で始まらない、2〜10文字"
 users = "ユーザー"
-yes = "Yes" # @TODO
+yes = "はい"
 warning = "警告"
diff --git a/i18n/zh_cn.toml b/i18n/zh_cn.toml
index 77b2c2b..4e38a15 100644
--- a/i18n/zh_cn.toml
+++ b/i18n/zh_cn.toml
@@ -9,21 +9,21 @@ apply = "应用"
 article_max_length = "文章最大长度"
 avatar_help = "请清除浏览器缓存"
 banned = "已禁用"
-batch_delete_read = "Batch delete notifications you have read" # @TODO
-batch_mark_as_read = "Batch mark as read" # @TODO
+batch_delete_read = "批量删除已读通知"
+batch_mark_as_read = "批量标记为已读"
 captcha = "验证码"
 captcha_difficulty = "验证码难度"
 captcha_name = "验证码名称"
 comment = "评论"
 comment_interval = "评论间隔"
 comment_max_length = "评论最大长度"
-comments = "Comments" # @TODO
+comments = "评论"
 created = "创建时间"
-custom_footer_code = "Custom footer code" # @TODO
+custom_footer_code = "自定义页脚代码"
 db_view = "数据库视图"
 delete = "删除"
 delete_draft = "删除草稿"
-delete_notification = "Delete notification" # @TODO
+delete_notification = "删除通知"
 delete_permanently = "永久删除"
 delete_sure = "确定要删除吗？"
 description = "描述"
@@ -39,10 +39,10 @@ exit = "退出"
 explore = "探索"
 feed_add_help = "仅在选择新建时有效"
 feed_url_help = "rss/atom 源地址"
-feeds = "Feeds" # @TODO
+feeds = "订阅源"
 fellow = "Fellow"
 folder = "文件夹"
-follow = "Follow" # @TODO
+follow = "关注"
 followers = "关注者"
 following = "关注"
 forgot_password = "忘记密码？"
@@ -51,14 +51,14 @@ hard = "困难"
 hidden = "隐藏"
 hide = "隐藏"
 home_page = "默认主页"
-inn = "Inn" # @TODO
+inn = "小屋"
 inn_feed_help = "再次提交 url 以取消订阅。"
 inn_mod_max = "最大管理员数量"
 inn_name = "小屋名称"
 inn_type = "小屋类型"
 intern = "实习生"
 is_public = "是否公开"
-javascript_is_required_for_rich_editor = "JavaScript is required for rich editing; falling back to plain textarea." # @TODO
+javascript_is_required_for_rich_editor = "富文本编辑需要 JavaScript；回退到纯文本框。"
 join = "加入"
 join_to_comment = "加入以评论"
 joined = "已加入"
@@ -74,7 +74,7 @@ lock = "锁定"
 medium = "中等"
 login_captcha = "登录验证码"
 members = "成员"
-message = "Message" # @TODO
+message = "消息"
 mod = "管理员"
 new = "新建"
 new_comment = "新评论"
@@ -82,10 +82,10 @@ new_folder = "新文件夹"
 new_password = "新密码"
 new_post = "新帖子"
 next = "下一页"
-no = "No" # @TODO
-notifications = "Notifications" # @TODO
+no = "否"
+notifications = "通知"
 old_password = "旧密码"
-only_you_can_see = "Only you can see" # @TODO
+only_you_can_see = "仅自己可见"
 password = "密码"
 password_help = "密码必须为 7 - 20 个字符"
 password_reset = "密码重置"
@@ -94,13 +94,13 @@ per_page = "每页数量"
 pin = "置顶"
 post = "发布"
 post_interval = "发布间隔"
-posts = "Posts" # @TODO
+posts = "帖子"
 prev = "上一页"
 preview = "预览"
 private = "私有"
 private_help = "私有小屋不能更改为其他类型。"
 private_hidden = "隐藏的私有"
-profile = "Profile" # @TODO
+profile = "个人资料"
 public = "公开"
 re_enter_password = "再次输入密码"
 read_only = "只读"
@@ -114,22 +114,22 @@ recovery_help = "您必须输入密码才能生成或重置恢复代码。"
 refresh = "刷新"
 rejected = "已拒绝"
 remove = "移除"
-replying_to = "Replying to" # @TODO
-rss = "Rss" # @TODO
+replying_to = "回复"
+rss = "RSS"
 role = "角色"
 save = "保存"
 save_draft = "保存草稿"
 search = "搜索"
 senior = "资深"
 sessions = "会话"
-settings = "Settings" # @TODO
+settings = "设置"
 sign_in = "登录"
 sign_in_to_comment = "登录后评论"
 sign_out = "登出"
 sign_up = "注册"
 site_name = "站点名称"
 site_settings = "站点设置"
-solo = "Solo" # @TODO
+solo = "单独"
 solo_interval = "单独发布间隔"
 source = "来源"
 spam_regex = "垃圾信息正则表达式"
@@ -140,14 +140,14 @@ stay_logged_in = "保持登录"
 submit = "提交"
 subscribe = "订阅"
 super = "超级管理员"
-tags_separated_by = "tags, separated by #" # @TODO
+tags_separated_by = "标签，使用 # 分隔"
 terms = "条款与条件"
 title = "标题"
 title_max_length = "标题最大长度"
 topics = "主题"
 topics_help = "使用 # 分隔"
 uname_or_id = "用户名或用户 ID"
-unfollow = "Unfollow" # @TODO
+unfollow = "取消关注"
 unhide = "取消隐藏"
 unlock = "解锁"
 unpin = "取消置顶"
@@ -159,5 +159,5 @@ url = "URL"
 user_name = "用户名"
 user_name_help = "用户名，不以数字开头，2 - 10 个字符"
 users = "用户"
-yes = "Yes" # @TODO
+yes = "是"
 warning = "警告"