diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index 24817395..7ae33c58 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -4,7 +4,7 @@
<context>
<name>ActiveCallBar</name>
<message>
- <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
+ <location filename="../qml/voip/ActiveCallBar.qml" line="+107"/>
<source>Calling...</source>
<translation type="unfinished"></translation>
</message>
@@ -56,7 +56,7 @@
<context>
<name>CallInvite</name>
<message>
- <location filename="../qml/voip/CallInvite.qml" line="+71"/>
+ <location filename="../qml/voip/CallInvite.qml" line="+72"/>
<source>Video Call</source>
<translation type="unfinished"></translation>
</message>
@@ -74,7 +74,7 @@
<context>
<name>CallInviteBar</name>
<message>
- <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
+ <location filename="../qml/voip/CallInviteBar.qml" line="+65"/>
<source>Video Call</source>
<translation type="unfinished"></translation>
</message>
@@ -117,7 +117,7 @@
<context>
<name>CallManager</name>
<message>
- <location filename="../../src/CallManager.cpp" line="+521"/>
+ <location filename="../../src/voip/CallManager.cpp" line="+513"/>
<source>Entire screen</source>
<translation type="unfinished"></translation>
</message>
@@ -125,23 +125,23 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+128"/>
+ <location filename="../../src/ChatPage.cpp" line="+126"/>
<source>Failed to invite user: %1</source>
<translation>ユーザーを招待できませんでした: %1</translation>
</message>
<message>
<location line="+4"/>
- <location line="+683"/>
+ <location line="+662"/>
<source>Invited user: %1</source>
<translation>招待されたユーザー: %1</translation>
</message>
<message>
- <location line="-461"/>
+ <location line="-448"/>
<source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+364"/>
+ <location line="+355"/>
<source>Confirm join</source>
<translation type="unfinished"></translation>
</message>
@@ -151,23 +151,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+42"/>
<source>Room %1 created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+35"/>
- <location line="+403"/>
+ <location line="+34"/>
+ <location line="+445"/>
<source>Confirm invite</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-402"/>
+ <location line="-444"/>
<source>Do you really want to invite %1 (%2)?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+10"/>
<source>Failed to invite %1 to %2: %3</source>
<translation>%2に%1を招待できませんでした: %3</translation>
</message>
@@ -182,7 +182,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Kicked user: %1</source>
<translation>一時的に追放されたユーザー: %1</translation>
</message>
@@ -197,7 +197,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+10"/>
<source>Failed to ban %1 in %2: %3</source>
<translation>%2で%1を永久追放できませんでした: %3</translation>
</message>
@@ -217,7 +217,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+10"/>
<source>Failed to unban %1 in %2: %3</source>
<translation>%2で%1の永久追放を解除できませんでした: %3</translation>
</message>
@@ -227,12 +227,12 @@
<translation>永久追放を解除されたユーザー: %1</translation>
</message>
<message>
- <location line="+306"/>
+ <location line="+352"/>
<source>Do you really want to start a private chat with %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-849"/>
+ <location line="-879"/>
<source>Cache migration failed!</source>
<translation type="unfinished"></translation>
</message>
@@ -259,23 +259,23 @@
<translation>セーブデータを復元できませんでした。もう一度ログインして下さい。</translation>
</message>
<message>
- <location line="+96"/>
+ <location line="+93"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>暗号化鍵を設定できませんでした。サーバーの応答: %1 %2. 後でやり直して下さい。</translation>
</message>
<message>
- <location line="+34"/>
- <location line="+117"/>
+ <location line="+32"/>
+ <location line="+115"/>
<source>Please try to login again: %1</source>
<translation>もう一度ログインしてみて下さい: %1</translation>
</message>
<message>
- <location line="+51"/>
+ <location line="+49"/>
<source>Failed to join room: %1</source>
<translation>部屋に参加できませんでした: %1</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>You joined the room</source>
<translation>部屋に参加しました</translation>
</message>
@@ -285,17 +285,17 @@
<translation>招待を削除できませんでした: %1</translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>Room creation failed: %1</source>
<translation>部屋を作成できませんでした: %1</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+18"/>
<source>Failed to leave room: %1</source>
<translation>部屋から出られませんでした: %1</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+58"/>
<source>Failed to kick %1 from %2: %3</source>
<translation type="unfinished"></translation>
</message>
@@ -354,7 +354,7 @@
<context>
<name>CrossSigningSecrets</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+299"/>
+ <location filename="../../src/ChatPage.cpp" line="+288"/>
<source>Decrypt secrets</source>
<translation type="unfinished"></translation>
</message>
@@ -364,12 +364,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Enter your recovery key or passphrase called %1 to decrypt your secrets:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Decryption failed</source>
<translation type="unfinished"></translation>
</message>
@@ -581,17 +581,26 @@
</message>
<message>
<location line="+2"/>
- <location line="+4"/>
<source>Device verification timed out.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2"/>
+ <location line="+2"/>
<source>Other party canceled the verification.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+2"/>
+ <source>Verification messages received out of order!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Unknown verification error.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
<source>Close</source>
<translation type="unfinished">閉じる</translation>
</message>
@@ -612,7 +621,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+63"/>
<source>Add images</source>
<translation type="unfinished"></translation>
</message>
@@ -622,7 +631,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>State key</source>
<translation type="unfinished"></translation>
</message>
@@ -638,13 +647,13 @@
</message>
<message>
<location line="+10"/>
- <location line="+65"/>
+ <location line="+66"/>
<source>Use as Emoji</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-55"/>
- <location line="+65"/>
+ <location line="-56"/>
+ <location line="+66"/>
<source>Use as Sticker</source>
<translation type="unfinished"></translation>
</message>
@@ -697,7 +706,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+21"/>
<source>Private pack</source>
<translation type="unfinished"></translation>
</message>
@@ -712,7 +721,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+66"/>
<source>Enable globally</source>
<translation type="unfinished"></translation>
</message>
@@ -735,7 +744,7 @@
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+267"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+268"/>
<source>Select a file</source>
<translation type="unfinished">ファイルを選択</translation>
</message>
@@ -745,7 +754,7 @@
<translation type="unfinished">全てのファイル (*)</translation>
</message>
<message>
- <location line="+449"/>
+ <location line="+474"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished">メディアをアップロードできませんでした。やり直して下さい。</translation>
</message>
@@ -753,7 +762,7 @@
<context>
<name>InviteDialog</name>
<message>
- <location filename="../qml/InviteDialog.qml" line="+32"/>
+ <location filename="../qml/dialogs/InviteDialog.qml" line="+33"/>
<source>Invite users to %1</source>
<translation type="unfinished"></translation>
</message>
@@ -785,6 +794,32 @@
</message>
</context>
<context>
+ <name>JoinRoomDialog</name>
+ <message>
+ <location filename="../qml/dialogs/JoinRoomDialog.qml" line="+14"/>
+ <source>Join room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Room ID or alias</source>
+ <translation type="unfinished">部屋のID又は別名</translation>
+ </message>
+</context>
+<context>
+ <name>LeaveRoomDialog</name>
+ <message>
+ <location filename="../qml/dialogs/LeaveRoomDialog.qml" line="+15"/>
+ <source>Leave room</source>
+ <translation type="unfinished">部屋を出る</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Are you sure you want to leave?</source>
+ <translation type="unfinished">本当に退出しますか?</translation>
+ </message>
+</context>
+<context>
<name>LoginPage</name>
<message>
<location filename="../../src/LoginPage.cpp" line="+81"/>
@@ -846,25 +881,25 @@ Example: https://server.my:8787</source>
<translation>ログイン</translation>
</message>
<message>
- <location line="+84"/>
+ <location line="+83"/>
<location line="+11"/>
- <location line="+157"/>
+ <location line="+151"/>
<location line="+11"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-126"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>自動検出できませんでした。不正な形式の応答を受信しました。</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Autodiscovery failed. Unknown error when requesting .well-known.</source>
<translation>自動検出できませんでした。.well-known要求時の不明なエラー。</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation>必要な端点が見つかりません。Matrixサーバーではないかもしれません。</translation>
</message>
@@ -874,27 +909,45 @@ Example: https://server.my:8787</source>
<translation>不正な形式の応答を受信しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+6"/>
<source>An unknown error occured. Make sure the homeserver domain is valid.</source>
<translation>不明なエラーが発生しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation>
</message>
<message>
- <location line="-168"/>
+ <location line="-164"/>
<source>SSO LOGIN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+264"/>
+ <location line="+257"/>
<source>Empty password</source>
<translation>パスワードが入力されていません</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>LogoutDialog</name>
+ <message>
+ <location filename="../qml/dialogs/LogoutDialog.qml" line="+13"/>
+ <source>Log out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>A call is in progress. Log out?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you want to log out?</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MessageDelegate</name>
<message>
<location filename="../qml/delegates/MessageDelegate.qml" line="+174"/>
@@ -1019,7 +1072,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageView</name>
<message>
- <location filename="../qml/MessageView.qml" line="+86"/>
+ <location filename="../qml/MessageView.qml" line="+88"/>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
@@ -1039,7 +1092,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished">オプション</translation>
</message>
<message>
- <location line="+421"/>
+ <location line="+420"/>
<location line="+118"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
@@ -1129,7 +1182,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+16"/>
+ <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
@@ -1178,7 +1236,7 @@ Example: https://server.my:8787</source>
<name>NotificationWarning</name>
<message>
<location filename="../qml/NotificationWarning.qml" line="+32"/>
- <source>You will be pinging the whole room</source>
+ <source>You are about to notify the whole room</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1186,30 +1244,18 @@ Example: https://server.my:8787</source>
<name>NotificationsManager</name>
<message>
<location filename="../../src/notifications/Manager.cpp" line="+22"/>
- <location filename="../../src/notifications/ManagerMac.cpp" line="+44"/>
- <location filename="../../src/notifications/ManagerWin.cpp" line="+78"/>
+ <location filename="../../src/notifications/ManagerMac.cpp" line="+45"/>
+ <location filename="../../src/notifications/ManagerWin.cpp" line="+74"/>
<source>%1 sent an encrypted message</source>
<translation type="unfinished">%1が暗号化されたメッセージを送信しました</translation>
</message>
<message>
- <location line="+4"/>
- <source>* %1 %2</source>
- <comment>Format an emote message in a notification, %1 is the sender, %2 the message</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+6"/>
<source>%1 replied: %2</source>
<comment>Format a reply in a notification. %1 is the sender, %2 the message</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>%1: %2</source>
- <comment>Format a normal message in a notification. %1 is the sender, %2 the message</comment>
- <translation type="unfinished">%1: %2</translation>
- </message>
- <message>
<location filename="../../src/notifications/ManagerMac.cpp" line="-1"/>
<location filename="../../src/notifications/ManagerWin.cpp" line="-1"/>
<source>%1 replied with an encrypted message</source>
@@ -1239,7 +1285,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+23"/>
<source>Voice</source>
<translation type="unfinished"></translation>
</message>
@@ -1270,7 +1316,7 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+199"/>
+ <location filename="../../src/main.cpp" line="+191"/>
<source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
@@ -1288,7 +1334,7 @@ Example: https://server.my:8787</source>
<context>
<name>ReadReceipts</name>
<message>
- <location filename="../qml/ReadReceipts.qml" line="+40"/>
+ <location filename="../qml/dialogs/ReadReceipts.qml" line="+41"/>
<source>Read receipts</source>
<translation type="unfinished">開封確認</translation>
</message>
@@ -1296,7 +1342,7 @@ Example: https://server.my:8787</source>
<context>
<name>ReadReceiptsModel</name>
<message>
- <location filename="../../src/ReadReceiptsModel.cpp" line="+111"/>
+ <location filename="../../src/ReadReceiptsModel.cpp" line="+110"/>
<source>Yesterday, %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1304,18 +1350,18 @@ Example: https://server.my:8787</source>
<context>
<name>RegisterPage</name>
<message>
- <location filename="../../src/RegisterPage.cpp" line="+80"/>
+ <location filename="../../src/RegisterPage.cpp" line="+81"/>
<source>Username</source>
<translation>ユーザー名</translation>
</message>
<message>
<location line="+2"/>
- <location line="+150"/>
+ <location line="+147"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-146"/>
+ <location line="-143"/>
<source>Password</source>
<translation>パスワード</translation>
</message>
@@ -1345,37 +1391,22 @@ Example: https://server.my:8787</source>
<translation>登録</translation>
</message>
<message>
- <location line="+322"/>
- <source>No supported registration flows!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+32"/>
- <source>Registration token</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Please enter a valid registration token.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-175"/>
+ <location line="+169"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished">自動検出できませんでした。不正な形式の応答を受信しました。</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
<source>Autodiscovery failed. Unknown error when requesting .well-known.</source>
<translation type="unfinished">自動検出できませんでした。.well-known要求時の不明なエラー。</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="+24"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation type="unfinished">必要な端点が見つかりません。Matrixサーバーではないかもしれません。</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Received malformed response. Make sure the homeserver domain is valid.</source>
<translation type="unfinished">不正な形式の応答を受信しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation>
</message>
@@ -1385,7 +1416,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished">不明なエラーが発生しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation>
</message>
<message>
- <location line="-119"/>
+ <location line="-107"/>
<source>Password is not long enough (min 8 chars)</source>
<translation>パスワード長が不足しています (最小8文字)</translation>
</message>
@@ -1416,20 +1447,25 @@ Example: https://server.my:8787</source>
<context>
<name>RoomDirectory</name>
<message>
- <location filename="../qml/RoomDirectory.qml" line="+24"/>
+ <location filename="../qml/dialogs/RoomDirectory.qml" line="+25"/>
<source>Explore Public Rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+166"/>
+ <location line="+168"/>
<source>Search for public rooms</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+11"/>
+ <source>Choose custom homeserver</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+4542"/>
+ <location filename="../../src/Cache.cpp" line="+4491"/>
<source>no version stored</source>
<translation>バージョンが保存されていません</translation>
</message>
@@ -1447,16 +1483,6 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
- <source>Leave Room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Are you sure you want to leave this room?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location line="+7"/>
<source>Leave room</source>
<translation type="unfinished">部屋を出る</translation>
@@ -1487,7 +1513,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+280"/>
+ <location line="+278"/>
<source>Status Message</source>
<translation type="unfinished"></translation>
</message>
@@ -1512,7 +1538,30 @@ Example: https://server.my:8787</source>
<translation type="unfinished">ログアウト</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+40"/>
+ <source>Encryption not set up</source>
+ <extracomment>Cross-signing setup has not run yet.</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Unverified login</source>
+ <extracomment>The user just signed in with this device and hasn't verified their master key.</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Please verify your other devices</source>
+ <extracomment>There are unverified devices signed in to this account.</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Close</source>
+ <translation type="unfinished">閉じる</translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>Start a new chat</source>
<translation type="unfinished">新しいチャットを開始</translation>
</message>
@@ -1540,12 +1589,12 @@ Example: https://server.my:8787</source>
<context>
<name>RoomMembers</name>
<message>
- <location filename="../qml/RoomMembers.qml" line="+18"/>
+ <location filename="../qml/dialogs/RoomMembers.qml" line="+19"/>
<source>Members of %1</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location line="+32"/>
+ <location line="+33"/>
<source>%n people in %1</source>
<comment>Summary above list of members</comment>
<translation type="unfinished">
@@ -1581,12 +1630,12 @@ Example: https://server.my:8787</source>
<context>
<name>RoomSettings</name>
<message>
- <location filename="../qml/RoomSettings.qml" line="+25"/>
+ <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/>
<source>Room Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+80"/>
+ <location line="+81"/>
<source>%1 member(s)</source>
<translation type="unfinished"></translation>
</message>
@@ -1692,12 +1741,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+259"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+254"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished">暗号化を有効にできませんでした: %1</translation>
</message>
<message>
- <location line="+252"/>
+ <location line="+249"/>
<source>Select an avatar</source>
<translation type="unfinished">アバターを選択</translation>
</message>
@@ -1717,8 +1766,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished">ファイルの読み込み時にエラーが発生しました: %1</translation>
</message>
<message>
- <location line="+34"/>
- <location line="+20"/>
+ <location line="+32"/>
+ <location line="+19"/>
<source>Failed to upload image: %s</source>
<translation type="unfinished">画像をアップロードできませんでした: %s</translation>
</message>
@@ -1726,22 +1775,50 @@ Example: https://server.my:8787</source>
<context>
<name>RoomlistModel</name>
<message>
- <location filename="../../src/timeline/RoomlistModel.cpp" line="+143"/>
+ <location filename="../../src/timeline/RoomlistModel.cpp" line="+147"/>
<source>Pending invite.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+35"/>
<source>Previewing this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+34"/>
+ <location line="+38"/>
<source>No preview available</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Root</name>
+ <message>
+ <location filename="../qml/Root.qml" line="+255"/>
+ <source>Please enter your login password to continue:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please enter a valid email address to continue:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please enter a valid phone number to continue:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please enter the token, which has been sent to you:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Wait for the confirmation link to arrive, then continue.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ScreenShare</name>
<message>
<location filename="../qml/voip/ScreenShare.qml" line="+30"/>
@@ -1798,20 +1875,98 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-3776"/>
+ <location filename="../../src/Cache.cpp" line="-3725"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Nheko could not connect to the secure storage to save encryption secrets to. This can have multiple reasons. Check if your D-Bus service is running and you have configured a service like KWallet, Gnome Secrets or the equivalent for your platform. If you are having trouble, feel free to open an issue here: https://github.com/Nheko-Reborn/nheko/issues</source>
+ <source>Nheko could not connect to the secure storage to save encryption secrets to. This can have multiple reasons. Check if your D-Bus service is running and you have configured a service like KWallet, Gnome Keyring, KeePassXC or the equivalent for your platform. If you are having trouble, feel free to open an issue here: https://github.com/Nheko-Reborn/nheko/issues</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>SelfVerificationCheck</name>
+ <message>
+ <location filename="../qml/SelfVerificationCheck.qml" line="+39"/>
+ <source>This is your recovery key. You will need it to restore access to your encrypted messages and verification keys. Keep this safe. Don't share it with anyone and don't lose it! Do not pass go! Do not collect $200!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+33"/>
+ <source>Encryption setup successfully</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Failed to setup encryption: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Setup Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Hello and welcome to Matrix!
+It seems like you are new. Before you can securely encrypt your messages, we need to setup a few small things. You can either press accept immediately or adjust a few basic options. We also try to explain a few of the basics. You can skip those parts, but they might prove to be helpful!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+124"/>
+ <source>Activate Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>It seems like you have encryption already configured for this account. To be able to access your encrypted messages and make this device appear as trusted, you can either verify an existing device or (if you have one) enter your recovery passphrase. Please select one of the options below.
+If you choose verify, you need to have the other device available. If you choose "enter passphrase", you will need your recovery key or passphrase. If you click cancel, you can choose to verify yourself at a later point.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>enter passphrase</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>SelfVerificationStatus</name>
+ <message>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+40"/>
+ <source>Failed to create keys for cross-signing!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Failed to create keys for online key backup!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Failed to create keys secure server side secret storage!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Encryption Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Encryption setup failed: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SingleImagePackModel</name>
<message>
- <location filename="../../src/SingleImagePackModel.cpp" line="+261"/>
+ <location filename="../../src/SingleImagePackModel.cpp" line="+255"/>
<location line="+25"/>
<source>Failed to update image pack: %1</source>
<translation type="unfinished"></translation>
@@ -1827,7 +1982,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+29"/>
<source>Failed to upload image: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1884,18 +2039,18 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1120"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1104"/>
<source>Message redaction failed: %1</source>
<translation>メッセージを編集できませんでした: %1</translation>
</message>
<message>
- <location line="+73"/>
+ <location line="+71"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+173"/>
+ <location line="+169"/>
<source>Save image</source>
<translation>画像を保存</translation>
</message>
@@ -1915,7 +2070,7 @@ Example: https://server.my:8787</source>
<translation>ファイルを保存</translation>
</message>
<message numerus="yes">
- <location line="+239"/>
+ <location line="+251"/>
<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>
@@ -1923,7 +2078,7 @@ Example: https://server.my:8787</source>
</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="+66"/>
<source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation>
</message>
@@ -1963,12 +2118,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation>
</message>
@@ -1978,12 +2133,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+76"/>
<source>%1 was invited.</source>
<translation>%1が招待されました。</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+18"/>
<source>%1 changed their avatar.</source>
<translation>%1がアバターを変更しました。</translation>
</message>
@@ -1998,12 +2153,12 @@ Example: https://server.my:8787</source>
<translation>%1が参加しました。</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+3"/>
<source>%1 joined via authorisation from %2's server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+11"/>
<source>%1 rejected their invite.</source>
<translation>%1が招待を拒否しました。</translation>
</message>
@@ -2033,27 +2188,27 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+8"/>
<source>Reason: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-20"/>
+ <location line="-19"/>
<source>%1 redacted their knock.</source>
<translation>%1がノックを編集しました。</translation>
</message>
<message>
- <location line="-958"/>
+ <location line="-951"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+918"/>
+ <location line="+912"/>
<source>%1 has changed their avatar and changed their display name to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>%1 has changed their display name to %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -2090,7 +2245,12 @@ Example: https://server.my:8787</source>
<translation>部屋が開いていません</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+137"/>
+ <source>No preview available</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
<source>%1 member(s)</source>
<translation type="unfinished"></translation>
</message>
@@ -2116,27 +2276,19 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
- <name>TimelineViewManager</name>
- <message>
- <location filename="../../src/timeline/TimelineViewManager.cpp" line="+548"/>
- <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+56"/>
+ <location filename="../qml/TopBar.qml" line="+59"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-41"/>
+ <location line="-44"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>This room is not encrypted!</source>
<translation type="unfinished"></translation>
</message>
@@ -2147,7 +2299,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+2"/>
- <source>This rooms contain verified devices and devices which have never changed their master key.</source>
+ <source>This room contains verified devices and devices which have never changed their master key.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2195,9 +2347,34 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UIA</name>
+ <message>
+ <location filename="../../src/ui/UIA.cpp" line="+59"/>
+ <source>No available registration flows!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <location line="+24"/>
+ <location line="+17"/>
+ <source>Registration aborted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Please enter a valid registration token.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+165"/>
+ <source>Invalid token</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserProfile</name>
<message>
- <location filename="../qml/UserProfile.qml" line="+27"/>
+ <location filename="../qml/dialogs/UserProfile.qml" line="+28"/>
<source>Global User Profile</source>
<translation type="unfinished"></translation>
</message>
@@ -2207,7 +2384,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+49"/>
<source>Change avatar globally.</source>
<translation type="unfinished"></translation>
</message>
@@ -2217,7 +2394,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Change display name globally.</source>
<translation type="unfinished"></translation>
</message>
@@ -2227,7 +2404,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+29"/>
<source>Room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2237,18 +2414,18 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+13"/>
<source>Open the global profile for this user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <location line="+109"/>
+ <location line="+9"/>
+ <location line="+197"/>
<source>Verify</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-72"/>
+ <location line="-160"/>
<source>Start a private chat.</source>
<translation type="unfinished"></translation>
</message>
@@ -2263,12 +2440,42 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+9"/>
+ <source>Refresh device list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+54"/>
+ <source>Sign out this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>Change device name.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Last seen %1 from %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+27"/>
<source>Unverify</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+307"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+152"/>
+ <source>Sign out device %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>You signed out this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+223"/>
<source>Select an avatar</source>
<translation type="unfinished">アバターを選択</translation>
</message>
@@ -2291,8 +2498,8 @@ Example: https://server.my:8787</source>
<context>
<name>UserSettings</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+377"/>
- <location filename="../../src/UserSettingsPage.h" line="+207"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+374"/>
+ <location filename="../../src/UserSettingsPage.h" line="+204"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
@@ -2300,7 +2507,7 @@ Example: https://server.my:8787</source>
<context>
<name>UserSettingsPage</name>
<message>
- <location line="+557"/>
+ <location line="+567"/>
<source>Minimize to tray</source>
<translation>トレイへ最小化</translation>
</message>
@@ -2310,22 +2517,22 @@ Example: https://server.my:8787</source>
<translation>トレイで起動</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+10"/>
<source>Group's sidebar</source>
<translation>グループサイドバー</translation>
</message>
<message>
- <location line="-3"/>
+ <location line="-6"/>
<source>Circular Avatars</source>
<translation>円形アバター</translation>
</message>
<message>
- <location line="-216"/>
+ <location line="-217"/>
<source>profile: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+104"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
@@ -2350,7 +2557,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+26"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -2366,6 +2573,16 @@ OFF - square, ON - Circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location line="+1"/>
+ <source>Use identicons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Display an identicon instead of a letter when a user has not set an avatar.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+3"/>
<source>Show a column containing groups and tags next to the room list.</source>
<translation type="unfinished"></translation>
@@ -2393,7 +2610,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Privacy screen timeout (in seconds [0 - 3600])</source>
<translation type="unfinished"></translation>
</message>
@@ -2448,7 +2665,7 @@ If this is on, rooms which have active notifications (the small circle with a nu
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Read receipts</source>
<translation>開封確認</translation>
</message>
@@ -2459,7 +2676,7 @@ Status is displayed next to timestamps.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Send messages as Markdown</source>
<translation>メッセージをMarkdownとして送信</translation>
</message>
@@ -2546,7 +2763,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+181"/>
+ <location line="+178"/>
<source>Enable online key backup</source>
<translation type="unfinished"></translation>
</message>
@@ -2556,7 +2773,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+248"/>
+ <location line="+253"/>
<source>CACHED</source>
<translation type="unfinished"></translation>
</message>
@@ -2566,7 +2783,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-493"/>
+ <location line="-495"/>
<source>Scale factor</source>
<translation>尺度係数</translation>
</message>
@@ -2641,7 +2858,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>デバイスの指紋</translation>
</message>
<message>
- <location line="-167"/>
+ <location line="-166"/>
<source>Session Keys</source>
<translation>セッション鍵</translation>
</message>
@@ -2661,17 +2878,17 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>暗号化</translation>
</message>
<message>
- <location line="-121"/>
+ <location line="-123"/>
<source>GENERAL</source>
<translation>全般</translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+72"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+180"/>
+ <location line="+179"/>
<source>Plays media like GIFs or WEBPs only when explicitly hovering over them.</source>
<translation type="unfinished"></translation>
</message>
@@ -2711,7 +2928,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>Self signing key</source>
<translation type="unfinished"></translation>
</message>
@@ -2741,14 +2958,14 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished">全てのファイル (*)</translation>
</message>
<message>
- <location line="+261"/>
+ <location line="+265"/>
<source>Open Sessions File</source>
<translation>セッションファイルを開く</translation>
</message>
<message>
<location line="+4"/>
<location line="+18"/>
- <location line="+9"/>
+ <location line="+8"/>
<location line="+19"/>
<location line="+11"/>
<location line="+18"/>
@@ -2756,19 +2973,19 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>エラー</translation>
</message>
<message>
- <location line="-66"/>
- <location line="+28"/>
+ <location line="-65"/>
+ <location line="+27"/>
<source>File Password</source>
<translation>ファイルのパスワード</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Enter the passphrase to decrypt the file:</source>
<translation>ファイルを復号するためのパスフレーズを入力して下さい:</translation>
</message>
<message>
<location line="+8"/>
- <location line="+28"/>
+ <location line="+27"/>
<source>The password cannot be empty</source>
<translation>パスワードを空にはできません</translation>
</message>
@@ -2784,6 +3001,14 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>VerificationManager</name>
+ <message>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+105"/>
+ <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Waiting</name>
<message>
<location filename="../qml/device-verification/Waiting.qml" line="+12"/>
@@ -2837,7 +3062,7 @@ This usually causes the application icon in the task bar to animate in some fash
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+185"/>
+ <location filename="../../src/Utils.cpp" line="+184"/>
<source>Yesterday</source>
<translation>昨日</translation>
</message>
@@ -2909,37 +3134,6 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
- <name>dialogs::JoinRoom</name>
- <message>
- <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
- <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="+35"/>
- <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="+35"/>
@@ -3005,47 +3199,47 @@ Media size: %2
<translation>%1が音声データを送信しました</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>You sent an image</source>
<translation>画像を送信しました</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 sent an image</source>
<translation>%1が画像を送信しました</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>You sent a file</source>
<translation>ファイルを送信しました</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 sent a file</source>
<translation>%1がファイルを送信しました</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>You sent a video</source>
<translation>動画を送信しました</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 sent a video</source>
<translation>%1が動画を送信しました</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>You sent a sticker</source>
<translation>ステッカーを送信しました</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 sent a sticker</source>
<translation>%1がステッカーを送信しました</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>You sent a notification</source>
<translation>通知を送信しました</translation>
</message>
@@ -3060,7 +3254,7 @@ Media size: %2
<translation>あなた: %1</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3080,27 +3274,27 @@ Media size: %2
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 placed a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>You answered a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 answered a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+4"/>
<source>You ended a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
<source>%1 ended a call</source>
<translation type="unfinished"></translation>
</message>
@@ -3108,7 +3302,7 @@ Media size: %2
<context>
<name>utils</name>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>Unknown Message Type</source>
<translation>不明なメッセージ型です</translation>
</message>
|
