diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 706b00cc..fcda66fd 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -20,9 +20,9 @@ If you're planning to work on a new feature leave a message on the Matrix room
 
 Example for a Japanese translation.
 - Create a new translation file using the prototype in English
-  - e.g `cp resources/langs/nheko_en.ts resources/langs/nheko_jp.ts`
+  - e.g `cp resources/langs/nheko_en.ts resources/langs/nheko_ja.ts`
 - Open the new translation file and change the line regarding the locale to reflect the current language.
-  - e.g `<TS version="2.1" language="en">` => `<TS version="2.1" language="jp">`
+  - e.g `<TS version="2.1" language="en">` => `<TS version="2.1" language="ja">`
 - Run `make update-translations` to update the translation files with any missing text.
 - Fill out the translation file (Qt Linguist can make things easier).
 - Submit a PR!
diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 74dfb314..63772bf9 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein.</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation>gelöscht</translation>
     </message>
@@ -353,7 +353,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation>keine Version gespeichert</translation>
     </message>
@@ -451,7 +451,7 @@
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>Datei auswählen</translation>
     </message>
@@ -625,7 +625,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished">Lesebestätigungen</translation>
     </message>
@@ -748,7 +748,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1088,12 +1088,12 @@ Medien-Größe: %2
         <translation>Benachrichtigungen</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>Stumm</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>Nur Erwähnungen</translation>
     </message>
@@ -1103,7 +1103,7 @@ Medien-Größe: %2
         <translation>Alle Nachrichten</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation>Raumzugang</translation>
     </message>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index 8a4e4dc6..39471c09 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,7 +353,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -451,7 +451,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>Διάλεξε ένα αρχείο</translation>
     </message>
@@ -625,7 +625,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -748,7 +748,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1086,12 +1086,12 @@ Media size: %2
         <translation>Ειδοποιήσεις</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>Αθόρυβο</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>Αναφορές μόνο</translation>
     </message>
@@ -1101,7 +1101,7 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index d43ef737..ba462b41 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Failed to restore OLM account. Please login again.</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,7 +353,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation>no version stored</translation>
     </message>
@@ -451,7 +451,7 @@
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>Select a file</translation>
     </message>
@@ -625,7 +625,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished">Read receipts</translation>
     </message>
@@ -748,7 +748,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1088,12 +1088,12 @@ Media size: %2
         <translation>Notifications</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>Muted</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>Mentions only</translation>
     </message>
@@ -1103,7 +1103,7 @@ Media size: %2
         <translation>All messages</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation>Room access</translation>
     </message>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 2f4ef859..208209c6 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>OLM-tilin palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,7 +353,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation>ei tallennettua versiota</translation>
     </message>
@@ -451,7 +451,7 @@
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>Valitse tiedosto</translation>
     </message>
@@ -625,7 +625,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished">Lukukuittaukset</translation>
     </message>
@@ -748,7 +748,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1088,12 +1088,12 @@ Median koko: %2
         <translation>Ilmoitukset</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>Vaimennettu</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>Vain maininnat</translation>
     </message>
@@ -1103,7 +1103,7 @@ Median koko: %2
         <translation>Kaikki viestit</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation>Pääsy huoneeseen</translation>
     </message>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index 4369a873..6c97cc64 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -354,7 +354,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -452,7 +452,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>Sélectionnez un fichier</translation>
     </message>
@@ -626,7 +626,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished">Accusés de lecture</translation>
     </message>
@@ -749,7 +749,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1089,12 +1089,12 @@ Taille du média : %2
         <translation>Notifications</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>Silencieux</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>Uniquement les mentions</translation>
     </message>
@@ -1104,7 +1104,7 @@ Taille du média : %2
         <translation>Tous les messages</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation>Accès au salon</translation>
     </message>
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
new file mode 100644
index 00000000..180c060e
--- /dev/null
+++ b/resources/langs/nheko_ja.ts
@@ -0,0 +1,1368 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ja_JP">
+<context>
+    <name>ChatPage</name>
+    <message>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
+        <source>Failed to invite user: %1</source>
+        <translation>ユーザーを招待できませんでした: %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+868"/>
+        <source>Invited user: %1</source>
+        <translation>招待されたユーザー: %1</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Failed to invite %1 to %2: %3</source>
+        <translation>%2に%1を招待できませんでした: %3</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Failed to kick %1 to %2: %3</source>
+        <translation>%2に%1を一時的に追放できませんでした: %3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Kicked user: %1</source>
+        <translation>一時的に追放されたユーザー: %1</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Failed to ban %1 in %2: %3</source>
+        <translation>%2で%1を永久追放できませんでした: %3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Banned user: %1</source>
+        <translation>永久追放されたユーザー: %1</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Failed to unban %1 in %2: %3</source>
+        <translation>%2で%1の永久追放を解除できませんでした: %3</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Unbanned user: %1</source>
+        <translation>永久追放を解除されたユーザー: %1</translation>
+    </message>
+    <message>
+        <location line="-807"/>
+        <source>Failed to upload media. Please try again.</source>
+        <translation>メディアをアップロードできませんでした。やり直して下さい。</translation>
+    </message>
+    <message>
+        <location line="+399"/>
+        <source>Failed to restore OLM account. Please login again.</source>
+        <translation>OLMアカウントを復元できませんでした。もう一度ログインして下さい。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Failed to restore save data. Please login again.</source>
+        <translation>セーブデータを復元できませんでした。もう一度ログインして下さい。</translation>
+    </message>
+    <message>
+        <location line="+148"/>
+        <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
+        <translation>暗号化鍵を設定できませんでした。サーバーの応答: %1 %2. 後でやり直して下さい。</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <location line="+231"/>
+        <source>Please try to login again: %1</source>
+        <translation>もう一度ログインしてみて下さい: %1</translation>
+    </message>
+    <message>
+        <location line="-154"/>
+        <source>Failed to join room: %1</source>
+        <translation>部屋に参加できませんでした: %1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You joined the room</source>
+        <translation>部屋に参加しました</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Failed to remove invite: %1</source>
+        <translation>招待を削除できませんでした: %1</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Room creation failed: %1</source>
+        <translation>部屋を作成できませんでした: %1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Room %1 created</source>
+        <translation>部屋 %1 を作成しました</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Failed to leave room: %1</source>
+        <translation>部屋から出られませんでした: %1</translation>
+    </message>
+</context>
+<context>
+    <name>CommunitiesListItem</name>
+    <message>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
+        <source>All rooms</source>
+        <translation>全ての部屋</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Favourite rooms</source>
+        <translation>お気に入りの部屋</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Low priority rooms</source>
+        <translation>優先度の低い部屋</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source> (tag)</source>
+        <translation> (タグ)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source> (community)</source>
+        <translation> (コミュニティー)</translation>
+    </message>
+</context>
+<context>
+    <name>EditModal</name>
+    <message>
+        <location filename="../../src/dialogs/RoomSettings.cpp" line="+59"/>
+        <source>Apply</source>
+        <translation>適用</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Topic</source>
+        <translation>話題</translation>
+    </message>
+</context>
+<context>
+    <name>EncryptionIndicator</name>
+    <message>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+        <source>Encrypted</source>
+        <translation>暗号化されています</translation>
+    </message>
+</context>
+<context>
+    <name>InviteeItem</name>
+    <message>
+        <location filename="../../src/InviteeItem.cpp" line="+17"/>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+</context>
+<context>
+    <name>LoginPage</name>
+    <message>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
+        <source>Matrix ID</source>
+        <translation>Matrix ID</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>e.g @joe:matrix.org</source>
+        <translation>例 @joe:matrix.org</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Device name</source>
+        <translation>デバイス名</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>LOGIN</source>
+        <translation>ログイン</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>Autodiscovery failed. Received malformed response.</source>
+        <translation>自動検出できませんでした。不正な形式の応答を受信しました。</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Autodiscovery failed. Unknown error when requesting .well-known.</source>
+        <translation>自動検出できませんでした。.well-known要求時の不明なエラー。</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>The required endpoints were not found. Possibly not a Matrix server.</source>
+        <translation>必要な端点が見つかりません。Matrixサーバーではないかもしれません。</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Received malformed response. Make sure the homeserver domain is valid.</source>
+        <translation>不正な形式の応答を受信しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>An unknown error occured. Make sure the homeserver domain is valid.</source>
+        <translation>不明なエラーが発生しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <source>Empty password</source>
+        <translation>パスワードが入力されていません</translation>
+    </message>
+</context>
+<context>
+    <name>MemberList</name>
+    <message>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <source>Room members</source>
+        <translation>部屋の参加者</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>MessageDelegate</name>
+    <message>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <source>redacted</source>
+        <translation>編集済み</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Encryption enabled</source>
+        <translation>暗号化が有効です</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>room name changed to: %1</source>
+        <translation>部屋名が変更されました: %1</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>removed room name</source>
+        <translation>部屋名が削除されました</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>topic changed to: %1</source>
+        <translation>話題が変更されました: %1</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>removed topic</source>
+        <translation>話題が削除されました</translation>
+    </message>
+</context>
+<context>
+    <name>Placeholder</name>
+    <message>
+        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <source>unimplemented event: </source>
+        <translation>未実装のイベント: </translation>
+    </message>
+</context>
+<context>
+    <name>QuickSwitcher</name>
+    <message>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <source>Search for a room...</source>
+        <translation>部屋を探す...</translation>
+    </message>
+</context>
+<context>
+    <name>RegisterPage</name>
+    <message>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
+        <source>Username</source>
+        <translation>ユーザー名</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Password confirmation</source>
+        <translation>パスワード確認</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Home Server</source>
+        <translation>ホームサーバー</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>REGISTER</source>
+        <translation>登録</translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <source>Invalid username</source>
+        <translation>無効なユーザー名です</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Password is not long enough (min 8 chars)</source>
+        <translation>パスワード長が不足しています (最小8文字)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Passwords don&apos;t match</source>
+        <translation>パスワードが一致しません</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Invalid server name</source>
+        <translation>無効なサーバー名です</translation>
+    </message>
+</context>
+<context>
+    <name>ReplyPopup</name>
+    <message>
+        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
+        <source>Logout</source>
+        <translation>ログアウト</translation>
+    </message>
+</context>
+<context>
+    <name>RoomInfo</name>
+    <message>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <source>no version stored</source>
+        <translation>バージョンが保存されていません</translation>
+    </message>
+</context>
+<context>
+    <name>RoomInfoListItem</name>
+    <message>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+95"/>
+        <source>Leave room</source>
+        <translation>部屋を出る</translation>
+    </message>
+    <message>
+        <location line="+151"/>
+        <source>Accept</source>
+        <translation>容認</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Decline</source>
+        <translation>拒否</translation>
+    </message>
+</context>
+<context>
+    <name>SideBarActions</name>
+    <message>
+        <location filename="../../src/SideBarActions.cpp" line="+38"/>
+        <source>User settings</source>
+        <translation>ユーザー設定</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Create new room</source>
+        <translation>新しい部屋を作成</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Join a room</source>
+        <translation>部屋に参加</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Start a new chat</source>
+        <translation>新しいチャットを開始</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Room directory</source>
+        <translation>部屋一覧</translation>
+    </message>
+</context>
+<context>
+    <name>StatusIndicator</name>
+    <message>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
+        <source>Failed</source>
+        <translation>失敗</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Sent</source>
+        <translation>送信済み</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Received</source>
+        <translation>受信済み</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Read</source>
+        <translation>既読</translation>
+    </message>
+</context>
+<context>
+    <name>TextInputWidget</name>
+    <message>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <source>Send a file</source>
+        <translation>ファイルを送信</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <source>Write a message...</source>
+        <translation>メッセージを書く...</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Send a message</source>
+        <translation>メッセージを送信</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Emoji</source>
+        <translation>絵文字</translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <source>Select a file</source>
+        <translation>ファイルを選択</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation>全てのファイル (*)</translation>
+    </message>
+    <message>
+        <location filename="../../src/TextInputWidget.h" line="-5"/>
+        <source>Connection lost. Nheko is trying to re-connect...</source>
+        <translation>接続が切れました。Nhekoは再接続を試みています...</translation>
+    </message>
+</context>
+<context>
+    <name>TimelineModel</name>
+    <message>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
+        <source>-- Encrypted Event (No keys found for decryption) --</source>
+        <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
+        <translation>-- 暗号化イベント (復号鍵が見つかりません) --</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>-- Decryption Error (failed to communicate with DB) --</source>
+        <comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
+        <translation>-- 復号エラー (データベースと通信できませんでした) --</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
+        <comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed.</comment>
+        <translation>-- 復号エラー (データベースからmegolm鍵を取得できませんでした) --</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>-- Decryption Error (%1) --</source>
+        <comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
+        <translation>-- 復号エラー (%1) --</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>-- Encrypted Event (Unknown event type) --</source>
+        <comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
+        <translation>-- 暗号化イベント (不明なイベント型です) --</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Message redaction failed: %1</source>
+        <translation>メッセージを編集できませんでした: %1</translation>
+    </message>
+    <message>
+        <location line="+454"/>
+        <source>Save image</source>
+        <translation>画像を保存</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Save video</source>
+        <translation>動画を保存</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Save audio</source>
+        <translation>音声を保存</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Save file</source>
+        <translation>ファイルを保存</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+126"/>
+        <source>%1 and %2 are typing</source>
+        <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
+        <translation>
+            <numerusform>%1%2が入力しています</numerusform>
+            <numerusform>%1と%2が入力しています</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+95"/>
+        <source>%1 was invited.</source>
+        <translation>%1が招待されました。</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>%1 changed their display name and avatar.</source>
+        <translation>%1が表示名とアバターを変更しました。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 changed their display name.</source>
+        <translation>%1が表示名を変更しました。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 changed their avatar.</source>
+        <translation>%1がアバターを変更しました。</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>%1 joined.</source>
+        <translation>%1が参加しました。</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>%1 rejected their invite.</source>
+        <translation>%1が招待を拒否しました。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Revoked the invite to %1.</source>
+        <translation>%1への招待を取り消しました。</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 left the room.</source>
+        <translation>%1は退室しました。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Kicked %1.</source>
+        <translation>%1を一時的に追放しました。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Unbanned %1</source>
+        <translation>%1の永久追放を解除しました</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 redacted their knock.</source>
+        <translation>%1がノックを編集しました。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rejected the knock from %1.</source>
+        <translation>%1からのノックを拒否しました。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 left after having already left!</source>
+        <comment>This is a leave event after the user already left and shouln&apos;t happen apart from state resets</comment>
+        <translation>退出済みの%1が退出しました!</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>%1 was banned.</source>
+        <translation>%1が永久追放されました。</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1 knocked.</source>
+        <translation>%1がノックしました。</translation>
+    </message>
+</context>
+<context>
+    <name>TimelineRow</name>
+    <message>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
+        <source>Reply</source>
+        <translation>返信</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Options</source>
+        <translation>オプション</translation>
+    </message>
+</context>
+<context>
+    <name>TimelineView</name>
+    <message>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
+        <source>Read receipts</source>
+        <translation>開封確認</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Mark as read</source>
+        <translation>既読にする</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>View raw message</source>
+        <translation>ソースを見る</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Redact message</source>
+        <translation>メッセージを編集</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save as</source>
+        <translation>名前を付けて保存</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>No room open</source>
+        <translation>部屋が開いていません</translation>
+    </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+</context>
+<context>
+    <name>TopRoomBar</name>
+    <message>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
+        <source>Room options</source>
+        <translation>部屋のオプション</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Mentions</source>
+        <translation>メンション</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Invite users</source>
+        <translation>ユーザーを招待</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Members</source>
+        <translation>メンバー</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Leave room</source>
+        <translation>退室する</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Settings</source>
+        <translation>設定</translation>
+    </message>
+</context>
+<context>
+    <name>TrayIcon</name>
+    <message>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <source>Show</source>
+        <translation>表示</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Quit</source>
+        <translation>終了</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoWidget</name>
+    <message>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
+        <source>Logout</source>
+        <translation>ログアウト</translation>
+    </message>
+</context>
+<context>
+    <name>UserSettingsPage</name>
+    <message>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
+        <source>Minimize to tray</source>
+        <translation>トレイへ最小化</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Start in tray</source>
+        <translation>トレイで起動</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Group&apos;s sidebar</source>
+        <translation>グループサイドバー</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Circular Avatars</source>
+        <translation>円形アバター</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Typing notifications</source>
+        <translation>入力状態の通知</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Read receipts</source>
+        <translation>開封確認</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Send messages as Markdown</source>
+        <translation>メッセージをMarkdownとして送信</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Desktop notifications</source>
+        <translation>デスクトップ通知</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Scale factor</source>
+        <translation>尺度係数</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Font size</source>
+        <translation>フォントサイズ</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Font Family</source>
+        <translation>フォントファミリー</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Emoji Font Famly</source>
+        <translation>絵文字のフォントファミリー</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Theme</source>
+        <translation>テーマ</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Device ID</source>
+        <translation>デバイスID</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Device Fingerprint</source>
+        <translation>デバイスの指紋</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Session Keys</source>
+        <translation>セッション鍵</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>IMPORT</source>
+        <translation>インポート</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>EXPORT</source>
+        <translation>エクスポート</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>ENCRYPTION</source>
+        <translation>暗号化</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>GENERAL</source>
+        <translation>全般</translation>
+    </message>
+    <message>
+        <location line="+168"/>
+        <source>Open Sessions File</source>
+        <translation>セッションファイルを開く</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+18"/>
+        <location line="+9"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <location line="+19"/>
+        <location line="+10"/>
+        <location line="+18"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location line="-73"/>
+        <location line="+32"/>
+        <source>File Password</source>
+        <translation>ファイルのパスワード</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <source>Enter the passphrase to decrypt the file:</source>
+        <translation>ファイルを復号するためのパスフレーズを入力して下さい:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location line="+32"/>
+        <source>The password cannot be empty</source>
+        <translation>パスワードを空にはできません</translation>
+    </message>
+    <message>
+        <location line="-8"/>
+        <source>Enter passphrase to encrypt your session keys:</source>
+        <translation>セッション鍵を暗号化するためのパスフレーズを入力して下さい:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>File to save the exported session keys</source>
+        <translation>エクスポートされたセッション鍵を保存するファイル</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomePage</name>
+    <message>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
+        <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
+        <translation>Matrixプロトコルのデスクトップクライアント、nhekoへようこそ!</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enjoy your stay!</source>
+        <translation>会話を楽しんで下さい!</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>REGISTER</source>
+        <translation>登録</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>LOGIN</source>
+        <translation>ログイン</translation>
+    </message>
+</context>
+<context>
+    <name>descriptiveTime</name>
+    <message>
+        <location filename="../../src/Utils.cpp" line="+138"/>
+        <source>Yesterday</source>
+        <translation>昨日</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::CreateRoom</name>
+    <message>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <source>Create room</source>
+        <translation>部屋を作成</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Topic</source>
+        <translation>話題</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Alias</source>
+        <translation>別名</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Room Visibility</source>
+        <translation>部屋の可視性</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Room Preset</source>
+        <translation>部屋の初期値</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Direct Chat</source>
+        <translation>ダイレクトメッセージ</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::InviteUsers</name>
+    <message>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+41"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>User ID to invite</source>
+        <translation>招待するユーザーのID</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::JoinRoom</name>
+    <message>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <source>Join</source>
+        <translation>参加</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Room ID or alias</source>
+        <translation>部屋のID又は別名</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::LeaveRoom</name>
+    <message>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Are you sure you want to leave?</source>
+        <translation>本当に退出しますか?</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::Logout</name>
+    <message>
+        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Logout. Are you sure?</source>
+        <translation>本当にログアウトしますか?</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::PreviewUploadOverlay</name>
+    <message>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <source>Upload</source>
+        <translation>アップロード</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>Media type: %1
+Media size: %2
+</source>
+        <translation>メディアの種類: %1
+メディアのサイズ: %2
+</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::ReCaptcha</name>
+    <message>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Confirm</source>
+        <translation>確認</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Solve the reCAPTCHA and press the confirm button</source>
+        <translation>reCAPTCHAに解答して、確認ボタンを押して下さい</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::ReadReceipts</name>
+    <message>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+117"/>
+        <source>Read receipts</source>
+        <translation>開封確認</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::ReceiptItem</name>
+    <message>
+        <location line="-44"/>
+        <source>Today %1</source>
+        <translation>今日 %1</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Yesterday %1</source>
+        <translation>昨日 %1</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::RoomSettings</name>
+    <message>
+        <location filename="../../src/dialogs/RoomSettings.cpp" line="+113"/>
+        <source>Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Info</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Internal ID</source>
+        <translation>内部ID</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Room Version</source>
+        <translation>部屋のバージョン</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Notifications</source>
+        <translation>通知</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Muted</source>
+        <translation>ミュート</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Mentions only</source>
+        <translation>メンションのみ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All messages</source>
+        <translation>全てのメッセージ</translation>
+    </message>
+    <message>
+        <location line="+97"/>
+        <source>Room access</source>
+        <translation>部屋のアクセス権</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Anyone and guests</source>
+        <translation>登録ユーザーとゲスト</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Anyone</source>
+        <translation>登録ユーザーのみ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Invited users</source>
+        <translation>招待された登録ユーザーのみ</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Encryption</source>
+        <translation>暗号化</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>End-to-End Encryption</source>
+        <translation>エンドツーエンド暗号化</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation>暗号化機能は実験段階にあるので、予期せずに壊れるかもしれません。 &lt;br&gt;この機能を後から無効にできないことに注意して下さい。</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Respond to key requests</source>
+        <translation>鍵の要求に応答する</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Whether or not the client should respond automatically with the session keys
+ upon request. Use with caution, this is a temporary measure to test the
+ E2E implementation until device verification is completed.</source>
+        <translation>クライアントがセッション鍵を要求された際に、自動的に応答するべきか否か。
+デバイス検証機能が実装されるまでのE2E暗号化を検査するための一時的な方法なので、
+これを利用する際は注意して下さい。</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+51"/>
+        <source>%n member(s)</source>
+        <translation>
+            <numerusform>%n人</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+140"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation>暗号化を有効にできませんでした: %1</translation>
+    </message>
+    <message>
+        <location line="+145"/>
+        <source>Select an avatar</source>
+        <translation>アバターを選択</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation>全てのファイル (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation>選択したファイルは画像ではありません</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation>ファイルの読み込み時にエラーが発生しました: %1</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation>画像をアップロードできませんでした: %s</translation>
+    </message>
+</context>
+<context>
+    <name>dialogs::UserProfile</name>
+    <message>
+        <location filename="../../src/dialogs/UserProfile.cpp" line="+63"/>
+        <source>Ban the user from the room</source>
+        <translation>ユーザーを部屋から永久追放する</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Ignore messages from this user</source>
+        <translation>このユーザーからのメッセージを無視する</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Kick the user from the room</source>
+        <translation>ユーザーを部屋から一時的に追放する</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Start a conversation</source>
+        <translation>会話を始める</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Devices</source>
+        <translation>デバイス</translation>
+    </message>
+</context>
+<context>
+    <name>emoji::Panel</name>
+    <message>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
+        <source>Smileys &amp; People</source>
+        <translation>表情と人</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Animals &amp; Nature</source>
+        <translation>動物と自然</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Food &amp; Drink</source>
+        <translation>飲食物</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Activity</source>
+        <translation>活動</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Travel &amp; Places</source>
+        <translation>旅行と場所</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Objects</source>
+        <translation>物</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Symbols</source>
+        <translation>記号</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Flags</source>
+        <translation>旗</translation>
+    </message>
+</context>
+<context>
+    <name>message-description sent:</name>
+    <message>
+        <location filename="../../src/Utils.h" line="+100"/>
+        <source>You sent an audio clip</source>
+        <translation>音声データを送信しました</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 sent an audio clip</source>
+        <translation>%1が音声データを送信しました</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You sent an image</source>
+        <translation>画像を送信しました</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 sent an image</source>
+        <translation>%1が画像を送信しました</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You sent a file</source>
+        <translation>ファイルを送信しました</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 sent a file</source>
+        <translation>%1がファイルを送信しました</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You sent a video</source>
+        <translation>動画を送信しました</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 sent a video</source>
+        <translation>%1が動画を送信しました</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You sent a sticker</source>
+        <translation>ステッカーを送信しました</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 sent a sticker</source>
+        <translation>%1がステッカーを送信しました</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You sent a notification</source>
+        <translation>通知を送信しました</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 sent a notification</source>
+        <translation>%1が通知を送信しました</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You: %1</source>
+        <translation>あなた: %1</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1: %2</source>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>You sent an encrypted message</source>
+        <translation>暗号化されたメッセージを送信しました</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>%1 sent an encrypted message</source>
+        <translation>%1が暗号化されたメッセージを送信しました</translation>
+    </message>
+</context>
+<context>
+    <name>popups::UserMentions</name>
+    <message>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <source>This Room</source>
+        <translation>この部屋</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>All Rooms</source>
+        <translation>全ての部屋</translation>
+    </message>
+</context>
+<context>
+    <name>utils</name>
+    <message>
+        <location filename="../../src/Utils.h" line="+4"/>
+        <source>Unknown Message Type</source>
+        <translation>不明なメッセージ型です</translation>
+    </message>
+</context>
+</TS>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index 2ad46d78..dba70d50 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,7 +353,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -451,7 +451,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>Kies een bestand</translation>
     </message>
@@ -625,7 +625,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished">Leesbevestigingen</translation>
     </message>
@@ -748,7 +748,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1088,12 +1088,12 @@ Mediagrootte: %2
         <translation>Meldingen</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>Gedempt</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>Alleen vermeldingen</translation>
     </message>
@@ -1103,7 +1103,7 @@ Mediagrootte: %2
         <translation>Alle berichten</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation>Kamertoegang</translation>
     </message>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index ff18bf61..fd23b216 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Nie udało się przywrócić konta OLM. Spróbuj zalogować się ponownie.</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,7 +353,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -451,7 +451,7 @@
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>Wybierz plik</translation>
     </message>
@@ -626,7 +626,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished">Potwierdzenia przeczytania</translation>
     </message>
@@ -749,7 +749,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1089,12 +1089,12 @@ Rozmiar multimediów: %2
         <translation>Powiadomienia</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>Wyciszone</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>Tylko wspomnienia</translation>
     </message>
@@ -1104,7 +1104,7 @@ Rozmiar multimediów: %2
         <translation>Wszystkie wiadomości</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation>Dostęp do pokoju</translation>
     </message>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 821d5899..e3817db0 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Не удалось восстановить учетную запись OLM. Пожалуйста, войдите снова.</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,7 +353,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -451,7 +451,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>Выберите файл</translation>
     </message>
@@ -626,7 +626,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished">Подтверждать прочтение</translation>
     </message>
@@ -749,7 +749,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1090,12 +1090,12 @@ Media size: %2
         <translation>Уведомления</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>Приглушено</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>Только упоминания</translation>
     </message>
@@ -1105,7 +1105,7 @@ Media size: %2
         <translation>Все сообщения</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation>Доступ к комнате</translation>
     </message>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index 4e0ce565..536e39a2 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+864"/>
+        <location line="+868"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-803"/>
+        <location line="-807"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+399"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>恢复 OLM 账户失败。请重新登录。</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+60"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,7 +353,7 @@
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2303"/>
+        <location filename="../../src/Cache.cpp" line="+2304"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -451,7 +451,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+85"/>
         <source>Select a file</source>
         <translation>选择一个文件</translation>
     </message>
@@ -624,7 +624,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+31"/>
+        <location filename="../qml/TimelineView.qml" line="+32"/>
         <source>Read receipts</source>
         <translation type="unfinished">阅读回执</translation>
     </message>
@@ -747,7 +747,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>Send messages as markdown</source>
+        <source>Send messages as Markdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1087,12 +1087,12 @@ Media size: %2
         <translation>通知</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Muted</source>
         <translation>静默</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mentions only</source>
         <translation>只限提及</translation>
     </message>
@@ -1102,7 +1102,7 @@ Media size: %2
         <translation>所有消息</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+97"/>
         <source>Room access</source>
         <translation>聊天室访问</translation>
     </message>
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index a0f37c26..4cba59a4 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -206,7 +206,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
         std::tie(receiptsLayout, readReceipts_) = addSetting(tr("Read receipts"));
 
         QHBoxLayout *markdownLayout                = nullptr;
-        std::tie(markdownLayout, markdownEnabled_) = addSetting(tr("Send messages as markdown"));
+        std::tie(markdownLayout, markdownEnabled_) = addSetting(tr("Send messages as Markdown"));
 
         QHBoxLayout *desktopLayout                     = nullptr;
         std::tie(desktopLayout, desktopNotifications_) = addSetting(tr("Desktop notifications"));